summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| * | turn krebs/5pkgs into an overlaytv2017-05-233-16/+8
* | | Merge remote-tracking branch 'prism/nin'lassulus2017-05-232-2/+2
|\ \ \
| * | | n 2 nixpkgs: 5b0c9d4 -> 0afb6d7nin2017-05-231-1/+1
| * | | n 2: change search-domain to rnin2017-05-231-1/+1
* | | | l 2 bepasty: allow write for externalslassulus2017-05-231-1/+1
* | | | Merge branch 'master' of ni:stockholmlassulus2017-05-231-5/+8
|\ \ \ \ | | |/ / | |/| |
| * | | kirk: 1.0.0 -> 1.0.1tv2017-05-231-5/+8
* | | | l 3 pyload: initlassulus2017-05-232-0/+56
* | | | l 2 websites habsys.*: fritz -> domsenlassulus2017-05-232-2/+1
* | | | l 2 websites domsen: remove www. from domainslassulus2017-05-231-2/+2
* | | | l 1 mors: enable elasticsearchlassulus2017-05-231-8/+5
* | | | il 2: move dnscrypt & dnsmasq to dns-stuff.nixlassulus2017-05-223-9/+32
| |/ / |/| |
* | | l 2 nixpkgs: 2bb9c1c -> f469354lassulus2017-05-221-1/+1
* | | l 2 retiolum: add tinc to systemPackageslassulus2017-05-221-1/+5
* | | l 2 baseX: enable X forwardinglassulus2017-05-221-0/+1
* | | l 3 hosts: filter unmanaged hostslassulus2017-05-191-1/+1
* | | k 3 l: define `managed` for every hostlassulus2017-05-191-1/+7
* | | lib/types: add managed bool to host typelassulus2017-05-191-0/+7
|/ /
| |
| \
*-. \ Merge remote-tracking branches 'gum/master' and 'prism/master'tv2017-05-1658-143/+696
|\ \ \ | | |/ | |/|
| | * l 2 retiolum: enable legacy /etc/tinclassulus2017-05-161-0/+1
| | * tinc module: add option enableLegacylassulus2017-05-161-0/+7
| | * l 2 retiolum: don't open smtplassulus2017-05-161-1/+0
| | * k3: retiolum.nix -> tinc.nixlassulus2017-05-162-1/+1
| | * krebs.tinc: expose confDirtv2017-05-161-20/+21
| * | m 2 wiki-irc: also notify #nixosmakefu2017-05-161-2/+2
| * | Merge remote-tracking branch 'lass/master'makefu2017-05-163-37/+22
| |\|
| | * Merge remote-tracking branch 'gum/master'lassulus2017-05-168-7/+8
| | |\
| | * | l 2 buildbot: use buildbotworker as userlassulus2017-05-161-12/+6
| | * | l 2 buildbot: use correct NIX_PATHlassulus2017-05-161-22/+13
| | * | l 3 news: use correct name in enablelassulus2017-05-151-1/+1
| | * | weechat: 1.7.1 -> 1.8lassulus2017-05-151-2/+2
| * | | m 2 realtime-audio:enable optimizationmakefu2017-05-161-0/+4
| | |/ | |/|
| * | s 2 default: bump to 22da5d02466ffe465735986d705675982f3646a0makefu2017-05-151-1/+1
| * | Merge remote-tracking branch 'lass/master'makefu2017-05-1513-21/+141
| |\|
| | * l 2 nixpkgs: 11b82a9 -> 2bb9c1classulus2017-05-151-1/+1
| | * l 5 xml2json: initlassulus2017-05-152-0/+18
| | * l 3 news: initlassulus2017-05-122-0/+77
| | * Merge remote-tracking branch 'gum/master'lassulus2017-05-1226-31/+441
| | |\
| | * | k 5 R sed: write englishlassulus2017-05-121-1/+1
| | * | k 5 R sed: make pep80 happylassulus2017-05-121-7/+9
| | * | l 2 mpv: install mpv for all userslassulus2017-05-111-1/+1
| | * | l 2 w lass: /etc/hosts -> pkgs.retiolum-hostslassulus2017-05-111-1/+1
| | * | l 3 l: .internet -> .ilassulus2017-05-111-5/+4
| | * | Merge remote-tracking branch 'ni/master'lassulus2017-05-094-5/+29
| | |\ \
| * | | | m 2 default: fix nixpkgs requests2 fuckupmakefu2017-05-151-1/+1
| * | | | m 2 urlwatch: follow msfmakefu2017-05-151-0/+1
| * | | | m: requests2 -> requestsmakefu2017-05-125-5/+5
| | |_|/ | |/| |
| * | | m 2 default: bump to 0afb6d7makefu2017-05-121-1/+1
| * | | m 1 studio: provide vnc and realtime audiomakefu2017-05-121-25/+30
| * | | m 1 gum: enable v6makefu2017-05-121-2/+9