summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'cd/master'lassulus2016-10-224-43/+2
|\
| * ire: RIPtv2016-10-223-42/+1
| * tv nixpkgs: b8ede35 -> 31c72cetv2016-10-211-1/+1
* | l: import <stockholm/lib>lassulus2016-10-206-8/+6
* | Merge remote-tracking branch 'cd/master'lassulus2016-10-201-1/+1
|\|
| * Merge remote-tracking branch 'gum/master'tv2016-10-201-1/+1
| |\
| | * Merge remote-tracking branch 'prism/lassulus'makefu2016-10-204-26/+7
| | |\
| | * | m 2 laptop-utils: binwalk now in pythonPackagesmakefu2016-10-201-1/+1
* | | | Merge remote-tracking branch 'cd/master'lassulus2016-10-20171-264/+224
|\| | |
| * | | drop config.krebs.libtv2016-10-20165-182/+166
| * | | krebs.lib: use <stockholm/lib>tv2016-10-201-1/+1
| * | | Merge remote-tracking branch 'prism/master'tv2016-10-2038-129/+431
| |\ \ \ | | | |/ | | |/|
| * | | lib: import bulk of krebs/4libtv2016-10-206-81/+56
| * | | tv nixpkgs: 354fd37 -> b8ede35tv2016-10-201-1/+1
| * | | tv URxvt.saveLines: 4096tv2016-10-161-0/+1
* | | | l 1 shodan: add sokratess userlassulus2016-10-201-0/+20
* | | | l 2 websites domsen: remove obsolete codelassulus2016-10-201-32/+0
* | | | l 2 c-base: add cifs-utilslassulus2016-10-201-0/+4
* | | | l 1 mors: activate redislassulus2016-10-201-0/+3
* | | | k 3 l: add sokratess userlassulus2016-10-201-0/+2
| |/ / |/| |
* | | remove haskellPackges.megaparseclassulus2016-10-202-21/+0
* | | m 5 newsbot-js: buildNodePackage via callPackagelassulus2016-10-201-3/+3
* | | Merge remote-tracking branch 'gum/master'lassulus2016-10-201-3/+3
|\ \ \ | | |/ | |/|
| * | m 5 go: buildNodePackage via callPackagemakefu2016-10-201-3/+3
* | | Merge remote-tracking branch 'gum/master'lassulus2016-10-196-34/+71
|\| |
| * | m 2 default: bump ref to stablemakefu2016-10-191-4/+7
| * | m 5 devpi: bumpmakefu2016-10-192-20/+61
| * | s 2: fix obsolete optionmakefu2016-10-192-3/+3
| * | m 5 default: remove cups fallbackmakefu2016-10-191-7/+0
* | | l 1 uriel: gummiboot -> systemd-bootlassulus2016-10-191-2/+2
* | | 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