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

	Commit message (Expand)	Author	Age	Files	Lines
*	l 2 baseX: add zathura to pkgs	lassulus	2015-11-09	1	-0/+1
*	Merge remote-tracking branch 'cd/master'	lassulus	2015-11-01	9	-24/+126
\|\
\| *	nomic nixpkgs: 4z3/03130ec -> NixOS/c44a593	tv	2015-11-01	1	-2/+2
\| *	mkdir nixpkgs: e57024f -> c44a593	tv	2015-11-01	1	-1/+1
\| *	rmdir nixpkgs: 68bd8e4 -> c44a593	tv	2015-11-01	1	-1/+1
\| *	cd nixpkgs: 4z3/03130ec -> NixOS/c44a593	tv	2015-11-01	1	-2/+2
\| *	wu nixpkgs: e916273 -> c44a593	tv	2015-11-01	1	-1/+1
\| *	xu nixpkgs: e57024f -> c44a593	tv	2015-11-01	1	-1/+1
\| *	tv: what's majmin?	tv	2015-11-01	1	-4/+0
\| *	tv vim: decouple vimrc from ENV	tv	2015-11-01	1	-14/+5
\| *	tv vim: use upstream industry colors + mods	tv	2015-11-01	1	-52/+3
\| *	tv base: import vim	tv	2015-11-01	4	-16/+9
\| *	tv vim: no backup & co for /dev/shm/*	tv	2015-11-01	1	-0/+2
\| *	tv vim: colorize tabs and trailing space	tv	2015-11-01	1	-1/+4
\| *	tv vim: set noruler	tv	2015-11-01	1	-0/+1
\| *	tv vim: so vimrc via VIMINIT	tv	2015-11-01	1	-5/+6
\| *	tv vim: ru pkg.vim share	tv	2015-11-01	1	-1/+2
\| *	tv vim: use industry colors	tv	2015-11-01	1	-1/+3
\| *	tv vim: don't ru ~/vim	tv	2015-11-01	1	-2/+0
\| *	tv vim: colorize nix	tv	2015-11-01	1	-0/+19
\| *	tv vim industry: hi Normal ctermfg=White	tv	2015-11-01	1	-2/+1
\| *	tv vim industry: retab & co.	tv	2015-11-01	1	-26/+29
\| *	tv vim: import industry colors	tv	2015-11-01	1	-0/+46
\| *	tv: cherry-pick vim from hotwip!	tv	2015-11-01	1	-0/+96
* \|	Merge remote-tracking branch 'pnp/master'	lassulus	2015-11-01	1	-2/+2
\|\ \
\| * \|	collectd-connect-time: bump to 0.3.0	makefu	2015-11-01	1	-2/+2
* \| \|	l 1 prism: allowUnfree for ts3	lassulus	2015-11-01	1	-0/+3
* \| \|	l 1 mors: add hashPassword to systemPackages	lassulus	2015-11-01	1	-0/+1
* \| \|	l 1 prism: activate ts3 server	lassulus	2015-11-01	1	-0/+1
* \| \|	l 2: add ts3.nix	lassulus	2015-11-01	1	-0/+19
* \| \|	k 3 l: use rsa keys in prism	lassulus	2015-11-01	1	-2/+2
* \| \|	l 2 downloading: get rpc-password from secrets	lassulus	2015-10-31	1	-3/+5
* \| \|	l 2: get ssh-keys via api	lassulus	2015-10-31	2	-6/+6
* \| \|	l 1 prism: add git.nix	lassulus	2015-10-31	1	-0/+1
\|/ /
* \|	Merge remote-tracking branch 'pnp/master'	lassulus	2015-10-31	20	-26/+352
\|\ \
\| * \|	shared wolf: enable collectd towards heidi	makefu	2015-10-30	2	-0/+42
\| * \|	m 2 *: s,/root/secrets,<secrets>,	makefu	2015-10-29	3	-10/+16
\| * \|	m 2 euer.blog: init (untested)	makefu	2015-10-29	1	-0/+29
\| * \|	Merge branch 'master' of pnp:stockholm	makefu	2015-10-28	4	-1/+60
\| \|\ \
\| \| * \|	krebs 5 collectd-connect-time: bump version (again)	makefu	2015-10-28	1	-2/+2
\| \| * \|	k 5 collectd-connect-time: bump to 0.2.0	makefu	2015-10-27	1	-2/+2
\| \| * \|	Merge branch 'master' of pnp:stockholm	makefu	2015-10-27	71	-438/+2499
\| \| \|\ \
\| \| * \| \|	m 12 collectd: wry uses cherry-picked collectd to enable python support	makefu	2015-10-27	2	-1/+4
\| \| * \| \|	m 2 collectd: add first sample howto configure collectd with collectd-connect...	makefu	2015-10-27	1	-0/+42
\| \| * \| \|	k 5 collectd-connect-time: initial commit	makefu	2015-10-27	1	-0/+15
\| * \| \| \|	m 1 wry: serve euer wiki	makefu	2015-10-28	3	-4/+121
\| * \| \| \|	m 5 tw-upload-plugin: use new version	makefu	2015-10-28	1	-2/+2
\| * \| \| \|	m 5 tw-upload-plugin: init	makefu	2015-10-28	2	-0/+9
\| * \| \| \|	m 2 sources: add system tag	makefu	2015-10-28	2	-0/+2
\| * \| \| \|	m 1 gum: prepare stockholm	makefu	2015-10-28	2	-1/+46