summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of pnp:stockholmmakefu2015-10-2771-438/+2499
|\
| * m 1 pnp: make urlwatch verbose, update url listmakefu2015-10-262-0/+4
| * k 3 urlwatch: add verbose flagmakefu2015-10-261-1/+8
| * tinc_graphs: clean up mv {makefu,krebs}makefu2015-10-262-3/+2
| * k 3 tinc_graphs: is now completely self-containedmakefu2015-10-252-4/+7
| * Merge remote-tracking branch 'cd/master'makefu2015-10-2515-92/+330
| |\
| | * wolf: build.source.dir.*.host = current.hosttv2015-10-251-4/+2
| | * init krebs.currenttv2015-10-253-1/+32
| | * init users.shared.wolftv2015-10-256-0/+171
| | * tv xmonad: read initial workspaces from filetv2015-10-252-11/+35
| | * tv: drop test.nixtv2015-10-252-32/+0
| | * {tv cfgs => krebs pkgs} writeNixFromCabaltv2015-10-252-3/+5
| | * tv xmonad: purge some stale commentstv2015-10-251-31/+0
| | * gitignore tv xmonad shell.nixtv2015-10-251-0/+1
| | * tv xmonad service: save state on shutdowntv2015-10-253-18/+92
| * | wry: listen for graphs.retiolummakefu2015-10-252-1/+2
| * | Merge remote-tracking branch 'cd/master'makefu2015-10-2520-127/+1455
| |\|
| | * tv URxvt*url-select.launcher = fftv2015-10-244-16/+12
| | * tv xmonad: provide xresources to myRootTermtv2015-10-242-1/+6
| | * tv xmonad: PATH += su (setuid-wrappers)tv2015-10-241-1/+1
| | * tv: lol display-managertv2015-10-2415-59/+171
| | * tv: nano really is just vimtv2015-10-2410-4/+1059
| | * tv: import ~/.Xresourcestv2015-10-241-0/+214
| | * stockholm: lol literatetv2015-10-241-55/+0
| | * l 2: add ctv2015-10-241-0/+1
| | * Merge remote-tracking branches 'mors/master' and 'pnp/master'tv2015-10-241-5/+7
| | |\
| * | | Merge remote-tracking branch 'cloudkrebs/master'makefu2015-10-2341-270/+751
| |\| |
| | * | Merge remote-tracking branch 'cd/master'lassulus2015-10-2215-83/+99
| | |\ \
| | | * \ Merge remote-tracking branch 'pnp/master'tv2015-10-2220-77/+482
| | | |\ \
| | | * | | wu nixpkgs: 9048637 -> e916273tv2015-10-221-5/+2
| | | * | | tv base systemPackages += gittv2015-10-225-4/+6
| | | * | | nomic: bump file systemstv2015-10-221-8/+5
| | | * | | krebs.nixos-install: cacert -> /root/SSL_CERT_FILEtv2015-10-221-2/+2
| | | * | | krebs.nixos-install: fail if pkg cannot be foundtv2015-10-221-6/+10
| | | * | | krebs.*: make StrictHostKeyChecking configurabletv2015-10-222-3/+8
| | | * | | wu nixpkgs: f77bf46 -> 9048637tv2015-10-211-2/+5
| | | * | | stockholm: only inherit in outtv2015-10-211-1/+3
| | * | | | Merge remote-tracking branch 'pnp/master'lassulus2015-10-2110-95/+199
| | |\ \ \ \
| | * | | | | l 1 echelon: add dnsmasq configlassulus2015-10-211-0/+14
| | * | | | | l 3: add dnsmasq.nixlassulus2015-10-211-0/+55
| | * | | | | Merge remote-tracking branch 'cd/master'lassulus2015-10-211-1/+1
| | |\ \ \ \ \ | | | | |/ / / | | | |/| | |
| | | * | | | mkdir: 104.233.84.215 -> 104.167.114.142tv2015-10-211-1/+1
| | * | | | | k 3 l: add cores to testsystemslassulus2015-10-211-0/+1
| | * | | | | Merge remote-tracking branch 'cd/master'lassulus2015-10-212-6/+15
| | |\| | | |
| | | * | | | wu: add alias cgit.wu.retiolumtv2015-10-211-0/+1
| | | * | | | krebs.nixos-infest: set SSL_CERT_FILE properlytv2015-10-211-6/+14
| | * | | | | Merge remote-tracking branch 'cd/master'lassulus2015-10-211-1/+4
| | |\| | | |
| | | * | | | krebs.nixos-install: discover coreutils in /mnttv2015-10-211-1/+4
| | * | | | | Merge remote-tracking branch 'cd/master'lassulus2015-10-211-0/+10
| | |\| | | |
| | | * | | | krebs.nixos-install: bring back chroot wrappertv2015-10-211-0/+10