summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | |
| * | l 1 prism: add cgit for cgit.lassul.uslassulus2016-06-011-1/+9
| | |
| * | l 1 prism: import buildbot normallylassulus2016-05-311-6/+1
| | |
| * | l: move websites libs to 2/websites/utillassulus2016-05-316-238/+248
| | |
| * | k 3 iptables: allow DNAT ruleslassulus2016-05-291-1/+1
| | |
| * | l 2 radio print_current: show youtube linklassulus2016-05-251-1/+3
| | |
| * | l 2 websites fritz: use ssl everywherelassulus2016-05-251-7/+7
| | |
| * | l 2 websites domsen: use old phpIni againlassulus2016-05-251-3/+12
| | |
| * | l 2 radio: add config for lassul.us/the_playlistlassulus2016-05-251-0/+25
| | |
| * | l 2 radio: add Reaktor configlassulus2016-05-251-0/+19
| | |
| * | l 2 radio: add and use utilslassulus2016-05-251-5/+21
| | |
| * | l 2 git: add the_playlist without announcementlassulus2016-05-251-0/+7
| | |
| * | l 2: use nixos-16.03 with new ts3 serverlassulus2016-05-251-2/+2
| | |
| * | Merge remote-tracking branch 'cd/master' into HEADlassulus2016-05-259-101/+156
| |\|
| | * tv slock: user krebs.setuidtv2016-05-251-4/+10
| | |
| | * tv xserver: compress need-reloadtv2016-05-251-6/+4
| | |
| | * tv xmodmap: inittv2016-05-252-0/+28
| | |
| | * tv xserver: drop wrappertv2016-05-251-13/+9
| | |
| | * xmonad-tv: startupHook = $XMONAD_STARTUP_HOOK &tv2016-05-252-26/+13
| | |
| | * xmonad-tv: don't use PATHtv2016-05-252-22/+25
| | |
| | * tv nix.vim: admit Vim commentstv2016-05-251-0/+3
| | |
| | * tv nix.vim: admit Haskell commentstv2016-05-251-0/+4
| | |
| | * xmonad-tv: convert to writeHaskellBintv2016-05-256-30/+15
| | |
| | * writeNixFromCabal: deprecatetv2016-05-251-3/+8
| | |
| | * writeHaskellBin: inittv2016-05-251-0/+40
| | |