summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* ma gum.r: bitlbee with telegrammakefu2017-07-211-2/+7
* Merge branch 'master' of prism:stockholmmakefu2017-07-2116-67/+156
|\
| * krebs shared-buildbot: use ipv4 localhostlassulus2017-07-211-1/+1
| * krebs: bump nixos-versionlassulus2017-07-211-1/+1
| * krebs: init puyaklassulus2017-07-203-0/+82
| * l websites domsen: serve some www. siteslassulus2017-07-201-2/+8
| * l echelon: remove deprecated dnsmasq settingslassulus2017-07-201-11/+0
| * l prism: define all krebs users in one placelassulus2017-07-201-22/+20
| * l: rip makefu-siplassulus2017-07-202-22/+0
| * Merge remote-tracking branch 'gum/master'lassulus2017-07-184-13/+20
| |\
| * | lass: init otp-sshlassulus2017-07-172-0/+19
| * | l git: announce brainlassulus2017-07-171-1/+13
| * | l nixpkgs: 67956cc -> d486531lassulus2017-07-171-1/+1
| * | Merge remote-tracking branch 'gum/master'lassulus2017-07-1715-26/+50
| |\ \
| * | | l wine: use wineFulllassulus2017-07-171-1/+2
| * | | lass downloading: add wine-mors to authorized_keyslassulus2017-07-161-0/+1
| * | | l mors: reactivate /bkulassulus2017-07-161-5/+5
| * | | krebs lass: add wine-mors pubkeylassulus2017-07-161-0/+3
* | | | wolf.r: add makefu-omo pubkeymakefu2017-07-211-0/+1
| |_|/ |/| |
* | | ma sources: refactor redundant musnix in [vw]bob, studiomakefu2017-07-173-12/+19
* | | wbob.r: cores = 4makefu2017-07-161-1/+1
| |/ |/|
* | ma wbob: virtual displaymakefu2017-07-162-1/+20
* | ma vncserver: use upstream tigervnc againmakefu2017-07-161-3/+2
* | ma: add dmesg aliasmakefu2017-07-161-0/+1
* | ma source: bump nixpkgs to 0751450makefu2017-07-161-1/+1
* | ma sources: add musnix to studio,vbob,wbobmakefu2017-07-163-3/+11
* | ma: move torrent secrets to source.nixmakefu2017-07-166-16/+10
* | 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