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

	Commit message (Expand)	Author	Age	Files	Lines
*	l 2 websites domsen: add testuser@ubikmedia.eu	lassulus	2017-04-11	1	-0/+1
*	l 2 hw tp-x220: disable vertEdgeScroll	lassulus	2017-04-11	1	-0/+1
*	Revert "l 2: use alternate dnscrypt resolver"	lassulus	2017-04-11	1	-4/+1
*	l 1 prism: update JuiceSSH pubkey	lassulus	2017-04-11	1	-1/+1
*	Merge remote-tracking branch 'ni/master'	lassulus	2017-04-11	2	-3/+3
\|\
\| *	tv nixpkgs: 9626bc7d -> 69d90619	tv	2017-04-11	1	-1/+1
\| *	tv nixpkgs: e840e05 -> 9626bc7d	tv	2017-04-04	1	-1/+1
\| *	tv vim: make wrapper greppable	tv	2017-04-04	1	-2/+2
\| *	tv nixpkgs: 5b0c9d4 -> e840e05	tv	2017-04-03	1	-1/+1
* \|	l 2 nixpkgs: ade5837 -> a563923	lassulus	2017-04-11	1	-1/+1
* \|	Merge remote-tracking branch 'prism/newest'	lassulus	2017-04-02	9	-78/+17
\|\ \
\| * \|	Merge remote-tracking branch 'tv/master'	makefu	2017-03-31	2	-29/+10
\| \|\\|
\| \| *	types.*pathname: normalize slashes	tv	2017-03-31	1	-10/+10
\| \| *	Revert "exim: init at 4.88"	tv	2017-03-31	1	-19/+0
\| * \|	m 2 base-gui: Terminus naming fuckup	makefu	2017-03-31	1	-2/+3
\| * \|	k 3 m: disable v6 address for gum	makefu	2017-03-31	1	-1/+1
\| * \|	m 2 default: use cups-dymo patch	makefu	2017-03-31	1	-1/+1
\| * \|	m 2 backup: wry on standby	makefu	2017-03-31	1	-1/+1
\| * \|	m 2 urlwatch: Mic92 is the new maintainer of vicious	makefu	2017-03-31	1	-0/+1
\| * \|	m 1 omo: do not watch urls	makefu	2017-03-30	1	-1/+0
\| * \|	m 5 taskserver: rip	makefu	2017-03-29	1	-43/+0
* \| \|	l 2 hw tp-x220: set touchpad speed to very slow	lassulus	2017-04-02	1	-1/+5
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-03-26	12	-36/+74
\|\\| \|
\| * \|	m 2: fix printer	makefu	2017-03-25	1	-1/+1
\| * \|	m 5 dymo-cups-drivers: nuke	makefu	2017-03-25	1	-17/+0
\| * \|	m 2 default: bump to 73a6832	makefu	2017-03-24	1	-1/+1
\| * \|	m 1 wry: mv Reaktor to omo	makefu	2017-03-24	2	-13/+13
\| * \|	m 2 base-gui: enable GS fonts	makefu	2017-03-24	1	-1/+1
\| * \|	k 5 at-cacher-ng: bump to version 2	makefu	2017-03-24	1	-2/+2
\| * \|	s 1 wolf: share directory	makefu	2017-03-24	2	-0/+39
\| * \|	m 1 x: re-enable virtualbox	makefu	2017-03-17	2	-1/+16
\| * \|	Merge remote-tracking branch 'lass/master'	makefu	2017-03-16	30	-98/+219
\| \|\ \
\| * \| \|	m 2 urlwatch: supervise radare2	makefu	2017-03-13	1	-0/+1
* \| \| \|	l 2 mail: use pkgs.concat	lassulus	2017-03-25	1	-3/+6
* \| \| \|	l 2 websites domsen: add phpfpm restarter	lassulus	2017-03-25	1	-0/+28
* \| \| \|	l 2 mpv: make scripts compatible with 0.24	lassulus	2017-03-25	1	-23/+11
* \| \| \|	l 2 monitoring: disable ELK	lassulus	2017-03-25	2	-21/+0
* \| \| \|	k 3 l: update shodan pubkey	lassulus	2017-03-25	1	-1/+1
\| \|/ / \|/\| \|
* \| \|	k 3 htgen: add default option	lassulus	2017-03-16	1	-0/+1
* \| \|	k 3 htgen: use htgen-1.1	lassulus	2017-03-16	1	-3/+2
* \| \|	htgen: 1.0 -> 1.1	lassulus	2017-03-16	1	-9/+7
* \| \|	k 3: add htgen	lassulus	2017-03-16	2	-0/+69
* \| \|	htgen: init	lassulus	2017-03-16	1	-0/+30
* \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2017-03-16	1	-8/+12
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	tv vim: use concat	tv	2017-03-15	1	-8/+12
* \| \|	l 2 websites domsen: allow send from ubikmedia.de	lassulus	2017-03-16	1	-0/+1
* \| \|	l 2: add sections for cgit	lassulus	2017-03-16	2	-2/+6
\|/ /
* \|	tv: add krebspaste	tv	2017-03-14	1	-0/+1
* \|	l 2 bepasty: add paste.krebsco.de to extDoms	lassulus	2017-03-14	1	-11/+13
* \|	krebpsate: set max lifetime to 1 month	lassulus	2017-03-14	1	-1/+1