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-01-19	9	-49/+41
\|\
\| *	l nixpkgs: 92d088e -> d9a2891	lassulus	2018-01-18	1	-1/+1
\| *	l zsh: add fzf	lassulus	2018-01-18	1	-2/+5
\| *	l copyq: run as user service	lassulus	2018-01-18	1	-4/+3
\| *	l baseX: run xmonad as user service	lassulus	2018-01-18	1	-2/+27
\| *	l helios.r: remove broken systemctl start	lassulus	2018-01-18	1	-1/+0
\| *	Merge remote-tracking branch 'ni/master'	lassulus	2018-01-16	2	-36/+2
\| \|\
\| \| *	tv ju: RIP	tv	2018-01-16	1	-34/+0
\| \| *	Merge remote-tracking branch 'prism/master'	tv	2018-01-16	26	-63/+339
\| \| \|\
\| \| * \|	tv vim: mkdirs -> need-dirs	tv	2018-01-16	1	-2/+2
\| * \| \|	reaktor-plugins url-title: don't strip youtube	lassulus	2018-01-16	1	-1/+1
\| * \| \|	l git: don't show verbose git log	lassulus	2018-01-16	1	-2/+2
\| \| \|/ \| \|/\|
* \| \|	Merge branch 'master' of prism.r:stockholm	jeschli	2018-01-16	11	-35/+91
\|\\| \|
\| * \|	l nixpkgs: d202e30 -> 92d088e	lassulus	2018-01-16	1	-1/+1
\| * \|	l zsh: cleanup	lassulus	2018-01-16	1	-16/+18
\| * \|	l: add more emails	lassulus	2018-01-16	1	-0/+5
\| * \|	l: add zsh	lassulus	2018-01-16	1	-5/+6
\| * \|	l browsers: add fin	lassulus	2018-01-16	1	-3/+4
\| * \|	l browsers: preconfigure chromium	lassulus	2018-01-16	1	-0/+8
\| * \|	l browsers: use precedence	lassulus	2018-01-16	1	-1/+4
\| * \|	l: add taskwarrior to pkgs	lassulus	2018-01-16	1	-0/+2
\| * \|	l prism.r: add downloading (again)	lassulus	2018-01-16	1	-0/+1
\| * \|	l prism.r: allow jeschli push to all branches	lassulus	2018-01-16	1	-1/+1
\| * \|	l: add minecraft.nix	lassulus	2018-01-16	2	-7/+22
\| * \|	l daedalus.r: install some software	lassulus	2018-01-16	1	-0/+3
\| * \|	l: add lassul.us dns	lassulus	2018-01-16	1	-0/+15
\| * \|	repo-sync: don't announce syncs in irc	lassulus	2018-01-11	1	-1/+1
* \| \|	jeschli: +irc alias	jeschli	2018-01-12	1	-0/+3
* \| \|	jeschli enklave: import IMw	jeschli	2018-01-12	1	-0/+1
\|/ /
* \|	Merge remote-tracking branch 'prism/staging/jeschli'	lassulus	2018-01-10	9	-3/+118
\|\ \
\| * \|	jeschli retiolum: connect to enklave	jeschli	2018-01-10	1	-0/+4
\| * \|	jeschli: +enklave.r	jeschli	2018-01-10	4	-0/+110
\| * \|	jeschli: set default hostname	jeschli	2018-01-10	3	-2/+2
\| * \|	Merge branch 'master' of prism.r:stockholm	jeschli	2018-01-09	1	-1/+1
\| \|\ \
\| * \| \|	jeschli: meltdown fix	Markus Hihn	2018-01-09	2	-1/+2
* \| \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2018-01-10	5	-2/+66
\|\ \ \ \
\| * \| \| \|	ma photostore.krebsco.de: init on gum.r	makefu	2018-01-10	4	-1/+65
\| * \| \| \|	Merge branch 'master' of http://cgit.ni/stockholm	makefu	2018-01-09	8	-14/+17
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	Merge branch 'master' of prism:stockholm	makefu	2018-01-09	2	-2/+2
\| \|\ \ \ \ \| \| \| \|_\|/ \| \| \|/\| \|
\| * \| \| \|	pkgs.internetarchive: remove fetchPypi, coming from python3Packages	makefu	2018-01-08	1	-1/+1
* \| \| \| \|	infest prepare: no subshell for _prepare*	jeschli	2018-01-09	1	-4/+4
* \| \| \| \|	infest prepare: remove duplicated code	jeschli	2018-01-09	1	-5/+0
* \| \| \| \|	infest prepare: add _which	jeschli	2018-01-09	1	-2/+8
* \| \| \| \|	infest prepare: add hetzner_rescue support	lassulus	2018-01-09	1	-21/+61
\| \|_\|/ / \|/\| \| \|
* \| \| \|	makefu collected-base: .retiolum -> .r	tv	2018-01-09	1	-2/+2
* \| \| \|	makefu bepasty-dual: .retiolum -> .r	tv	2018-01-09	1	-1/+4
* \| \| \|	lass bepasty: .retiolum -> .r	tv	2018-01-09	1	-1/+4
* \| \| \|	makefu euer.wiki: .retiolum -> .r	tv	2018-01-09	1	-1/+1
* \| \| \|	ircd: .retiolum -> .r	tv	2018-01-09	1	-2/+2
* \| \| \|	nin: .retiolum -> .r	tv	2018-01-09	1	-6/+2