stockholm - NixOS configuration

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of prism:stockholm	nin	2018-02-11	27	-323/+497
\|\
\| *	ftb: add java workaround	lassulus	2018-02-11	1	-0/+1
\| *	Merge remote-tracking branch 'prism/staging/jeschli'	lassulus	2018-02-10	7	-39/+214
\| \|\
\| \| *	Merge branch 'master' of prism.r:stockholm	jeschli	2018-02-09	3	-18/+5
\| \| \|\
\| \| * \|	j vim.nix: remap tt to GoTest	jeschli	2018-02-09	1	-0/+1
\| \| * \|	j bln: +termite	jeschli	2018-02-08	1	-0/+1
\| \| * \|	j vim: +trailing White detection; *cosmetics	jeschli	2018-02-07	1	-1/+5
\| \| * \|	j fontsize default 12; bln 20	jeschli	2018-01-31	2	-32/+38
\| \| * \|	j bln: +elm	jeschli	2018-01-31	1	-0/+1
\| \| * \|	j bln: +stocki	jeschli	2018-01-31	1	-6/+9
\| \| * \|	j: +zsh	jeschli	2018-01-31	2	-0/+139
\| \| * \|	j enklave +taskserver	jeschli	2018-01-31	2	-0/+20
\| * \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2018-02-10	1	-0/+64
\| \|\ \ \
\| \| * \| \|	exim: init at 4.90.1	tv	2018-02-10	1	-0/+64
\| * \| \| \|	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
\| \| \|/ / \| \|/\| \|
* \| \| \|	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 overrideprism/staging/source-override	lassulus	2018-01-24	1	-15/+18
\| * \| \|	l nixpkgs: follow krebs	lassulus	2018-01-24	1	-4/+1