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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of prism.r:stockholm	jeschli	2018-03-22	29	-146/+342
\|\
\| *	nixpkgs: c5bc83b -> c665fcc	lassulus	2018-03-18	1	-1/+1
\| *	Merge remote-tracking branch 'gum/master'	lassulus	2018-03-18	15	-47/+238
\| \|\
\| \| *	ma awesome: make locker configurable	makefu	2018-03-13	4	-23/+25
\| \| *	ma x.r: re-enable virtualbox	makefu	2018-03-13	1	-1/+1
\| \| *	ma cgit-retiolum: make hydra-stockholm krebsroot	makefu	2018-03-07	1	-3/+10
\| \| *	ma hass: init config	makefu	2018-03-07	1	-0/+75
\| \| *	ma pkgs.mic92: init overlay	makefu	2018-03-07	2	-1/+13
\| \| *	ma source: add mic92 as source	makefu	2018-03-07	2	-0/+10
\| \| *	ma tp-x2x0: start charging at 95% again	makefu	2018-03-07	1	-1/+1
\| \| *	ma x.r: switch audio on port change	makefu	2018-03-07	1	-0/+1
\| \| *	ma pkgs.nodemcu-uploader: 0.2.2 -> 0.4.1	makefu	2018-03-07	1	-8/+11
\| \| *	ma pkgs.zj-58: init	makefu	2018-03-07	2	-0/+31
\| \| *	Merge remote-tracking branch 'lass/master'	makefu	2018-03-07	28	-127/+326
\| \| \|\
\| \| * \|	ma source: bump nixpkgs	makefu	2018-03-07	1	-10/+20
\| \| * \|	ma pkgs.python-firetv: need to pin adb	makefu	2018-03-05	1	-9/+8
\| \| * \|	ma pkgs.python-firetv: init	makefu	2018-03-05	1	-0/+41
\| * \| \|	Merge remote-tracking branch 'prism/staging/jeschli'	lassulus	2018-03-18	0	-0/+0
\| \|\ \ \
\| * \| \| \|	l websites fritz: simplify msmtprc	lassulus	2018-03-18	1	-2/+1
\| * \| \| \|	l: use xlockmore as lockscreen	lassulus	2018-03-18	2	-4/+2
\| * \| \| \|	l: add cabal	lassulus	2018-03-18	3	-0/+80
\| * \| \| \|	l websites domsen: more domains	lassulus	2018-03-18	1	-0/+2
\| * \| \| \|	l security: use default kernel	lassulus	2018-03-18	1	-2/+0
\| * \| \| \|	electron-cash: RIP	lassulus	2018-03-18	1	-64/+0
\| * \| \| \|	l mail: update pubkey	lassulus	2018-03-15	1	-1/+1
\| * \| \| \|	l mail: add more mailboxes	lassulus	2018-03-13	1	-0/+2
\| * \| \| \|	l: add c-base to msmtprc	lassulus	2018-03-13	1	-0/+10
\| * \| \| \|	l: add allygator@lassul.us mail	lassulus	2018-03-13	1	-0/+1
\| * \| \| \|	l mors.r: minimize deploy script	lassulus	2018-03-13	1	-22/+2
\| * \| \| \|	l helios.r: fix displayManager setup	lassulus	2018-03-13	1	-1/+1
\| * \| \| \|	l: make spf header more restrictive	lassulus	2018-03-13	1	-1/+1
\| * \| \| \|	buildbot-all: remove deploy test (currently broken)	lassulus	2018-03-13	1	-1/+0
\| \| \|_\|/ \| \|/\| \|
* \| \| \|	j emacs: cosmetics	jeschli	2018-03-21	1	-49/+54
* \| \| \|	j brauerei: *emacs with magit	jeschli	2018-03-20	1	-1/+6
* \| \| \|	j brauerei: +emacs	jeschli	2018-03-20	1	-0/+1
* \| \| \|	default.nix: add debug code	tv	2018-03-20	1	-0/+17
* \| \| \|	j bln: hardware-configuration cosmetics	jeschli	2018-03-20	1	-3/+0
* \| \| \|	j: add my-emacs	jeschli	2018-03-20	2	-0/+59
* \| \| \|	j bln: -VBOX certs	jeschli	2018-03-20	1	-2/+0
* \| \| \|	jeschli bln: config cosmetics	jeschli	2018-03-20	1	-55/+20
* \| \| \|	bln: fix config again	jeschli	2018-03-20	1	-2/+2
* \| \| \|	Merge branch 'staging/jeschli' of prism.r:stockholm into staging/jeschli	jeschli	2018-03-20	96	-764/+1483
\|\ \ \ \ \| \| \|/ / \| \|/\| \|
\| * \| \|	Merge remote-tracking branch 'origin/master' into HEAD	jeschli	2018-03-13	23	-115/+289
\| \|\\| \|
\| \| * \|	l xephyrify: add minimal xmonad	lassulus	2018-03-06	1	-2/+35
\| \| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2018-03-06	1	-0/+1
\| \| \|\ \
\| \| \| * \	Merge remote-tracking branch 'prism/master'	tv	2018-02-28	31	-229/+245
\| \| \| \|\ \
\| \| * \| \ \	Merge remote-tracking branch 'gum/master'	lassulus	2018-03-06	1	-5/+45
\| \| \|\ \ \ \ \| \| \| \| \|_\|/ \| \| \| \|/\| \|
\| \| \| * \| \|	ma owncloud: add caching	makefu	2018-02-28	1	-5/+45
\| \| * \| \| \|	Merge remote-tracking branch 'prism/tv'	lassulus	2018-03-06	14	-66/+115
\| \| \|\ \ \ \ \| \| \| \| \|/ / \| \| \| \|/\| \|
\| \| \| * \| \|	tv gitrepos: add kops	tv	2018-02-28	1	-0/+3