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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'cd/master'	lassulus	2015-12-26	1	-1/+0
\|\
\| *	{pkgs => lib}.genid	tv	2015-12-26	1	-1/+0
* \|	l 1 mors: add wordpress/owncloud test	lassulus	2015-12-26	1	-5/+31
\|/
*	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 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 1 prism: import weechat.nix	lassulus	2015-11-13	1	-0/+1
*	move testhosts to shared from lass	lassulus	2015-11-13	3	-97/+0
*	l 1 mors: open risk of rain port for lan	lassulus	2015-11-13	1	-0/+6
*	l 1 mors: use new wordpress test	lassulus	2015-11-13	1	-1/+22
*	l 1 prism: add stuff for oneline httpserver	lassulus	2015-11-13	1	-0/+8
*	l 1 echelon: disable redis	lassulus	2015-11-13	1	-1/+1
*	l 1 prism: add stuff for juhulian	lassulus	2015-11-09	1	-0/+19
*	l 1 prism: activate bitlbee	lassulus	2015-11-09	1	-0/+1
*	l 1 prism: allowUnfree for ts3	lassulus	2015-11-01	1	-0/+3
*	l 1 mors: add hashPassword to systemPackages	lassulus	2015-11-01	1	-0/+1
*	l 1 prism: activate ts3 server	lassulus	2015-11-01	1	-0/+1
*	l 1 prism: add git.nix	lassulus	2015-10-31	1	-0/+1
*	l 1 echelon: add user satan	lassulus	2015-10-30	1	-0/+17
*	lass: add prism host	lassulus	2015-10-30	1	-0/+88
*	l 1 echelon: add dnsmasq config	lassulus	2015-10-21	1	-0/+14
*	l 1 mors: add hangouts permissions	lassulus	2015-10-21	1	-0/+3
*	l: add test systems	lassulus	2015-10-21	3	-0/+97
*	l 1 uriel: remove obsolete code	lassulus	2015-10-19	1	-3/+0
*	l 1 mors: configure touchpad	lassulus	2015-10-19	1	-0/+7
*	l 1: remove dead code	lassulus	2015-10-19	2	-11/+0
*	l: move more config to base.nix	lassulus	2015-10-19	4	-71/+4
*	l 1 cloudkrebs: remove dic	lassulus	2015-10-19	1	-4/+0
*	l 2: rename desktop-base.nix to baseX.nix	lassulus	2015-10-19	2	-2/+2
*	l: import urxvt in desktop-base.nix	lassulus	2015-10-19	2	-3/+0
*	l 1 echelon: get ip in a more general way	lassulus	2015-10-17	1	-1/+1
*	l cac: move Cac os-template to lass	lassulus	2015-10-17	2	-4/+10
*	l 1 cloudkrebs: remove r_ip	lassulus	2015-10-17	1	-1/+0
*	l 1 mors: configure touchpad	lassulus	2015-10-15	1	-0/+5
*	l 1 echelon: activate newsbot-js	lassulus	2015-10-15	1	-0/+1
*	l 1 mors: deactivate realwallpaper	lassulus	2015-10-15	1	-1/+0
*	lass: get up2date ts3client	lassulus	2015-10-15	1	-0/+1
*	lass 1 echelon: import new stuff	lassulus	2015-10-09	1	-0/+3
*	lass 1 echelon: get hostName from build.host.name	lassulus	2015-10-09	1	-1/+1
*	lass 2: add skype.nix	lassulus	2015-10-08	1	-0/+1
*	lass 1 echelon: activate git	lassulus	2015-10-05	1	-0/+1
*	lass 2: rename new-repos.nix to git.nix	lassulus	2015-10-04	3	-3/+3
*	lass 1 echelon: activate wp & proxy services	lassulus	2015-10-04	1	-1/+2
*	uriel: import bitlbee & weechat cfg	lassulus	2015-10-04	1	-0/+2
*	lass 3: add wallpaper.nix	lassulus	2015-10-04	3	-2/+3
*	lass 2 configs: add privoxy configs	lassulus	2015-10-04	2	-0/+2
*	lass 1 cloudkrebs: get ip from build host	lassulus	2015-10-04	1	-4/+10
*	lass 1 cloudkrebs: install dic	lassulus	2015-10-04	1	-0/+4
*	lass 1 mors: add cac deps	lassulus	2015-10-03	1	-0/+2