stockholm - take all the computers hostage, they'll love you!

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'ni/master'	lassulus	2017-05-29	75	-54/+79
\|\
\| *	{lass,makefu}: fix path to simple pkgs	tv	2017-05-24	3	-3/+3
\| *	krebs/5pkgs: reformat	tv	2017-05-24	1	-23/+27
\| *	krebs/5pkgs: import directory contents as overlays	tv	2017-05-24	1	-5/+8
\| *	krebs/5pkgs: move test stuff to a subdir	tv	2017-05-24	2	-4/+10
\| *	krebs/5pkgs: detect simple obsolete overrides	tv	2017-05-24	2	-23/+26
\| *	krebs/5pkgs: move haskell stuff to a subdir	tv	2017-05-24	9	-14/+16
\| *	empty: move to krebs/5pkgs/simple	tv	2017-05-24	2	-2/+2
\| *	krebs/5pkgs: move simple pkgs to a subdir	tv	2017-05-24	62	-7/+14
\| *	Merge remote-tracking branch 'prism/master'	tv	2017-05-24	16	-28/+121
\| \|\
* \| \|	l 2 nixpkgs: f469354 -> f8dfdd7	lassulus	2017-05-29	1	-1/+1
* \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2017-05-23	3	-16/+8
\|\\| \| \| \|/ \|/\|
\| *	turn krebs/5pkgs into an overlay	tv	2017-05-23	3	-16/+8
* \|	Merge remote-tracking branch 'prism/nin'	lassulus	2017-05-23	2	-2/+2
\|\ \
\| * \|	n 2 nixpkgs: 5b0c9d4 -> 0afb6d7	nin	2017-05-23	1	-1/+1
\| * \|	n 2: change search-domain to r	nin	2017-05-23	1	-1/+1
* \| \|	l 2 bepasty: allow write for externals	lassulus	2017-05-23	1	-1/+1
* \| \|	Merge branch 'master' of ni:stockholm	lassulus	2017-05-23	1	-5/+8
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	kirk: 1.0.0 -> 1.0.1	tv	2017-05-23	1	-5/+8
* \| \|	l 3 pyload: init	lassulus	2017-05-23	2	-0/+56
* \| \|	l 2 websites habsys.*: fritz -> domsen	lassulus	2017-05-23	2	-2/+1
* \| \|	l 2 websites domsen: remove www. from domains	lassulus	2017-05-23	1	-2/+2
* \| \|	l 1 mors: enable elasticsearch	lassulus	2017-05-23	1	-8/+5
* \| \|	il 2: move dnscrypt & dnsmasq to dns-stuff.nix	lassulus	2017-05-22	3	-9/+32
\| \|/ \|/\|
* \|	l 2 nixpkgs: 2bb9c1c -> f469354	lassulus	2017-05-22	1	-1/+1
* \|	l 2 retiolum: add tinc to systemPackages	lassulus	2017-05-22	1	-1/+5
* \|	l 2 baseX: enable X forwarding	lassulus	2017-05-22	1	-0/+1
* \|	l 3 hosts: filter unmanaged hosts	lassulus	2017-05-19	1	-1/+1
* \|	k 3 l: define `managed` for every host	lassulus	2017-05-19	1	-1/+7
* \|	lib/types: add managed bool to host type	lassulus	2017-05-19	1	-0/+7
\|/
*-.	Merge remote-tracking branches 'gum/master' and 'prism/master'	tv	2017-05-16	58	-143/+696
\|\ \
\| \| *	l 2 retiolum: enable legacy /etc/tinc	lassulus	2017-05-16	1	-0/+1
\| \| *	tinc module: add option enableLegacy	lassulus	2017-05-16	1	-0/+7
\| \| *	l 2 retiolum: don't open smtp	lassulus	2017-05-16	1	-1/+0
\| \| *	k3: retiolum.nix -> tinc.nix	lassulus	2017-05-16	2	-1/+1
\| \| *	krebs.tinc: expose confDir	tv	2017-05-16	1	-20/+21
\| * \|	m 2 wiki-irc: also notify #nixos	makefu	2017-05-16	1	-2/+2
\| * \|	Merge remote-tracking branch 'lass/master'	makefu	2017-05-16	3	-37/+22
\| \|\\|
\| \| *	Merge remote-tracking branch 'gum/master'	lassulus	2017-05-16	8	-7/+8
\| \| \|\
\| \| * \|	l 2 buildbot: use buildbotworker as user	lassulus	2017-05-16	1	-12/+6
\| \| * \|	l 2 buildbot: use correct NIX_PATH	lassulus	2017-05-16	1	-22/+13
\| \| * \|	l 3 news: use correct name in enable	lassulus	2017-05-15	1	-1/+1
\| \| * \|	weechat: 1.7.1 -> 1.8	lassulus	2017-05-15	1	-2/+2
\| * \| \|	m 2 realtime-audio:enable optimization	makefu	2017-05-16	1	-0/+4
\| \| \|/ \| \|/\|
\| * \|	s 2 default: bump to 22da5d02466ffe465735986d705675982f3646a0	makefu	2017-05-15	1	-1/+1
\| * \|	Merge remote-tracking branch 'lass/master'	makefu	2017-05-15	13	-21/+141
\| \|\\|
\| \| *	l 2 nixpkgs: 11b82a9 -> 2bb9c1c	lassulus	2017-05-15	1	-1/+1
\| \| *	l 5 xml2json: init	lassulus	2017-05-15	2	-0/+18
\| \| *	l 3 news: init	lassulus	2017-05-12	2	-0/+77
\| \| *	Merge remote-tracking branch 'gum/master'	lassulus	2017-05-12	26	-31/+441
\| \| \|\