summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'tv2017-11-027-2/+55
|\
| * l nixpkgs: ac2bb56 -> 6a0a00dlassulus2017-11-011-1/+1
| * Merge remote-tracking branch 'ni/master'lassulus2017-10-273-46/+33
| |\
| * | l nixpkgs: c99239b -> ac2bb56lassulus2017-10-271-1/+1
| * | Merge remote-tracking branch 'ni/master'lassulus2017-10-262-2/+1
| |\ \
| * \ \ Merge remote-tracking branch 'ni/master'lassulus2017-10-263-109/+46
| |\ \ \
| * | | | 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
* | | | | tv: RIP wvdialtv2017-11-021-9/+0
* | | | | tv: use git-previewtv2017-11-021-0/+1
* | | | | tv: use pidgin-with-plugins.overridetv2017-11-022-4/+6
* | | | | tv querel: inittv2017-11-023-0/+130
| |_|_|/ |/| | |
* | | | tv: netzclub -> ppptv2017-10-273-38/+33
* | | | tv netzclub: simplify AT codetv2017-10-271-10/+2
* | | | tv netzclub: add missing "tv2017-10-261-1/+1
* | | | tv netzclub: fix exampletv2017-10-261-1/+1
| |_|/ |/| |
* | | tv netzclub: { -> pkgs.}ppptv2017-10-261-1/+1
* | | tv modules: rm umtstv2017-10-261-1/+0
| |/ |/|
* | tv xu: lol wvdialtv2017-10-261-1/+0
* | tv netzclub: inittv2017-10-262-0/+46
* | tv umts: RIPtv2017-10-262-108/+0
|/
* 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