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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branches 'mors/master' and 'pnp/master'	tv	2015-10-04	0	-0/+0
\|\
\| *	add alsa-tools, working tinc_graphs	makefu	2015-10-03	3	-0/+60
* \|	krebs: fix curl (error 77) in infest	lassulus	2015-10-04	1	-0/+1
* \|	uriel: import bitlbee & weechat cfg	lassulus	2015-10-04	2	-0/+24
* \|	lass 2: remove old git config	lassulus	2015-10-04	1	-87/+0
* \|	lass 3: add wallpaper.nix	lassulus	2015-10-04	9	-2/+176
* \|	add alsa-tools, working tinc_graphs	makefu	2015-10-04	3	-0/+60
* \|	lass 2 configs: add privoxy configs	lassulus	2015-10-04	4	-0/+38
* \|	lass 1 cloudkrebs: get ip from build host	lassulus	2015-10-04	1	-4/+10
* \|	krebs 3 lass: bump echelon ip	lassulus	2015-10-04	1	-1/+1
* \|	lass 1 cloudkrebs: install dic	lassulus	2015-10-04	1	-0/+4
* \|	lass 2 desktop-base: add sxiv	lassulus	2015-10-03	1	-0/+2
* \|	lass 2 browsers: style	lassulus	2015-10-03	1	-16/+12
* \|	lass 1 mors: add cac deps	lassulus	2015-10-03	1	-0/+2
* \|	Merge remote-tracking branch 'cd/master'	lassulus	2015-10-02	2	-3/+17
\|\ \
\| * \|	default.nix: export get	tv	2015-10-02	1	-0/+14
\| * \|	get: 1.3.0 -> 1.3.1	tv	2015-10-02	1	-3/+3
* \| \|	lass 2 new-repos: verbose announce as cloudkrebs	lassulus	2015-10-01	1	-0/+1
* \| \|	lass 2 base: add stockholm deps	lassulus	2015-10-01	1	-0/+5
* \| \|	Merge branch 'tv'	lassulus	2015-10-01	4	-14/+49
\|\\| \|
\| * \|	jq: init at 1.5	tv	2015-10-01	2	-0/+34
\| * \|	irc-announce: allow disabling just log and diff	tv	2015-10-01	2	-15/+16
\| * \|	tv git: announce only via cd	tv	2015-10-01	1	-1/+1
\| \|/
* \|	Merge branch 'makefu'	lassulus	2015-10-01	8	-650/+681
\|\\|
\| *	krebs modules: finalize default.nix split	tv	2015-10-01	4	-646/+654
\| *	Merge remote-tracking branch 'cd/master'	makefu	2015-10-01	31	-394/+611
\| \|\
\| \| *	Merge remote-tracking branch 'uriel/master'	tv	2015-10-01	10	-42/+80
\| \| \|\
\| \| * \	Merge remote-tracking branch 'mors/master'	tv	2015-10-01	12	-9/+158
\| \| \|\ \
\| \| * \ \	Merge remote-tracking branch 'pnp/master'	tv	2015-10-01	9	-48/+160
\| \| \|\ \ \
\| \| * \| \| \|	krebs lib.types: deprecate host.infest.{addr,port}	tv	2015-10-01	2	-2/+3
\| * \| \| \| \|	makefu/base" fix secrets path	makefu	2015-10-01	1	-1/+1
\| * \| \| \| \|	fix wry ip	makefu	2015-10-01	3	-3/+25
\| * \| \| \| \|	Merge remote-tracking branch 'cd/master'	makefu	2015-09-30	6	-19/+194
\| \|\ \ \ \ \ \| \| \|_\|/ / / \| \|/\| \| \| \|
* \| \| \| \| \|	lass 2 browsers: disable pulseSupport in flash	lassulus	2015-10-01	1	-1/+1
* \| \| \| \| \|	lass 2 virtualbox: enable virtualbox host mode	lassulus	2015-10-01	1	-0/+2
* \| \| \| \| \|	lass 2 base: bump nixpkgs rev	lassulus	2015-10-01	1	-1/+1
* \| \| \| \| \|	lass: remove dead code, style	lassulus	2015-10-01	2	-81/+1
* \| \| \| \| \|	lass 2 browsers: dont modify default chromium	lassulus	2015-10-01	1	-3/+3
* \| \| \| \| \|	lass 2 browsers: disable flash browser	lassulus	2015-10-01	1	-1/+1
* \| \| \| \| \|	lass 2 base: get hashedPassword from /root/secrets	lassulus	2015-10-01	1	-1/+1
* \| \| \| \| \|	lass: lass.iptables -> krebs.iptables	lassulus	2015-10-01	8	-25/+10
* \| \| \| \| \|	move iptables.nix to krebs	lassulus	2015-10-01	2	-19/+19
\| \|_\|_\|_\|/ \|/\| \| \| \|
* \| \| \| \|	lass 5 firefoxPlugins: remove broken link	lassulus	2015-10-01	1	-1/+0
* \| \| \| \|	Merge branch 'makefu'	lassulus	2015-10-01	3	-11/+20
\|\\| \| \| \|
\| * \| \| \|	Reaktor: add extraEnviron for setting Channel	makefu	2015-09-27	3	-11/+20
* \| \| \| \|	Merge branch 'tv'	lassulus	2015-10-01	13	-357/+387
\|\ \ \ \ \ \| \| \|_\|/ / \| \|/\| \| \|
\| * \| \| \|	krebs lib.shell.escape: add safe chars: +:=	tv	2015-10-01	1	-1/+1
\| * \| \| \|	mkdir: 104.233.84.{174 -> 215}	tv	2015-10-01	1	-1/+1
\| * \| \| \|	wu nixpkgs: bd84eba -> e916273	tv	2015-10-01	1	-1/+1
\| * \| \| \|	default out: filter unknown dirs	tv	2015-10-01	1	-8/+13