summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Makefile: interpolate $(target_*) for a nicer logtv2016-02-121-2/+2
* xmonad-stockholm: 1.0.0 -> 1.1.0tv2016-02-122-15/+14
* nixpkgs: expose stockholm pkgstv2016-02-122-2/+5
* Merge remote-tracking branch 'gum/master'tv2016-02-1116-91/+134
|\
| * s 2 base: bump revisionmakefu2016-02-111-1/+1
| * k 3 tinc_graphs: use new tinc-hostsmakefu2016-02-111-1/+1
| * Merge remote-tracking branch 'cd/master'makefu2016-02-111-13/+16
| |\
| * \ Merge remote-tracking branch 'cd/master'makefu2016-02-11204-2138/+1410
| |\ \
| * | | k 5 repo-sync: initmakefu2016-02-111-0/+19
| * | | s 2 buildbot: poll stockholm-mirrormakefu2016-02-111-5/+9
| * | | ma 2 default: bump to newest unstablemakefu2016-02-111-1/+2
| * | | Merge branch 'master' of gum.krebsco.de:stockholmmakefu2016-02-111-3/+2
| |\ \ \
| | * | | ma 1 vbob: deployable againmakefu2016-02-101-3/+2
| * | | | ma: refactoringmakefu2016-02-117-45/+32
| * | | | ma 1 wbob: cleanup, add awesomerc todomakefu2016-02-111-12/+53
| * | | | k 3 fetchWallpaper: scrap predicate, use unitConfigmakefu2016-02-112-23/+15
| |/ / /
* | | / krebs.retiolum.hosts*: bump descriptiontv2016-02-111-3/+17
| |_|/ |/| |
* | | krebs.retiolum: make hostsPackage configurabletv2016-02-111-13/+16
| |/ |/|
* | cac-api: PATH += gnugrep (how could this ever pass full-tests?! :D)tv2016-02-111-1/+2
* | tv x220: rm AccepMethod snatv2016-02-111-3/+0
* | tv x220: remove unused stufftv2016-02-111-13/+0
* | *: turn 5pkgs into a(n optional) moduletv2016-02-118-86/+85
* | krebs.nixpkgs.allowUnfreePredicate: inittv2016-02-104-2/+46
* | krebs.backup: admit plan.startAttv2016-02-081-2/+1
* | tv git: bump descstv2016-02-081-5/+5
* | tv.iptables: inline startScript and use SyslogIdentifiertv2016-02-081-11/+7
* | Merge remote-tracking branch 'cloudkrebs/master'tv2016-02-0831-84/+816
|\ \
| * | l 2 xserver: add pulseaudio to xserver depslassulus2016-02-061-0/+1
| * | l 2 browsers: don't import per-user.nixlassulus2016-02-061-2/+0
| * | l 2 base: require pkgs.proot for stockholmlassulus2016-02-061-0/+1
| * | l 2 base: krebs.source adapt to api changelassulus2016-02-061-12/+12
| * | l 1 mors: pkgs.cac -> pkgs.cac-apilassulus2016-02-061-1/+1
| * | Merge remote-tracking branch 'cd/master'lassulus2016-02-06198-2585/+881
| |\ \
| * | | l 1 dishfire: import git.nixlassulus2016-02-011-0/+1
| * | | k 3 l: add ssh host key for dishfirelassulus2016-02-011-2/+2
| * | | l 1 helios: import git.nixlassulus2016-02-011-0/+1
| * | | l: add fritz websites to dishfirelassulus2016-02-012-0/+34
| * | | l 3 *_nginx: allow configuration of ssllassulus2016-02-013-5/+97
| * | | l 2 xserver: copy default.nix from tvlassulus2016-02-011-3/+4
| * | | l 2 newsbot-js: disable truther feedlassulus2016-02-011-1/+1
| * | | l 2 websites wohnprojekt: add laura userlassulus2016-02-011-0/+6
| * | | l 2 buildbot-sta..: change name to buildbot-lasslassulus2016-02-011-1/+1
| * | | l 1 mors: update nginx testslassulus2016-02-011-36/+55
| * | | l: add helios as new systemlassulus2016-02-013-0/+113
| * | | l 2: give helios & uriel more accesslassulus2016-02-012-4/+5
| * | | l 1 mors: remove redundant retiolum importlassulus2016-02-011-1/+0
| * | | k 3 l: declare pubkeys inlinelassulus2016-02-013-5/+3
| * | | k 3 l: remove dead hostslassulus2016-02-011-16/+0
| * | | Merge remote-tracking branch 'gum/master'lassulus2016-02-0117-32/+231
| |\ \ \
| * \ \ \ Merge remote-tracking branch 'cd/master'lassulus2016-02-0119-92/+425
| |\ \ \ \