summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'ni/master'lassulus2017-10-263-109/+46
|\
| * tv xu: lol wvdialtv2017-10-261-1/+0
| * tv netzclub: inittv2017-10-262-0/+46
| * tv umts: RIPtv2017-10-262-108/+0
* | l: steal br from tvlassulus2017-10-262-0/+49
* | l: allow dns requests from retiolumlassulus2017-10-261-0/+1
* | l domsen: add habsys mailslassulus2017-10-261-0/+2
* | l: add tomtop@lassul.uslassulus2017-10-261-0/+1
* | l screenlock: fix enableOptionlassulus2017-10-261-1/+1
|/
* 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 'ni/master'lassulus2017-10-178-106/+61
| | |\ \ \
| * | | | | 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 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