stockholm - NixOS configuration

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'cd/master'	lassulus	2016-06-23	2	-30/+62
\|\
\| *	tv.pgp.pubkeys.default = readFile ./pgp/CBF89B0B.asc	tv	2016-06-23	2	-30/+52
\| \|
\| *	ju: init	tv	2016-06-14	1	-0/+10
\| \|
* \|	Merge remote-tracking branch 'prism/master'	makefu	2016-06-23	1	-24/+5
\|\ \
\| * \|	k 3 l: add domsen-nas	lassulus	2016-06-16	1	-0/+12
\| \| \|
\| * \|	k 3 l: RIP fastpoke	lassulus	2016-06-16	1	-31/+0
\| \| \|
* \| \|	add siem internal network	makefu	2016-06-23	1	-4/+47
\| \| \|
* \| \|	krebs 3 tinc_graphs: allow network different from retiolum	makefu	2016-06-23	1	-22/+37
\|/ /
* \|	Merge remote-tracking branch 'wolf/master'	lassulus	2016-06-14	1	-1/+1
\|\ \
\| * \|	Merge remote-tracking branch 'cd/master'	makefu	2016-06-14	11	-29/+19
\| \|\\|
\| * \|	k 3 ma: update shoney ip after failed deploy :3	makefu	2016-06-14	1	-1/+1
\| \| \|
* \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-06-13	11	-29/+19
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	sprinkle with some write{B,D}ash	tv	2016-06-13	11	-29/+19
\| \| \|
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-06-13	1	-6/+36
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	m shoney: init	makefu	2016-06-12	1	-0/+29
\| \| \|
\| * \|	Merge remote-tracking branch 'cd/master'	makefu	2016-06-12	1	-110/+184
\| \|\\|
\| * \|	k 3 m: fix filepimp pubkey	makefu	2016-06-09	1	-6/+7
\| \| \|
* \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-06-12	1	-110/+184
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	krebs.git.user.home: /var/lib/git -> pkgs.empty	tv	2016-06-07	1	-2/+1
\| \| \|
\| * \|	krebs.git: move assert to etcDir's type	tv	2016-06-07	1	-6/+6
\| \| \|
\| * \|	krebs.git.cgit.settings.virtual-root: init	tv	2016-06-07	1	-0/+4
\| \| \|
\| * \|	krebs.git.cgit: add server name for cgit.*.r	tv	2016-06-07	1	-0/+1
\| \| \|
\| * \|	krebs.git.cgit.fcgiwrap: make user configurable	tv	2016-06-07	1	-21/+26
\| \| \|
\| * \|	krebs.git: make user configurable	tv	2016-06-07	1	-4/+11
\| \| \|
\| * \|	krebs.git: s/ensureList/toList/	tv	2016-06-07	1	-10/+6
\| \| \|
\| * \|	krebs.git.cgit: make `cache-root` configurable	tv	2016-06-07	1	-66/+125
\| \| \| \| \| \| \| \| \| \| \| \|	... along with all the other stuff :)
\| * \|	krebs.git.cgit :: { bool => submodule { enable :: bool } }	tv	2016-06-07	1	-4/+7
\| \| \|
\| * \|	Merge remote-tracking branch 'cloudkrebs/master'	tv	2016-06-06	14	-72/+181
\| \|\ \
* \| \| \|	k 3 l: add cache.prism.r as alias	lassulus	2016-06-11	1	-0/+1
\| \|_\|/ \|/\| \|
* \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-06-05	1	-1/+5
\|\\| \| \| \|/ \|/\|
\| *	krebs.setuid: add option "envp"	tv	2016-06-05	1	-1/+5
\| \|
* \|	k 3 ma: fix addrs4 for tpsw	makefu	2016-06-02	1	-2/+2
\| \|
* \|	Merge remote-tracking branch 'prism/master'	makefu	2016-06-02	3	-2/+5
\|\ \
\| * \|	k 3 nginx: unique server-names to silence nginx	lassulus	2016-06-01	1	-1/+1
\| \| \|
\| * \|	k 3 iptables: allow DNAT rules	lassulus	2016-05-29	1	-1/+1
\| \| \|
\| * \|	k 3 l: add fritz pubkey	lassulus	2016-05-24	1	-0/+3
\| \| \|
\| * \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-05-24	1	-0/+2
\| \|\\|
* \| \|	Merge remote-tracking branch 'cloudkrebs/master'	makefu	2016-05-24	11	-61/+135
\|\\| \|
\| * \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-05-21	4	-6/+6
\| \|\ \
\| * \| \|	k 3 l: add shodan keys	lassulus	2016-05-21	3	-0/+35
\| \| \| \|
\| * \| \|	k 3 l: move pubkeys to seperate files	lassulus	2016-05-21	5	-4/+8
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-05-20	1	-0/+4
\| \|\ \ \
\| * \| \| \|	k 3 per-user: use new symlinkJoin interface	lassulus	2016-05-19	1	-1/+4
\| \| \| \| \|
\| * \| \| \|	k 3 l: add shodan	lassulus	2016-05-19	1	-0/+27
\| \| \| \| \|
\| * \| \| \|	k 3 l: update echelon ip	lassulus	2016-05-17	1	-1/+1
\| \| \| \| \|
\| * \| \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2016-05-09	3	-7/+14
\| \|\ \ \ \
\| * \ \ \ \	Merge remote-tracking branch 'cd/master'	lassulus	2016-05-09	1	-0/+2
\| \|\ \ \ \ \
\| * \| \| \| \| \|	k 3 l: update echelon ip	lassulus	2016-05-09	1	-1/+1
\| \| \| \| \| \| \|
\| * \| \| \| \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-04-27	4	-2/+83
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	k 3 fetchWallpaper: use writeDash	lassulus	2016-04-27	1	-3/+1
\| \| \| \| \| \| \| \|