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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'gum/master'	lassulus	2017-10-13	2	-0/+2
\|\
\| *	ma modules.wvdial: re-init	makefu	2017-10-11	1	-0/+1
\| *	ma binary-cache/lass: add new cache key	makefu	2017-10-11	1	-0/+1
* \|	l nixpkgs: 1987983 -> 2231575	lassulus	2017-10-13	1	-1/+1
* \|	types: add cidr and use as net.address	lassulus	2017-10-11	1	-3/+23
* \|	l eddie.r: route to edinburgh	lassulus	2017-10-11	1	-1/+7
* \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-10-10	6	-3/+79
\|\\|
\| *	ma cake.r: add tv	makefu	2017-10-10	1	-0/+3
\| *	ma wvdial: re-add	makefu	2017-10-10	2	-2/+72
\| *	ma latte.r: add torrent	makefu	2017-10-10	2	-1/+3
\| *	ma tools/dev: add cdrtools	makefu	2017-10-09	1	-0/+1
* \|	Revert "zandroum: RIP"	lassulus	2017-10-10	1	-0/+83
* \|	zandroum: RIP	lassulus	2017-10-10	1	-83/+0
* \|	Merge remote-tracking branch 'ni/master'	lassulus	2017-10-09	4	-17/+40
\|\ \
\| * \|	tv: add deploy alias	tv	2017-10-05	1	-0/+6
\| * \|	tv mu systemPackages: drop custom KDE locales	tv	2017-10-05	1	-3/+0
\| * \|	tv urlwatch nixos: 17.03 -> 17.09	tv	2017-10-04	1	-1/+1
\| * \|	tv ejabberd: sudo -u ejabberd ejabberdctl	tv	2017-10-03	1	-1/+15
\| * \|	tv ejabberd: symlinkJoin ejabberd wrapper	tv	2017-10-03	1	-13/+19
* \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-10-09	16	-37/+64
\|\ \ \ \| \| \|/ \| \|/\|
\| * \|	gum.r: disable privkey setting via krebs	makefu	2017-10-08	3	-2/+5
\| * \|	ma cake.r: add firmware for wifi	makefu	2017-10-08	1	-0/+14
\| * \|	makefu: add makefu-android identity	makefu	2017-10-08	2	-1/+5
\| * \|	Merge remote-tracking branch 'lass/master'	makefu	2017-10-08	4	-2/+2
\| \|\ \
\| * \| \|	ma source: add patch for mitmproxy	makefu	2017-10-08	1	-1/+2
\| * \| \|	ma europastats: request2 -> requests	makefu	2017-10-08	1	-1/+1
\| * \| \|	ma pkgs.inkscape: update patch	makefu	2017-10-08	1	-6/+5
\| * \| \|	ma tools/steam: remove override	makefu	2017-10-08	1	-3/+1
\| * \| \|	ma pkgs.drozer: fix build	makefu	2017-10-07	1	-1/+1
\| * \| \|	ma devpi: use devpi-client from upstream	makefu	2017-10-07	1	-1/+1
\| * \| \|	ma source: bump to latest unstable	makefu	2017-10-07	1	-7/+2
\| * \| \|	ma x.r: disabel remode building again	makefu	2017-10-07	2	-1/+4
\| * \| \|	Merge remote-tracking branch 'lass/master'	makefu	2017-10-07	46	-316/+320
\| \|\ \ \
\| * \| \| \|	ma server-config: retab	makefu	2017-10-03	1	-8/+7
\| * \| \| \|	ma tools: use wireshark from options	makefu	2017-10-03	1	-4/+11
\| * \| \| \|	ma cake.r/source: full deploy	makefu	2017-10-03	1	-1/+2
\| * \| \| \|	ma cake.r: disable tmpfs	makefu	2017-10-03	1	-1/+3
\| * \| \| \|	ma urlwatch: add iozone	makefu	2017-10-02	1	-0/+1
* \| \| \| \|	l pkgs.xmonad: urxvtcPath -> myTerm	lassulus	2017-10-09	1	-5/+5
* \| \| \| \|	l vim: add ack-vim	lassulus	2017-10-09	1	-1/+4
* \| \| \| \|	l mail: show inbox less strictly	lassulus	2017-10-09	1	-5/+2
* \| \| \| \|	l dns-stuff: add gum as resolver	lassulus	2017-10-09	1	-3/+6
* \| \| \| \|	l: add pkgs.file	lassulus	2017-10-09	1	-0/+1
* \| \| \| \|	l prism.r: start minecraft server	lassulus	2017-10-09	1	-0/+7
* \| \| \| \|	l mors.r: add deploy/predeploy helpers	lassulus	2017-10-09	1	-0/+34
* \| \| \| \|	l: use hack fonts everywhere	lassulus	2017-10-09	4	-9/+26
* \| \| \| \|	l helios.r: add multihead config	lassulus	2017-10-09	1	-0/+5
* \| \| \| \|	l daedalus.r: add pkgs.audacity	lassulus	2017-10-09	1	-0/+1
* \| \| \| \|	l daedalus.r: add steam & games	lassulus	2017-10-09	1	-0/+2
\| \|_\|/ / \|/\| \| \|
* \| \| \|	move Reaktors to hotdog.r	lassulus	2017-10-07	4	-2/+2
\| \|/ / \|/\| \|