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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'prism/master'	makefu	2016-08-24	14	-28/+31
\|\
\| *	l 1 helios: remove obsolete import	lassulus	2016-08-24	1	-3/+0
\| *	Merge remote-tracking branch 'gum/master'	lassulus	2016-08-24	10	-30/+550
\| \|\
\| * \|	l 2 nixpkgs: 671cc4e -> c5cbda2 & fix indent	lassulus	2016-08-24	1	-3/+3
\| * \|	l 2 mail: add default value for from=	lassulus	2016-08-24	1	-0/+1
\| * \|	l 2 default: remove oboslete workaround	lassulus	2016-08-24	1	-7/+0
\| * \|	l 2 baseX: add synaptics config	lassulus	2016-08-24	1	-0/+5
\| * \|	l 1 prism: add android-weechat key	lassulus	2016-08-24	1	-0/+1
\| * \|	l 1 helios: update guest config	lassulus	2016-08-24	1	-5/+11
\| * \|	l 2 vim: change from nvim to vim	lassulus	2016-08-24	1	-1/+1
\| * \|	l: import retiolum.nix explicit	lassulus	2016-08-24	9	-8/+8
\| * \|	l 2 nixpkgs: a75c0d9 -> 671cc4e	lassulus	2016-08-22	1	-1/+1
\| * \|	k 3 l: update mors ssh key	lassulus	2016-08-22	1	-1/+1
* \| \|	m 3 rtorrent: cleanup logging	makefu	2016-08-24	1	-22/+19
\| \|/ \|/\|
* \|	m 3 rtorrent:for rss plugin to work - phpfpm user needs curl in path	makefu	2016-08-24	1	-0/+1
* \|	m 3 rtorrent: only buidl rutorrent if webcfg is enabled as well	makefu	2016-08-24	1	-2/+4
* \|	m 3 rtorrent: mkIf, recursiveUpdate and multiple changes in systemd.services ...	makefu	2016-08-24	1	-81/+79
* \|	m 1 wbob: use xfce instead of awesome	makefu	2016-08-23	1	-23/+42
* \|	m rtorrent: split web rpc and rutorrent functionality	makefu	2016-08-23	2	-42/+102
* \|	m 3 rtorrent: add TODO	makefu	2016-08-22	1	-0/+1
* \|	m 1 gum: enable opentracker	makefu	2016-08-22	1	-0/+1
* \|	m 1 omo: configure deluge	makefu	2016-08-22	1	-0/+13
* \|	m 2 rtorrent: initial config with rutorrent	makefu	2016-08-22	1	-0/+13
* \|	m 2 torrent: update config for otpimized seeding	makefu	2016-08-22	1	-6/+7
* \|	k 3 m: move tracker.makefu.r to gum	makefu	2016-08-22	1	-1/+28
* \|	m 3 default: enable opentracker and rtorrent	makefu	2016-08-22	1	-0/+2
* \|	m 2 opentracker: init	makefu	2016-08-22	1	-0/+16
* \|	m 3 rtorrent: init	makefu	2016-08-22	1	-0/+311
* \|	m 3 opentracker: init	makefu	2016-08-22	1	-0/+55
\|/
*	Merge remote-tracking branch 'gum/master'	lassulus	2016-08-21	20	-9/+500
\|\
\| *	m 6 secrets: add daemon-pw	makefu	2016-08-21	1	-0/+1
\| *	m 2 temp: init	makefu	2016-08-21	3	-0/+16
\| *	Merge remote-tracking branch 'prism/master'	makefu	2016-08-21	26	-89/+223
\| \|\
\| * \|	m 2 udpt: init	makefu	2016-08-21	1	-0/+31
\| * \|	m 1 *: add torrent	makefu	2016-08-21	4	-5/+10
\| * \|	m 5 torrent: implement shared torrent secret	makefu	2016-08-21	1	-0/+81
\| * \|	m 3 populate: allow minimal populate	makefu	2016-08-21	2	-4/+16
\| * \|	m 3 udpt: init	makefu	2016-08-21	2	-1/+60
\| * \|	m 5 udpt: init	makefu	2016-08-21	2	-0/+30
\| * \|	m 3 deluge: implement auth	makefu	2016-08-21	1	-4/+7
\| * \|	m : init drop	makefu	2016-08-21	2	-0/+63
\| * \|	m 3 deluge: init module	makefu	2016-08-18	2	-0/+183
\| * \|	m bcm4352: init for x	makefu	2016-08-13	2	-0/+7
* \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-08-21	6	-30/+3
\|\ \ \
\| * \| \|	vncdotool: RIP (upstream dilapidated)	tv	2016-08-21	4	-28/+0
\| * \| \|	Merge remote-tracking branch 'prism/master'	tv	2016-08-21	8	-18/+118
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| * \| \|	tv Xresources: use ff from per-user bindir	tv	2016-08-13	1	-2/+2
\| * \| \|	stro: enable public_html	tv	2016-08-13	1	-0/+1
* \| \| \|	Merge remote-tracking branch 'cd/master'	lassulus	2016-08-11	1	-1/+2
\|\\| \| \|
\| * \| \|	logf: don't call jq's gsub with empty regex :)	tv	2016-08-11	1	-1/+2