summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/makefu'lassulus2018-06-2812-40/+494
|\
| * ma gum.r: remove retroshare importmakefu2018-06-251-1/+1
| * ma nextgum.r: in preparation to move nextgum -> gummakefu2018-06-246-2/+342
| * ma kexec: init dummy host for deploying kexec tarballsmakefu2018-06-242-0/+28
| * Merge branch 'master' of prism:stockholmmakefu2018-06-2433-343/+74
| |\
| * | ma source: cherry-pick forecastio and uhub/sqlitemakefu2018-06-241-1/+3
| * | onebutton.r: add mpc-bootermakefu2018-06-242-1/+31
| * | nextgum.r: initmakefu2018-06-241-0/+32
| * | ma gum.r: split sw/hw configmakefu2018-06-172-36/+58
* | | l xjails: add vglrun optionlassulus2018-06-271-2/+8
* | | l wine: add winetrickslassulus2018-06-271-0/+1
* | | l serveWordpress: addSSL -> forceSSLlassulus2018-06-271-1/+1
* | | l vbox: add to group videolassulus2018-06-271-1/+1
* | | l xmonad: reenable rhombuslassulus2018-06-271-3/+23
* | | l urxvt: save more lineslassulus2018-06-271-1/+1
* | | l repo-sync: sync nix-writerslassulus2018-06-271-0/+1
* | | l repo-sync: lass-mors is admin userlassulus2018-06-271-0/+1
* | | l reaktor-coders: add !shrug commandlassulus2018-06-271-0/+6
* | | l logf: mails now arrive on bluelassulus2018-06-271-1/+1
* | | l git: set xmonad-stockholm as publiclassulus2018-06-271-0/+4
* | | l dcso-dev: add nightwatch stufflassulus2018-06-271-1/+5
* | | l dunst: set timeout to 1lassulus2018-06-271-3/+3
* | | l urxvt: add font-resizinglassulus2018-06-272-0/+7
* | | l ftb: mesa -> mesa_glulassulus2018-06-271-2/+2
* | | l prism.r xmonad-stockholm: add add jeschli push accesslassulus2018-06-271-0/+10
* | | cholerab: 8ac2258 -> 4031072prism/staging/testlassulus2018-06-271-2/+2
* | | thesauron -> cholerabprism/staging/cholerablassulus2018-06-262-2/+2
* | | 7295e17 -> 91b286cprism/staging/nixpkgslassulus2018-06-251-1/+1
* | | l: add starcraft user & configlassulus2018-06-252-0/+54
| |/ |/|
* | l blue-host: don't restart container on changelassulus2018-06-221-0/+1
* | l prism.r: enable murmurlassulus2018-06-221-0/+8
* | l cabal.r: remove unneeded stufflassulus2018-06-221-5/+0
* | l baseX: add nix-indexlassulus2018-06-201-0/+1
* | l: add radio.lassul.uslassulus2018-06-202-0/+13
* | buildbot: also fetch submoduleslassulus2018-06-201-0/+1
* | nix-writers: init submoduletv2018-06-1926-336/+37
* | Merge remote-tracking branch 'onondaga-http/master'lassulus2018-06-141-2/+13
|\ \ | |/ |/|
| * nin axon: add login manager & some programsprism/ninnin2018-06-141-2/+13
* | ma wbob.r: disable hydra (for now)makefu2018-06-141-1/+1
* | Merge remote-tracking branch 'lass/master'makefu2018-06-1436-313/+287
|\|
| * Merge remote-tracking branch 'gum/master'lassulus2018-06-139-51/+77
| |\
| * \ Merge remote-tracking branch 'ni/master'lassulus2018-06-136-27/+19
| |\ \
| | * | tv gitrepos: add nix-writerstv2018-06-121-0/+1
| | * | tv kaepsele: RIPtv2018-05-311-24/+0
| | * | ejabberd: use utillinux's flocktv2018-05-251-2/+1
| | * | tv urlwatch nixos: 17.09 -> 18.03tv2018-05-121-1/+1
| | * | tv xmonad: add otpmenutv2018-05-091-0/+1
| | * | tv otpmenu: inittv2018-05-091-0/+15
| * | | github krebscode -> krebsprism/staging/githublassulus2018-06-129-13/+13
| * | | Revert "l prism.r: remove unnecessary iptables forward"lassulus2018-06-111-0/+15