summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* l 1 uriel: add pavucontrol to pkgslassulus2016-10-191-0/+1
* l 1 uriel: set defaultLocale to de_DElassulus2016-10-191-0/+1
* Merge remote-tracking branch 'gum/master'lassulus2016-10-191-1/+1
|\
| * k 3 rtorrent: revert .binmakefu2016-10-191-1/+1
* | l 2 nixpkgs: 354fd37 -> b8ede35lassulus2016-10-191-1/+1
* | l 2 exim-smarthost: add art@lassul.uslassulus2016-10-191-0/+1
* | l 2 exim-smarthost: add feed@lassul.uslassulus2016-10-191-0/+1
* | l 1 prism: remove obsolete keylassulus2016-10-191-1/+0
* | l 2 websites domsen: dma@apanowicz.de -> gmxlassulus2016-10-191-1/+1
* | l 2 repo-sync: sync lassulus-blog from githublassulus2016-10-191-0/+1
* | l 2 baseX: add youtube-tools to pkgslassulus2016-10-191-0/+2
* | l: add lassulus-blog config, repair ssl for cgitlassulus2016-10-192-48/+92
* | Merge remote-tracking branch 'gum/master'lassulus2016-10-1920-14/+243
|\|
| * k 3 m: init sdev, use ssh secretsmakefu2016-10-191-2/+28
| * k 3 rtorrent: with 16.09 tmux provides explicit .bin outputmakefu2016-10-191-1/+1
| * Merge remote-tracking branch 'cd/master'makefu2016-10-1947-366/+496
| |\
| * | m *: minor changesmakefu2016-10-1914-8/+105
| * | m 2 backup: working configmakefu2016-10-191-2/+6
| * | m 2 elchos: initmakefu2016-10-192-0/+98
| * | m 5 mergerfs: 2.14.0 -> 2.16.1makefu2016-09-281-2/+2
| * | explicitly run rfkill packagemakefu2016-09-191-0/+4
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-162-0/+3
|\ \ \ | | |/ | |/|
| * | xu: mount /bkutv2016-10-131-0/+5
| * | tv q: print TODOs firsttv2016-10-131-4/+5
| * | lib: don't define defaults that require configtv2016-10-134-13/+4
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-137-34/+28
|\ \ \
| * | | xu: mount /bkutv2016-10-131-0/+5
| * | | tv q: print TODOs firsttv2016-10-131-4/+5
| * | | lib: don't define defaults that require configtv2016-10-132-13/+1
| |/ /
| * | krebs lib: move {eq,ne,mod} to libtv2016-10-132-5/+4
| * | lib: inline has-default-nixtv2016-10-132-3/+1
| * | lib: remove addName*tv2016-10-132-6/+6
| * | krebs lib: with libtv2016-10-131-3/+6
* | | Merge remote-tracking branch 'cd/master'lassulus2016-10-132-65/+2
|\| |
| * | tv: security.hideProcessInformation = truetv2016-10-131-0/+1
| * | Merge remote-tracking branch 'prism/master'tv2016-10-1337-254/+405
| |\ \
| * | | exim: RIPtv2016-10-131-64/+0
| * | | tv nixpkgs: 45b2a6d -> 354fd37tv2016-10-131-1/+1
* | | | Revert "k 3 buildbot: remove override (upstream fix)"lassulus2016-10-131-2/+9
| |/ / |/| |
* | | l 2 nixpkgs: 0c022c4 -> 354fd37lassulus2016-10-131-1/+1
* | | l 5 xmonad-lass: use nix-path for i3locklassulus2016-10-131-1/+1
* | | l 2 websites domsen: disable apculassulus2016-10-121-3/+0
* | | l 1 uriel: fix duplicate definition of wirelesslassulus2016-10-121-3/+0
* | | l 1 mors: disable c-base vpnlassulus2016-10-121-1/+1
* | | remove comments from php config, phpfpm errorlassulus2016-10-124-5/+0
* | | l 2 nixpkgs: change url to github/nixoslassulus2016-10-121-1/+1
* | | Merge remote-tracking branch 'prism/master'lassulus2016-10-1119-49/+191
|\ \ \
| * \ \ Merge remote-tracking branch 'gum/master'lassulus2016-10-0616-43/+186
| |\ \ \ | | | |/ | | |/|
| | * | m 5 default: use cups from nixpkgs-stablemakefu2016-09-081-0/+7
| | * | k 3 repo-sync: add more explicit documentationmakefu2016-09-071-6/+34