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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of prism.r:stockholm into staging/jeschli	jeschli	2018-02-25	15	-14/+150
\|\
\| *	l: init dpdkm	lassulus	2018-02-24	1	-0/+26
\| *	nixpkgs: c831224 -> d09e425	lassulus	2018-02-22	1	-1/+1
\| *	Merge remote-tracking branch 'prism/makefu'	lassulus	2018-02-22	3	-1/+40
\| \|\
\| \| *	ma 6tests/secrets: add auth.nix dummy	makefu	2018-02-22	1	-0/+1
\| \| *	ma x.r: add bluetooth	makefu	2018-02-21	1	-0/+36
\| \| *	ma urlwatch: taskwarrior is now on github	makefu	2018-02-19	1	-1/+3
\| * \|	l baseX: run xmonad only in xmonad session	lassulus	2018-02-22	1	-1/+2
\| * \|	l baseX: use network-manager	lassulus	2018-02-22	2	-0/+25
\| * \|	Merge remote-tracking branch 'prism/tv'	lassulus	2018-02-19	1	-1/+5
\| \|\ \
\| \| * \|	github: update known hosts	tv	2018-02-19	1	-1/+5
\| * \| \|	l: php5 -> php7	lassulus	2018-02-19	1	-1/+0
\| * \| \|	l vim: run gometalinter	lassulus	2018-02-19	1	-0/+3
\| * \| \|	l vim: add govet workaround	lassulus	2018-02-19	1	-0/+3
\| * \| \|	l minecraft: open port for dynmap	lassulus	2018-02-19	1	-0/+1
\| * \| \|	l shodan.r: ignore lidswitch	lassulus	2018-02-19	1	-0/+4
\| * \| \|	l prism.r: add jeschli user	lassulus	2018-02-19	1	-0/+10
\| * \| \|	l helios.r: add minio.cert	lassulus	2018-02-19	1	-8/+29
\| * \| \|	l icarus.r: update ssh pubkey	lassulus	2018-02-19	1	-1/+1
* \| \| \|	Merge branch 'master' of prism.r:stockholm into staging/jeschli	jeschli	2018-02-18	44	-369/+686
\|\\| \| \|
\| * \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2018-02-16	2	-69/+0
\| \|\\| \|
\| \| * \|	exim: RIP	tv	2018-02-15	1	-64/+0
\| \| * \|	tv gitrepos: drop redundant fetch permissions	tv	2018-02-14	1	-5/+0
\| * \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2018-02-16	5	-56/+68
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	ma sdev.,vbob.r: allow unfree	makefu	2018-02-16	2	-0/+6
\| \| * \|	ma x.r: vbox+extensionpack does not build	makefu	2018-02-16	1	-1/+1
\| \| * \|	ma vbox-guest: remove from vhosts, prepare for working upstream	makefu	2018-02-16	3	-4/+4
\| \| * \|	ma x.r: init wireguard, disable wifi, enable pcmanfm	makefu	2018-02-15	1	-1/+33
\| \| * \|	ma docker: use 2configs	makefu	2018-02-14	3	-5/+2
\| \| * \|	ma vbox-guest: init	makefu	2018-02-14	3	-49/+26
\| * \| \|	l wine: remove wine64	lassulus	2018-02-15	1	-15/+0
\| * \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2018-02-15	8	-10/+32
\| \|\\| \|
\| \| * \|	ma sdev.r: force virtualisation.virtualbox.guest.enable = false	makefu	2018-02-14	1	-1/+2
\| \| * \|	ma default: fix typo	makefu	2018-02-14	1	-1/+1
\| \| * \|	ma source: cd36b3d -> 51810e0	makefu	2018-02-14	1	-1/+2
\| \| * \|	ma tools/studio: remove latency_msec	makefu	2018-02-14	1	-2/+2
\| \| * \|	ma tools/mobility: re-introduce working exfat-nofuse	makefu	2018-02-14	1	-1/+1
\| \| * \|	ma omo.r: add cryptDisk3	makefu	2018-02-14	1	-3/+8
\| \| * \|	ma gum.r: add workr	makefu	2018-02-14	1	-0/+5
\| \| * \|	ma: add makefu-remote-builder	makefu	2018-02-14	1	-0/+4
\| \| * \|	ma {vbob,sdev}.r: disable vbox guest extensions for now	makefu	2018-02-14	2	-3/+9
\| \| \|/
\| * /	nixpkgs: 2062ac5 -> c831224	lassulus	2018-02-15	1	-1/+1
\| \|/
\| *	l add daedalus.rsa	lassulus	2018-02-13	1	-0/+1
\| *	l xmonad: add floatHook type	lassulus	2018-02-13	1	-1/+3
\| *	l xmonad: send urgency to dbus	lassulus	2018-02-13	1	-2/+13
\| *	l xserver: add DBUS_SESSION	lassulus	2018-02-13	1	-0/+6
\| *	l zsh: check for	lassulus	2018-02-13	1	-1/+1
\| *	l zsh: add LS_COLORS in zsh menu	lassulus	2018-02-13	1	-3/+2
\| *	l logf: add urgency for lass@mors	lassulus	2018-02-13	1	-0/+4
\| *	l exim-smarthost: add even more mails	lassulus	2018-02-13	1	-0/+11