summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | Merge remote-tracking branch 'prism/master'tv2017-10-2626-43/+204
| |\|
| | * n nixpkgs: 9824ca6 -> c99239bnin2017-10-241-1/+1
| | * n 2 default: add pavucontrolnin2017-10-241-0/+1
| | * nin hiawatha firefox: remove flashnin2017-10-241-4/+0
| | * n 2 default: update binary-cachenin2017-10-241-6/+1
| | * 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
| | | |\
| | | * | 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
| | | |\ \
| | * | | | Merge remote-tracking branch 'temp/master'nin2017-10-178-106/+61
| | |\| | |
| | * | | | Merge remote-tracking branch 'temp/master'nin2017-10-17124-690/+2318
| | |\ \ \ \
| | * \ \ \ \ Merge branch 'master' of prism:stockholmnin2017-09-2957-333/+979
| | |\ \ \ \ \
| | * | | | | | nin nixpkgs 9e7d9a -> 9824ca6nin2017-09-291-1/+1
| | * | | | | | nin nixpkgs: 799435b -> 9e7db9anin2017-09-141-1/+1
| | * | | | | | Merge remote-tracking branch 'prism/master'nin2017-09-1454-359/+798
| | |\ \ \ \ \ \
| | * | | | | | | nin: add skypenin2017-09-062-0/+28
| | * | | | | | | nin: allow icmp6nin2017-09-061-0/+1
| * | | | | | | | brscan4: init at 0.4.4-4tv2017-10-262-8/+9
| * | | | | | | | tv xu: enable umtstv2017-10-241-0/+9
| * | | | | | | | tv umts: cleanuptv2017-10-241-59/+46
| * | | | | | | | tv umts: import from lasstv2017-10-242-0/+113
| | |_|_|_|_|_|/ | |/| | | | | |
| * | | | | | | git-preview: use worktreestv2017-10-171-12/+13
| | |_|_|_|_|/ | |/| | | | |
| * | | | | | cgit: reduce log spamtv2017-10-171-1/+10
* | | | | | | mv makefu/{slog,internetarchive} krebs/makefu2017-10-273-33/+45
* | | | | | | ma pkgs.slog: initmakefu2017-10-271-0/+20
* | | | | | | ma pkgs.internetarchive: initmakefu2017-10-261-0/+32
| |_|_|_|_|/ |/| | | | |
* | | | | | 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
* | | | | 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
|\| | | | |