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

	Commit message (Expand)	Author	Age	Files	Lines
*	l 3 newsbot-js -> k 3 newsbot-js	lassulus	2016-03-15	4	-7/+4
*	l 2 base: activate timesyncd	lassulus	2016-03-15	1	-1/+2
*	k 5 newsbot-js: bump rev 802b172 -> 09e0163	lassulus	2016-03-15	1	-3/+3
*	l 5 newsbot-js -> k 5 newsbot-js	lassulus	2016-03-15	3	-1/+0
*	Merge remote-tracking branch 'gum/master'	lassulus	2016-03-15	16	-96/+328
\|\
\| *	ma 2: use tinc-pre per default	makefu	2016-03-15	9	-17/+5
\| *	ma 1 darth: add omo ssh pubkey	makefu	2016-03-11	1	-0/+3
\| *	Merge branch 'master' of gum:stockholm-bare	makefu	2016-03-11	3	-10/+11
\| \|\
\| * \|	s 1 wolf: use tinc_pre for local discovery	makefu	2016-03-11	3	-0/+5
\| * \|	s 2 base: use default connectTo	makefu	2016-03-11	1	-9/+1
\| * \|	k 3 makefu: add hosts near to my heart <3	makefu	2016-03-11	1	-35/+235
\| * \|	ma 2 tinc-basic-retiolum: RIP	makefu	2016-03-11	9	-37/+32
\| * \|	k 3 retiolum: pigstarter -> [ prism cd ]	makefu	2016-03-11	1	-1/+1
\| * \|	Merge branch 'master' of gum.krebsco.de:stockholm	makefu	2016-03-10	6	-31/+83
\| \|\ \
\| * \| \|	s 2 shared: build without debug	makefu	2016-03-10	1	-2/+1
\| * \| \|	ma 1 filepimp: remove disk2	makefu	2016-03-06	1	-7/+20
\| * \| \|	add darth	makefu	2016-03-06	2	-1/+38
\| * \| \|	Merge remote-tracking branch 'cd/master'	makefu	2016-03-06	28	-48/+278
\| \|\ \ \
* \| \ \ \	Merge remote-tracking branch 'cd/master'	lassulus	2016-03-15	8	-35/+89
\|\ \ \ \ \
\| * \| \| \| \|	tv git: add newbot-js	tv	2016-03-15	1	-0/+1
\| \| \|_\|_\|/ \| \|/\| \| \|
\| * \| \| \|	infest-cac-centos7: target => system	makefu	2016-03-10	2	-6/+6
\| * \| \| \|	Merge remote-tracking branch 'gum/master'	tv	2016-03-10	21	-73/+223
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	k 5 test/infest-cac-centos7: remove hardcoded path	makefu	2016-03-10	1	-1/+1
\| \| * \| \|	add proot dependency	makefu	2016-03-10	1	-2/+3
\| \| * \| \|	Merge remote-tracking branch 'cd/master'	makefu	2016-03-10	28	-48/+278
\| \| \|\ \ \ \| \| \| \| \|/ \| \| \| \|/\|
\| \| * \| \|	s 2 base: bump nixpkgs	makefu	2016-03-09	1	-1/+1
\| \| * \| \|	k 5 infest-cac-centos7: 0.2.0 -> 0.2.6	makefu	2016-03-09	2	-22/+58
\| \| * \| \|	k 4 infest/prepare: build nixos-install	makefu	2016-03-09	1	-0/+14
\| \| * \| \|	ma 1 omo: replace crypt2	makefu	2016-03-08	2	-6/+7
\| \| \| \|/ \| \| \|/\|
\| * \| \|	Makefile: define nixos-config using ?=	tv	2016-03-10	1	-3/+2
\| * \| \|	Makefile: ifndef HOSTNAME, def it	tv	2016-03-10	1	-1/+3
\| \| \|/ \| \|/\|
* \| \|	l 1 mors: add acronym to pkgs	lassulus	2016-03-15	1	-0/+1
* \| \|	l 5: add acronym	lassulus	2016-03-15	2	-0/+14
* \| \|	l 1 mors: activate postgresql	lassulus	2016-03-15	1	-0/+6
* \| \|	l 2 retiolum: use tinc_pre	lassulus	2016-03-15	1	-0/+4
* \| \|	l 2 base: MANPAGER=most PAGER=less	lassulus	2016-03-15	2	-5/+1
* \| \|	k 3 l: add .r alias to echelon	lassulus	2016-03-15	1	-0/+1
* \| \|	l 2 xserver: disable xmonad restart on change	lassulus	2016-03-07	1	-1/+2
* \| \|	l 2 vim: use brogrammer theme	lassulus	2016-03-07	1	-1/+11
* \| \|	l 1 helios: disable kopf plugin for ES	lassulus	2016-03-07	1	-3/+0
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-03-06	2	-4/+18
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	ma 1 omo: replace disk2	makefu	2016-03-05	1	-3/+17
\| * \|	ma 3 snapraid: add timerConfig type	makefu	2016-03-05	1	-1/+1
* \| \|	l 2 xserver: disable autorestarting of xmonad	lassulus	2016-03-06	1	-1/+1
* \| \|	l 2 vim: remove trailing whitespace	lassulus	2016-03-06	1	-1/+2
* \| \|	l 2 vim: add fugitive & unimpared to vim plugins	lassulus	2016-03-06	1	-8/+32
* \| \|	l 1 prism: enable tor client	lassulus	2016-03-06	1	-0/+6
* \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-03-05	28	-48/+278
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	nq: RIP	tv	2016-03-05	4	-19/+0
\| * \|	krebs pkgs: detect old overrides	tv	2016-03-05	1	-5/+18