summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'prism/master'nin2017-10-2014-38/+84
|\ \ \
| * | | l: make screenlock configureablelassulus2017-10-196-19/+42
| * | | l nixpkgs: 68ef4b1 -> c99239blassulus2017-10-181-1/+1
| * | | Merge remote-tracking branch 'ni/master'lassulus2017-10-181-12/+13
| |\| |
| | * | git-preview: use worktreestv2017-10-171-12/+13
| * | | l dns: don't resolve local querieslassulus2017-10-181-0/+1
| * | | l baseX: set default font to cleanlassulus2017-10-181-3/+3
| * | | l: set ca-bundle to /etc/ssllassulus2017-10-181-1/+1
| * | | l pkgs.xmonad: add color invertlassulus2017-10-181-0/+2
| * | | l prism.r: add hellrazor userlassulus2017-10-181-0/+8
| * | | Reaktor plugins: fix wiki-todo-showlassulus2017-10-181-1/+2
| * | | news: add painloadlassulus2017-10-181-0/+1
| * | | Merge remote-tracking branch 'ni/master'lassulus2017-10-171-1/+10
| |\| | | | |/ | |/|
| | * cgit: reduce log spamtv2017-10-171-1/+10
* | | Merge remote-tracking branch 'temp/master'nin2017-10-178-106/+61
|\| |
| * | Merge remote-tracking branch 'ni/master'lassulus2017-10-178-106/+61
| |\|
| | * populate: 1.2.4 -> 1.2.5tv2017-10-171-2/+2
| | * shell: proxy call original cmdline remotelytv2017-10-171-5/+6
| | * withGetopt: export WITHGETOPT_ORIG_ARGStv2017-10-171-1/+4
| | * quote: inittv2017-10-172-12/+14
| | * krebs exim-smarthost: add eloop2017@krebsco.detv2017-10-161-0/+1
| | * tv xmonad: use default layout for imtv2017-10-161-5/+1
| | * exim-{retiolum,smarthost} module: simplify ACLtv2017-10-162-81/+33
* | | 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
| * | | 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
| | * | 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
| | * | 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