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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'prism/master'	nin	2018-01-30	42	-216/+717
\|\
\| *	init ftb	lassulus	2018-01-30	2	-0/+55
\| *	Merge remote-tracking branch 'gum/master'	lassulus	2018-01-30	3	-11/+7
\| \|\
\| \| *	ma hw/stk1160: fix invalid kernel option	makefu	2018-01-28	1	-1/+0
\| \| *	ma cgit: disable irc hook	makefu	2018-01-28	1	-9/+0
\| \| *	wolf.r: pin et0	makefu	2018-01-28	1	-1/+7
\| * \|	Merge remote-tracking branch 'prism/staging/jeschli'	lassulus	2018-01-30	2	-89/+105
\| \|\ \
\| \| * \|	jeschli bolide: +j std config	jeschli	2018-01-28	1	-88/+96
\| \| * \|	jeschli vim: +vim-elm	jeschli	2018-01-28	1	-1/+9
\| * \| \|	l zsh: set as default shell for everyone	lassulus	2018-01-30	1	-2/+1
\| \|/ /
\| * /	infest prepare: define _which on nixos_iso	lassulus	2018-01-28	1	-0/+3
\| \|/
\| *	Merge remote-tracking branch 'gum/master'	lassulus	2018-01-28	4	-12/+42
\| \|\
\| \| *	ma hw/stk1160: bump linux kernel	makefu	2018-01-28	1	-3/+2
\| \| *	ma gum.r: add vpn pubkeys for work router	makefu	2018-01-28	1	-0/+16
\| \| *	ma photostore.krebsco.de: enable ssl	makefu	2018-01-28	1	-8/+10
\| \| *	Revert "ma hw/stk1160: rip"	makefu	2018-01-28	2	-4/+17
\| * \|	l eddi.r: public ip change	lassulus	2018-01-26	1	-1/+2
\| * \|	source: enable override	lassulus	2018-01-24	1	-15/+18
\| * \|	l nixpkgs: follow krebs	lassulus	2018-01-24	1	-4/+1
\| * \|	nixpkgs: 0b30c1d -> b222a0	lassulus	2018-01-24	1	-1/+1
\| * \|	l mail: use attrSets	lassulus	2018-01-23	1	-10/+10
\| * \|	l mail: template with nix	lassulus	2018-01-23	1	-16/+18
\| * \|	Merge remote-tracking branch 'prism/staging/jeschli'	lassulus	2018-01-23	2	-56/+99
\| \|\ \
\| \| * \|	jeschli brauerei: +aliases	jeschli	2018-01-23	1	-0/+7
\| \| * \|	j vim: refactoring	jeschli	2018-01-23	1	-56/+92
\| * \| \|	l git: show diff of prism/master	lassulus	2018-01-23	1	-2/+2
\| * \| \|	krebs: disable CI	lassulus	2018-01-23	2	-2/+0
\| \|/ /
\| * \|	l zsh: use zsh in nix-shell & better prompt	lassulus	2018-01-22	1	-25/+39
\| * \|	l nixpkgs: d9a2891 -> 5141f28	lassulus	2018-01-21	1	-1/+1
\| * \|	Merge branch 'master' of prism.i:stockholm	jeschli	2018-01-21	8	-1/+87
\| \|\ \
\| \| * \|	l: set ssh agentTimeout to 10m	lassulus	2018-01-20	1	-0/+1
\| \| * \|	l mors.r: use nixUnstable	lassulus	2018-01-20	1	-1/+1
\| \| * \|	l radio: force play regularly	lassulus	2018-01-20	1	-0/+1
\| \| * \|	Merge branch 'staging/jeschli' of prism.r:stockholm	jeschli	2018-01-19	2	-0/+24
\| \| \|\ \
\| \| \| * \|	j bln: +virtualbox	Markus Hihn	2018-01-19	2	-0/+24
\| \| \| * \|	Merge branch 'master' of prism.r:stockholm	Markus Hihn	2018-01-17	4	-39/+5
\| \| \| \|\ \
\| \| \| * \ \	Merge branch 'master' of prism.r:stockholm	Markus Hihn	2018-01-16	11	-35/+91
\| \| \| \|\ \ \
\| \| * \| \| \| \|	jeschli: +IM	jeschli	2018-01-19	1	-0/+56
\| \| * \| \| \| \|	Merge branch 'master' of prism.r:stockholm	jeschli	2018-01-19	9	-49/+41
\| \| \|\ \ \ \ \
\| \| * \ \ \ \ \	Merge branch 'master' of prism.r:stockholm	jeschli	2018-01-16	11	-35/+91
\| \| \|\ \ \ \ \ \ \| \| \| \|_\|/ / / / \| \| \|/\| \| / / / \| \| \| \| \|/ / / \| \| \| \|/\| \| \|
\| \| * \| \| \| \|	jeschli: +irc alias	jeschli	2018-01-12	1	-0/+3
\| \| * \| \| \| \|	jeschli enklave: import IMw	jeschli	2018-01-12	1	-0/+1
\| * \| \| \| \| \|	j: +bolide	jeschli	2018-01-21	4	-0/+210
\| \| \|_\|/ / / \| \|/\| \| \| \|
\| * \| \| \| \|	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