stockholm - NixOS configuration

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'gum/master'	lassulus	2015-12-29	26	-241/+569
\|\
\| *	k Zhosts: init bobby (miefda)	makefu	2015-12-29	1	-0/+11
\| *	Merge remote-tracking branch 'cd/master'	makefu	2015-12-28	7	-6/+377
\| \|\
\| \| *	{tv 2 => krebs 3} backup	tv	2015-12-28	7	-242/+333
\| \| *	tv backup: initial commit	tv	2015-12-28	3	-0/+256
\| \| *	tv: disable display-manager	tv	2015-12-27	1	-1/+1
\| \| *	tv vim: ensure relevant dirs exist	tv	2015-12-27	1	-5/+29
\| * \|	m 2 urlwatch: replace url for cvs2svn	makefu	2015-12-28	1	-1/+1
\| * \|	k 5 test/infest-cac-centos7: use defer, loop until we get a working cac box	makefu	2015-12-28	1	-26/+51
\| * \|	k 5 default: populate supports infesting arg	makefu	2015-12-28	1	-6/+15
\| * \|	m 3 Reaktor: now supports plugin infra see m/1/pornocauster	makefu	2015-12-26	3	-9/+13
\| * \|	k 5 ReaktorPlugins: hotfix for env generation	makefu	2015-12-26	1	-1/+1
\| * \|	k 5 Reaktor/plugins: converted plugins from makefu/2/Reaktor	makefu	2015-12-26	12	-194/+102
\| * \|	m 3 buildbot/master: use genid	makefu	2015-12-26	1	-1/+1
\| * \|	Merge remote-tracking branch 'cd/master'	makefu	2015-12-26	29	-92/+82
\| \|\\|
* \| \|	l 5 newsbot-js: rev 6ee4884 -> 802b172	lassulus	2015-12-26	1	-2/+2
* \| \|	l 2: move pkgs from xserver to baseX	lassulus	2015-12-26	2	-16/+7
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2015-12-26	11	-12/+70
\|\\| \|
\| * \|	m 3 Reaktor: add workdir/state_dir	makefu	2015-12-26	1	-1/+10
\| * \|	k 5 Reaktor: init plugin infrastructure	makefu	2015-12-25	3	-0/+46
\| * \|	m 1 gum: enable urlwatch service	makefu	2015-12-24	2	-3/+3
\| * \|	m 2 urlwatch: add cvs2svn to watchlist	makefu	2015-12-24	1	-1/+1
\| * \|	s 2 buildbot: add treestabletimer	makefu	2015-12-24	2	-3/+6
\| * \|	k 5 cacpanel: bump version to 0.2.3	makefu	2015-12-24	2	-4/+4
* \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2015-12-26	29	-92/+82
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	{pkgs => lib}.genid	tv	2015-12-26	30	-93/+83
* \| \|	l 1 mors: add wordpress/owncloud test	lassulus	2015-12-26	1	-5/+31
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2015-12-24	21	-299/+708
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	k 5 test/infest*: up limit of final connect	makefu	2015-12-24	1	-1/+1
\| * \|	k 3 buildbot.master: refactor	makefu	2015-12-24	2	-131/+317
\| * \|	k 3 buildbot: add rsync as explicit dep	makefu	2015-12-23	1	-6/+11
\| * \|	k 3 buildbot/master: send sigterm before sigkill for cleanup	makefu	2015-12-23	1	-2/+4
\| * \|	k 3 buildbot: fix merge fuckup	makefu	2015-12-23	1	-5/+0
\| * \|	Merge remote-tracking branch 'cd/master'	makefu	2015-12-23	1	-1/+6
\| \|\\|
\| \| *	tv wu: services.bitlbee.plugins += fb	tv	2015-12-23	1	-1/+6
\| * \|	k 5 test/infest*: remove batch mode from cac ssh call	makefu	2015-12-23	1	-1/+0
\| * \|	Merge branch 'master' of gum.krebsco.de:stockholm	makefu	2015-12-23	1	-0/+5
\| \|\ \
\| \| * \|	m 3 buildbot: add new slow factory to complete integration test	makefu	2015-12-23	2	-20/+35
\| * \| \|	k 5 mv krebs-ci test/infest-cac-centos7	makefu	2015-12-23	4	-12/+19
\| * \| \|	m 3 buildbot: add new slow factory to complete integration test	makefu	2015-12-23	3	-21/+40
\| \|/ /
\| * \|	k 5 krebs-ci: set cache files manually	makefu	2015-12-22	1	-4/+9
\| * \|	s 1 test-failing: add for CI	makefu	2015-12-22	1	-0/+6
\| * \|	k 5 krebs-ci: remove obsolete trap rm	makefu	2015-12-22	2	-2/+2
\| * \|	Makefile: fail if nix-instantiate fails	makefu	2015-12-22	1	-3/+4
\| * \|	mv makefu->krebs 3 buildbot	makefu	2015-12-22	7	-18/+38
\| * \|	m 2 base: build user defaults to shared	makefu	2015-12-22	2	-3/+1
\| * \|	Merge remote-tracking branch 'cd/master'	makefu	2015-12-22	2	-9/+12
\| \|\\|
\| \| *	cac: 1.0.2 -> 1.0.3	tv	2015-12-20	1	-5/+8
\| \| *	cac: 1.0."0" -> 1.0.2	tv	2015-12-20	1	-8/+5
\| \| *	Merge remote-tracking branch 'gum/master'	tv	2015-12-20	101	-636/+3220
\| \| \|\