summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'temp/master'nin2017-10-17124-690/+2318
|\
| * l nixpkgs: 2231575 -> 68ef4b1lassulus2017-10-161-1/+1
| |
| * Merge remote-tracking branch 'gum/master'lassulus2017-10-132-0/+2
| |\
| | * ma modules.wvdial: re-initmakefu2017-10-111-0/+1
| | |
| | * ma binary-cache/lass: add new cache keymakefu2017-10-111-0/+1
| | |
| * | l nixpkgs: 1987983 -> 2231575lassulus2017-10-131-1/+1
| | |
| * | types: add cidr and use as net.addresslassulus2017-10-111-3/+23
| | |
| * | l eddie.r: route to edinburghlassulus2017-10-111-1/+7
| | |
| * | Merge remote-tracking branch 'gum/master'lassulus2017-10-106-3/+79
| |\|
| | * ma cake.r: add tvmakefu2017-10-101-0/+3
| | |
| | * ma wvdial: re-addmakefu2017-10-102-2/+72
| | |
| | * ma latte.r: add torrentmakefu2017-10-102-1/+3
| | |
| | * ma tools/dev: add cdrtoolsmakefu2017-10-091-0/+1
| | |
| * | Revert "zandroum: RIP"lassulus2017-10-101-0/+83
| | | | | | | | | | | | This reverts commit 42ec8d15a33dae63638d60eb3bb45d3ec40d12a3.
| * | zandroum: RIPlassulus2017-10-101-83/+0
| | |
| * | Merge remote-tracking branch 'ni/master'lassulus2017-10-094-17/+40
| |\ \
| | * | tv: add deploy aliastv2017-10-051-0/+6
| | | |
| | * | tv mu systemPackages: drop custom KDE localestv2017-10-051-3/+0
| | | | | | | | | | | | | | | | | | | | | | | | | | | | Apparently each application ships their own locales now. See discussion at https://github.com/NixOS/nixpkgs/commit/d7e9248debe66225 nixpkgs-17.09 fixup
| | * | tv urlwatch nixos: 17.03 -> 17.09tv2017-10-041-1/+1
| | | |
| | * | tv ejabberd: sudo -u ejabberd ejabberdctltv2017-10-031-1/+15
| | | |
| | * | tv ejabberd: symlinkJoin ejabberd wrappertv2017-10-031-13/+19
| | | |
| * | | Merge remote-tracking branch 'gum/master'lassulus2017-10-0916-37/+64
| |\ \ \ | | | |/ | | |/|
| | * | gum.r: disable privkey setting via krebsmakefu2017-10-083-2/+5
| | | | | | | | | | | | | | | | manually configure the secrets instead
| | * | ma cake.r: add firmware for wifimakefu2017-10-081-0/+14
| | | |
| | * | makefu: add makefu-android identitymakefu2017-10-082-1/+5
| | | |
| | * | Merge remote-tracking branch 'lass/master'makefu2017-10-084-2/+2
| | |\ \
| | * | | ma source: add patch for mitmproxymakefu2017-10-081-1/+2
| | | | |
| | * | | ma europastats: request2 -> requestsmakefu2017-10-081-1/+1
| | | | |
| | * | | ma pkgs.inkscape: update patchmakefu2017-10-081-6/+5
| | | | |
| | * | | ma tools/steam: remove overridemakefu2017-10-081-3/+1
| | | | |
| | * | | ma pkgs.drozer: fix buildmakefu2017-10-071-1/+1
| | | | |
| | * | | ma devpi: use devpi-client from upstreammakefu2017-10-071-1/+1
| | | | |
| | * | | ma source: bump to latest unstablemakefu2017-10-071-7/+2
| | | | |
| | * | | ma x.r: disabel remode building againmakefu2017-10-072-1/+4
| | | | |
| | * | | Merge remote-tracking branch 'lass/master'makefu2017-10-0746-316/+320
| | |\ \ \
| | * | | | ma server-config: retabmakefu2017-10-031-8/+7
| | | | | |
| | * | | | ma tools: use wireshark from optionsmakefu2017-10-031-4/+11
| | | | | |
| | * | | | ma cake.r/source: full deploymakefu2017-10-031-1/+2
| | | | | |
| | * | | | ma cake.r: disable tmpfsmakefu2017-10-031-1/+3
| | | | | |
| | * | | | ma urlwatch: add iozonemakefu2017-10-021-0/+1
| | | | | |
| * | | | | l pkgs.xmonad: urxvtcPath -> myTermlassulus2017-10-091-5/+5
| | | | | |
| * | | | | l vim: add ack-vimlassulus2017-10-091-1/+4
| | | | | |
| * | | | | l mail: show inbox less strictlylassulus2017-10-091-5/+2
| | | | | |
| * | | | | l dns-stuff: add gum as resolverlassulus2017-10-091-3/+6
| | | | | |
| * | | | | l: add pkgs.filelassulus2017-10-091-0/+1
| | | | | |
| * | | | | l prism.r: start minecraft serverlassulus2017-10-091-0/+7
| | | | | |
| * | | | | l mors.r: add deploy/predeploy helperslassulus2017-10-091-0/+34
| | | | | |
| * | | | | l: use hack fonts everywherelassulus2017-10-094-9/+26
| | | | | |
| * | | | | l helios.r: add multihead configlassulus2017-10-091-0/+5
| | | | | |
| * | | | | l daedalus.r: add pkgs.audacitylassulus2017-10-091-0/+1
| | | | | |