summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* Merge remote-tracking branch 'cd/master'lassulus2016-06-070-0/+0
|\
| * Merge remote-tracking branch 'cloudkrebs/master'tv2016-06-0684-702/+2213
| |\
* | \ Merge remote-tracking branch 'gum/master'lassulus2016-06-074-23/+35
|\ \ \
| * | | k 5 acng: 0.8.8 -> 0.9.3makefu2016-06-061-2/+2
| | | |
| * | | Merge remote-tracking branch 'prism/master'makefu2016-06-069-32/+336
| |\ \ \
| * | | | s 2 buildbot: disable deployment test to cacmakefu2016-06-061-20/+27
| | | | |
| * | | | s 2 base: bump rev to 16.03makefu2016-06-061-1/+1
| | | | |
| * | | | m 2 hw: add config for rtl8812au wifimakefu2016-06-051-0/+5
| | |_|/ | |/| |
* | | | l 2 websites domsen: www. for most domainslassulus2016-06-071-10/+10
| | | |
* | | | l 2 xserver Xresources: steal tv's colorslassulus2016-06-061-4/+43
| | | |
* | | | l 2: bump nixpkgs f632f8e -> 5ae35cdlassulus2016-06-061-1/+1
| | | |
* | | | l 1 shodan: mount /dev/pool/home-lasslassulus2016-06-061-0/+5
| | | |
* | | | l 1 shodan: activate gitlassulus2016-06-061-0/+1
| | | |
* | | | l 1 mors: disable broken startupScriptlassulus2016-06-061-1/+1
| | | |
* | | | l 1: move hardware: mors <-> shodanlassulus2016-06-062-6/+6
| |/ / |/| |
* | | Merge remote-tracking branch 'cd/master'lassulus2016-06-056-32/+141
|\ \ \ | | |/ | |/|
| * | krebs.setuid: add option "envp"tv2016-06-051-1/+5
| | |
| * | make build.pkgs.${name}tv2016-06-051-0/+12
| | |
| * | krebs pkgs.writeBash{,Bin}: inittv2016-06-051-0/+15
| | |
| * | krebs pkgs.{writeHaskellBin => writeHaskell}tv2016-06-043-31/+96
| | |
| * | krebs types.haskell.{con,mod}id: inittv2016-06-041-0/+13
| | |
* | | Merge remote-tracking branch 'cd/master'lassulus2016-06-033-0/+195
|\| | | |/ |/|
| * xu: use qtv2016-06-031-0/+1
| |
| * tv: import qtv2016-06-032-0/+194
| |
* | Merge remote-tracking branch 'prism/master'makefu2016-06-021-1/+2
|\ \
| * \ Merge remote-tracking branch 'gum/master'lassulus2016-06-0213-136/+243
| |\ \
| * | | l 2 baseX: add lm_sensors to pkgslassulus2016-06-021-1/+2
| | | |
* | | | ma 5: remove leftover `./result`makefu2016-06-021-1/+0
| |/ / |/| |
* | | k 2 steam.nix: initmakefu2016-06-021-0/+6
| | |
* | | ma 2 exim-retiolum: add firewall exception for exim-retiolummakefu2016-06-021-1/+2
| | |
* | | ma 1 pornocauster: cleanupmakefu2016-06-021-8/+22
| | |
* | | k 3 ma: fix addrs4 for tpswmakefu2016-06-021-2/+2
| | |
* | | m 2 default:use stable branchmakefu2016-06-021-2/+3
| | |
* | | Merge remote-tracking branch 'cd/master'makefu2016-06-022-118/+113
|\ \ \ | | |/ | |/|
| * | tv ff: use abspath to sudotv2016-05-252-4/+8
| | |
| * | tv xserver: replace need-reload by echotv2016-05-252-3/+2
| | |
| * | tv xserver: normalize syslog identifierstv2016-05-251-0/+3
| | |
| * | tv xserver: log to journal instead of filetv2016-05-251-2/+1
| | | | | | | | | | | | This is a partial backport of NixOS/nixpkgs d84741a.
| * | tv xserver: refactortv2016-05-252-115/+105
| | |
* | | Merge remote-tracking branch 'prism/master'makefu2016-06-0226-441/+608
|\ \ \ | | |/ | |/|
| * | k 5: disable buildbot overridelassulus2016-06-011-7/+7
| | |
| * | l 2 websites util: add server-names to manageCertslassulus2016-06-011-0/+1
| | |
| * | l 2 websites: put sqlBackup in seperate filelassulus2016-06-013-70/+69
| | |
| * | l 2 exim-smarthost: redirect dominik@apanowicz.delassulus2016-06-011-0/+1
| | |
| * | l 2 exim-smarthost: add mail for finanzamtlassulus2016-06-011-0/+1
| | |
| * | l 2: bump nixpkgs e781dae -> f632f8elassulus2016-06-011-1/+1
| | |
| * | l 2: add mainUser to fuse for sshfslassulus2016-06-011-0/+1
| | |
| * | l 2 browsers: add com browserlassulus2016-06-011-0/+1
| | |
| * | l 1 mors: add remmina to pkgslassulus2016-06-011-0/+1
| | |
| * | k 3 nginx: unique server-names to silence nginxlassulus2016-06-011-1/+1
| | |