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

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "k 3 buildbot: remove override (upstream fix)"	lassulus	2016-10-13	1	-2/+9
*	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
\| \|\
\| \| *	m 5 default: use cups from nixpkgs-stable	makefu	2016-09-08	1	-0/+7
\| \| *	k 3 repo-sync: add more explicit documentation	makefu	2016-09-07	1	-6/+34
\| \| *	m 2 default: remove trace, use \|\| instead of or	makefu	2016-09-07	1	-3/+3
\| \| *	m 2 default: add trace for populate	makefu	2016-09-07	1	-2/+2
\| \| *	Merge remote-tracking branch 'prism/lassulus'	makefu	2016-09-07	10	-11/+51
\| \| \|\
\| \| * \|	m 5 qcma:init	makefu	2016-09-03	2	-0/+65
\| \| * \|	m 1 gum: add sabnzbd config	makefu	2016-09-02	1	-0/+2
\| \| * \|	m 1 x: add laptop-backup	makefu	2016-09-02	1	-3/+5
\| \| * \|	m 2 x: add laptop-backup	makefu	2016-09-02	1	-0/+12
\| \| * \|	m 2 sabnzbd: init	makefu	2016-09-02	1	-0/+16
\| \| * \|	m udpt: update config	makefu	2016-09-02	2	-3/+10
\| \| * \|	m 2 temp/share-samba: add group	makefu	2016-09-02	1	-0/+2
\| \| * \|	m 1 omo: replace torrent	makefu	2016-09-02	1	-7/+8
\| \| * \|	m 2 omo-share: remove aio threads	makefu	2016-09-02	1	-1/+0
\| \| * \|	m 2 iodined: update to new revision	makefu	2016-09-02	1	-4/+6
\| \| * \|	m 2 urlwatch: remove override	makefu	2016-09-02	1	-16/+0
\| \| * \|	k 5 pwqgen: allow user-provided wordset	makefu	2016-08-24	2	-2/+18
\| * \| \|	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
* \| \| \| \|	tv nixpkgs: 2568ee3 -> 45b2a6d	tv	2016-10-08	12	-20/+22