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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'cd/master'	makefu	2016-10-19	47	-366/+496
\|\
\| *	xu: mount /bku	tv	2016-10-13	1	-0/+5
\| *	tv q: print TODOs first	tv	2016-10-13	1	-4/+5
\| *	lib: don't define defaults that require config	tv	2016-10-13	4	-13/+4
\| *	krebs lib: move {eq,ne,mod} to lib	tv	2016-10-13	2	-5/+4
\| *	lib: inline has-default-nix	tv	2016-10-13	2	-3/+1
\| *	lib: remove addName*	tv	2016-10-13	2	-6/+6
\| *	krebs lib: with lib	tv	2016-10-13	1	-3/+6
\| *	tv: security.hideProcessInformation = true	tv	2016-10-13	1	-0/+1
\| *	Merge remote-tracking branch 'prism/master'	tv	2016-10-13	37	-254/+405
\| \|\
\| \| *	l 2 nixpkgs: 0c022c4 -> 354fd37	lassulus	2016-10-13	1	-1/+1
\| \| *	l 5 xmonad-lass: use nix-path for i3lock	lassulus	2016-10-13	1	-1/+1
\| \| *	l 2 websites domsen: disable apcu	lassulus	2016-10-12	1	-3/+0
\| \| *	l 1 uriel: fix duplicate definition of wireless	lassulus	2016-10-12	1	-3/+0
\| \| *	l 1 mors: disable c-base vpn	lassulus	2016-10-12	1	-1/+1
\| \| *	remove comments from php config, phpfpm error	lassulus	2016-10-12	4	-5/+0
\| \| *	l 2 nixpkgs: change url to github/nixos	lassulus	2016-10-12	1	-1/+1
\| \| *	Merge remote-tracking branch 'prism/master'	lassulus	2016-10-11	19	-49/+191
\| \| \|\
\| \| \| *	Merge remote-tracking branch 'gum/master'	lassulus	2016-10-06	16	-43/+186
\| \| \| \|\
\| \| \| * \	Merge remote-tracking branch 'cd/master'	lassulus	2016-10-06	1	-3/+3
\| \| \| \|\ \
\| \| \| * \| \|	l 1 mors: add macchanger to pkgs	lassulus	2016-10-02	1	-0/+2
\| \| \| * \| \|	l 3 umts: remove obsolete comments	lassulus	2016-10-01	1	-4/+0
\| \| \| * \| \|	l 2 nixpkgs: 3fb009d -> 8a89481	lassulus	2016-10-01	1	-1/+1
\| \| \| * \| \|	l 2 iodined: open the correct port	lassulus	2016-10-01	1	-1/+1
\| \| \| * \| \|	l 2 iodined: add -c to running command	lassulus	2016-10-01	1	-1/+1
\| \| \| * \| \|	l 1 mors: add iodine to pkgs	lassulus	2016-10-01	1	-0/+1
\| \| * \| \| \|	l 3: add hosts.nix	lassulus	2016-10-11	2	-0/+13
\| \| * \| \| \|	l 2 websites domsen: use new phpOptions	lassulus	2016-10-11	1	-16/+7
\| \| * \| \| \|	l 2 zsh: disable zsh as defaultShell	lassulus	2016-10-11	1	-1/+0
\| \| * \| \| \|	l 5 xmonad-lass: make config more like tv's	lassulus	2016-10-11	1	-11/+16
\| \| * \| \| \|	l 2 xserver: copy tv's config	lassulus	2016-10-11	1	-127/+96
\| \| * \| \| \|	l 2 xserver: use browser-select directly	lassulus	2016-10-11	1	-1/+1
\| \| * \| \| \|	l 2 iodined: iodined -> iodine.server	lassulus	2016-10-11	1	-1/+1
\| \| * \| \| \|	l 2: remove obsolete bashrc code	lassulus	2016-10-11	1	-9/+0
\| \| * \| \| \|	l 2: add populate to pkgs	lassulus	2016-10-11	1	-0/+1
\| \| * \| \| \|	l 2: useChroot -> useSandbox	lassulus	2016-10-11	1	-1/+1
\| \| * \| \| \|	l 1 mors: add thunderbird to pkgs	lassulus	2016-10-11	1	-0/+1
\| \| * \| \| \|	l 1 mors: disable docker (k 5 needs fixing)	lassulus	2016-10-11	1	-2/+2
\| \| * \| \| \|	l 2 nixpkgs: 3fb009d -> 0c022c4	lassulus	2016-10-11	1	-1/+1
\| \| * \| \| \|	l 2 browsers: refactor, generate more stuff	lassulus	2016-10-11	1	-23/+47
\| \| * \| \| \|	l 1: explicitly add /tmp as tmpfs	lassulus	2016-10-11	5	-0/+26
\| * \| \| \| \|	exim: RIP	tv	2016-10-13	1	-64/+0
\| * \| \| \| \|	tv nixpkgs: 45b2a6d -> 354fd37	tv	2016-10-13	1	-1/+1
\| \|/ / / /
\| * \| \| \|	tv nixpkgs: 2568ee3 -> 45b2a6d	tv	2016-10-08	12	-20/+22
\| * \| \| \|	tv urlwatch: +nixos-16.09	tv	2016-10-06	1	-0/+1
\| \| \|/ / \| \|/\| \|
\| * \| \|	make populate: use proper target	tv	2016-10-03	1	-3/+3
\| \|/ /
\| * \|	l 2 tests: add iodinepw.nix to dummy-secrets	lassulus	2016-09-13	1	-0/+1
\| * \|	l 1 uriel: xfcePlugins are not thnarPlugins	lassulus	2016-09-13	1	-3/+0
\| * \|	l 2: add iodined.nix & import in prism	lassulus	2016-09-13	2	-0/+21
\| * \|	k 4 types: add default value for user.mail	lassulus	2016-09-09	1	-0/+1