summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of prism:stockholmmakefu2017-07-163-2/+7
|\
| * krebs: remove duplicate mail settinglassulus2017-07-161-1/+0
| * Merge remote-tracking branch 'gum/master'lassulus2017-07-1642-316/+366
| |\
| * | l baseX: add hledger to pkgslassulus2017-07-141-0/+1
| * | l websites domsen: serve www. for habsyslassulus2017-07-141-1/+6
* | | ma vbob|sdev: fix includesmakefu2017-07-152-2/+5
| |/ |/|
* | ma iodined: run with -cmakefu2017-07-151-1/+1
* | ma: rip krebs.build.sourcemakefu2017-07-151-28/+1
* | ma: deploy musnix via new source.nixmakefu2017-07-155-17/+4
* | ma: replace path to 2configs, init source.nixmakefu2017-07-1535-213/+274
* | ma: move systems to subdir, init sourcemakefu2017-07-1518-0/+29
|/
* Merge remote-tracking branch 'ni/master'lassulus2017-07-144-8/+17
|\
| * shell test: dummy_secrets=true before populatetv2017-07-141-1/+2
| * tv source: no secret-{common,master} when dummy_secretstv2017-07-141-2/+4
| * l buildbot: shared -> krebstv2017-07-141-3/+3
| * tv bash: add /* sh */tv2017-07-141-2/+2
| * tv bash: cd to repo at stockholm workspacetv2017-07-141-0/+6
* | nin source: fix dummy-secrets pathlassulus2017-07-141-1/+1
* | Merge remote-tracking branch 'onondaga/master'lassulus2017-07-147-27/+42
|\ \
| * | move source config from module system to 1systems/*/source.nixnin2017-07-137-27/+42
* | | Merge remote-tracking branch 'ni/master'lassulus2017-07-1453-103/+100
|\ \ \ | |/ / |/| / | |/
| * merge shared into krebstv2017-07-1452-97/+90
| * shell: support --usertv2017-07-132-7/+11
* | l dns-stuff: remove dns42 stufflassulus2017-07-131-1/+0
* | Merge remote-tracking branch 'ni/master'lassulus2017-07-138-270/+68
|\|
| * Merge remote-tracking branch 'prism/master'tv2017-07-1342-192/+256
| |\
| * | tv nixpkgs: 1b57bf2 -> 94941cbtv2017-07-131-1/+1
| * | tv: systemPackages += kpastetv2017-07-121-0/+1
| * | tv vim: RIP ctrlptv2017-07-121-42/+2
| * | tv backup: add xu-home-nomictv2017-07-121-0/+6
| * | tv pulse: add 32-bit supporttv2017-07-121-1/+14
| * | Makefile: reimplement {deploy,test} using shelltv2017-07-121-31/+6
| * | tv xserver: stop feh leaking into systemPackagestv2017-07-121-0/+5
| * | tv xserver: xrdb without -mergetv2017-07-121-1/+1
| * | tv xserver: systemPackages += xdotooltv2017-07-121-0/+1
| * | tv URxvt saveLines: 4096 -> 10000tv2017-07-121-1/+1
| * | tv Xresources: cleanuptv2017-07-121-193/+30
* | | l nixpkgs: 0aac3fc -> 67956cclassulus2017-07-131-1/+1
| |/ |/|
* | Merge remote-tracking branch 'ni/master'lassulus2017-07-122-2/+2
|\|
| * tv mu: enable{All => Redistributable}Firmwaretv2017-07-121-1/+1
| * tv wu: enable{All => Redistributable}Firmwaretv2017-07-121-1/+1
* | l git: announce staging* brancheslassulus2017-07-121-1/+1
* | l mail: show multiple recipentslassulus2017-07-121-1/+1
* | lass mors&icarus: swap hardwarelassulus2017-07-122-3/+3
* | Merge remote-tracking branch 'ni/master'lassulus2017-07-120-0/+0
|\|
| * tv alnus source: overrid nixpkgs reftv2017-07-122-1/+1
| * tv source: make nixpkgs ref easily overridabletv2017-07-121-16/+21
| * lib.eval-source: allow source to be a listtv2017-07-121-3/+1
* | Merge branch 'staging/source'lassulus2017-07-1264-282/+403
|\ \
| * | tv alnus source: overrid nixpkgs reftv2017-07-122-1/+1