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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'gum/master'	lassulus	2015-12-14	10	-4/+129
\|\
\| *	k Zhosts vbob: init	makefu	2015-12-14	1	-0/+9
\| *	m 2 git: use gum as primary git host	makefu	2015-12-14	1	-1/+1
\| *	m 1 vbob:init	makefu	2015-12-14	2	-0/+69
\| *	k Zhosts: add gum extra port	makefu	2015-12-14	1	-0/+2
\| *	m 2 git: add vbob pubkey	makefu	2015-12-14	2	-1/+7
\| *	m 1 gum: add extra ports to gum retiolum	makefu	2015-12-14	1	-1/+15
\| *	k 3 retiolum: add extraConfig	makefu	2015-12-14	1	-0/+9
\| *	m 2 tinc: add ire as potential supernode	makefu	2015-12-14	1	-0/+1
\| *	m 2 default: use timesyncd instead of ntpd	makefu	2015-12-13	1	-1/+16
* \|	l 5 newsbot-js: rev b227296 -> 6ee4884	lassulus	2015-12-14	1	-2/+2
* \|	Merge remote-tracking branch 'pnp/master'	lassulus	2015-12-13	4	-19/+49
\|\\|
\| *	m 5 awesomecfg: beautiful was loaded too late	makefu	2015-12-13	1	-13/+17
\| *	m 2 fetchWallpaper: default enabled for mainlaptop	makefu	2015-12-13	2	-1/+28
\| *	k 3 fetchWallpaper: change predicate handling	makefu	2015-12-13	1	-5/+4
* \|	l 5 xmonad: add binding for mute buttons	lassulus	2015-12-13	1	-0/+2
\|/
*	l 5 xmonad-lass: deactivate yeganesh, workspace0	lassulus	2015-12-12	1	-3/+16
*	k 3 fetchWallpaper: default stateDir in /var	lassulus	2015-12-12	1	-3/+4
*	l 3 fetchWallpaper -> k 3 fetchWallpaper	lassulus	2015-12-12	4	-4/+4
*	l 2 xserver: remove xmobar	lassulus	2015-12-12	1	-1/+0
*	l 2: add fetchWallpaper.nix	lassulus	2015-12-12	1	-0/+11
*	l 2 elster: use chromium package	lassulus	2015-12-12	1	-0/+3
*	l 2 browsers: activate flash browser	lassulus	2015-12-12	1	-1/+1
*	l 2 browsers: use writeScriptBin	lassulus	2015-12-12	1	-15/+5
*	l 2 base: nixpkgs 8d1ce12 -> 363c843	lassulus	2015-12-12	1	-1/+1
*	l 1 prism: activate websites	lassulus	2015-12-12	1	-0/+9
*	l 1 mors: import stuff	lassulus	2015-12-12	1	-0/+3
*	l 2: add websites	lassulus	2015-12-12	2	-0/+47
*	l 3: add nginx site modules	lassulus	2015-12-12	3	-11/+319
*	l 2: add libvirt.nix	lassulus	2015-12-12	1	-0/+22
*	l 2: add teamviewer.nix	lassulus	2015-12-12	1	-0/+6
*	l 1 prism: set timezone to Europe/Berlin	lassulus	2015-12-12	1	-0/+3
*	l 1 prism: add juiceSSH key for chat	lassulus	2015-12-12	1	-0/+5
*	l 2 base: remove video permission for gm	lassulus	2015-12-12	1	-0/+2
*	l 3: add fetchWallpaper.nix	lassulus	2015-12-12	2	-0/+90
*	m 2 Reaktor: finish sed-plugin	makefu	2015-12-08	2	-12/+30
*	m 2 Reaktor: use sed-plugin	makefu	2015-12-08	1	-4/+14
*	Merge branch 'master' of pnp:stockholm	makefu	2015-12-08	2	-1/+15
\|\
\| *	m 1 pornocauster: use tinc_pre	makefu	2015-12-04	1	-0/+2
\| *	m 1 pornocauster: add printing,virtualbox	makefu	2015-12-04	2	-1/+13
* \|	m 2 Reaktor: init of sed-plugin	makefu	2015-12-08	1	-0/+43
* \|	Merge branch 'master' of pnp:stockholm	makefu	2015-12-04	1	-11/+13
\|\\|
\| *	s 2 drivedroid: update service	makefu	2015-12-04	1	-11/+13
* \|	Merge branch 'master' of pnp:stockholm	makefu	2015-12-04	36	-182/+1376
\|\\|
\| *	m 2 base-gui: add TODO	makefu	2015-12-03	1	-0/+11
\| *	m 2 default: do not restart ssh agent	makefu	2015-12-03	1	-0/+1
\| *	m 2 git: add mattermost	makefu	2015-12-03	1	-0/+4
\| *	m 1 gum: provides mattermost via docker container	makefu	2015-11-27	3	-2/+56
\| *	k 5 cacpanel: bump version	makefu	2015-11-27	1	-2/+2
\| *	Merge remote-tracking branch 'cd/master'	makefu	2015-11-27	6	-2/+92
\| \|\