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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'gum/master'	lassulus	2018-02-10	15	-265/+213
\|\
\| *	ma source: bump to 2018-02-06	makefu	2018-02-06	1	-1/+1
\| *	ma 3/umts: rip	makefu	2018-02-06	2	-86/+0
\| *	ma x.r: disable makefu.umts, cleanup	makefu	2018-02-06	1	-5/+8
\| *	ma gui/base: set packages only for mainuser	makefu	2018-02-06	1	-7/+8
\| *	ma omo.r: init google-muell	makefu	2018-02-06	4	-20/+64
\| *	ma wvdial: rip	makefu	2018-02-06	4	-80/+39
\| *	Merge branch 'master' of prism:stockholm	makefu	2018-01-30	6	-91/+164
\| \|\
\| * \|	ma pkgs.pfsshell: init	makefu	2018-01-30	1	-0/+27
\| * \|	ma wbob.r: enable mpd via bluetooth	makefu	2018-01-29	1	-64/+62
\| * \|	ma wbob-kiosk: provide chromium	makefu	2018-01-29	1	-2/+4
* \| \|	hw x220: remove broken tp-smapi	lassulus	2018-02-10	1	-1/+0
* \| \|	nixpkgs: e18442d -> 2062ac5	lassulus	2018-02-10	1	-1/+1
* \| \|	nixpkgs: b34a5f6 -> e18442d	lassulus	2018-02-09	1	-1/+1
* \| \|	nixpkgs: b222a07 -> b34a5f6	lassulus	2018-02-09	1	-1/+1
* \| \|	ftb: minimize	lassulus	2018-02-06	1	-17/+3
* \| \|	go: open port 80	lassulus	2018-02-02	1	-0/+1
\| \|/ \|/\|
* \|	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
\| \|\ \