summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'nin2017-11-0712-11/+107
|\
| * l nixpkgs: 6a0a00d -> e53e9a2lassulus2017-11-071-1/+1
| * l helios.r: add office related stufflassulus2017-11-021-0/+10
| * l nixpkgs: ac2bb56 -> 6a0a00dlassulus2017-11-011-1/+1
| * Merge remote-tracking branch 'ni/master'lassulus2017-10-273-46/+33
| |\
| | * 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
| * | l nixpkgs: c99239b -> ac2bb56lassulus2017-10-271-1/+1
| * | Merge remote-tracking branch 'ni/master'lassulus2017-10-262-2/+1
| |\|
| | * tv netzclub: { -> pkgs.}ppptv2017-10-261-1/+1
| | * tv modules: rm umtstv2017-10-261-1/+0
| * | 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
| |\
| * | 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
* | | n nixpkgs: c99239b -> cfafd6fnin2017-11-071-1/+1
| |/ |/|
* | 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
| |\|
| | * 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