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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'ni/master'	lassulus	2017-06-27	4	-22/+29
\|\
\| *	krebs.build.source: stockholm default is <stockholm>	tv	2017-06-27	2	-1/+2
\| *	tv: stockholm is really just <stockholm>	tv	2017-06-27	1	-4/+1
\| *	make test: use build and evaluate	tv	2017-06-27	1	-6/+5
\| *	Makefile: call build with whatsupnix	tv	2017-06-27	1	-6/+12
\| *	tv: configure stockholm for buildbot	tv	2017-06-27	1	-9/+13
\| *	tv mu: chromiumDev -> chromium	tv	2017-06-27	1	-1/+1
* \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-06-27	3	-0/+81
\|\ \
\| * \	Merge branch 'master' of prism:stockholm	makefu	2017-06-27	9	-9/+6
\| \|\ \
\| * \| \|	make led-fader: after networ-online.target	makefu	2017-06-27	1	-0/+1
\| * \| \|	make x.r: init lancache	makefu	2017-06-27	2	-0/+80
* \| \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2017-06-27	1	-5/+4
\|\ \ \ \ \| \|_\|/ / \|/\| \| / \| \| \|/ \| \|/\|
\| * \|	tv mu: kde4 -> plasma5, maybe	tv	2017-06-27	1	-4/+3
\| * \|	tv mu: security.wrappers.slock.{slock => source}	tv	2017-06-27	1	-1/+1
* \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2017-06-27	1	-1/+1
\|\\| \|
\| * \|	tv alnus nixpkgs: e924319 -> 9b948ea	tv	2017-06-27	1	-1/+1
\| * \|	Merge remote-tracking branch 'prism/master'	tv	2017-06-27	19	-119/+165
\| \|\ \
* \| \| \|	l nixpkgs: e84de79 -> 0a4db15	lassulus	2017-06-27	1	-1/+1
* \| \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-06-27	14	-45/+177
\|\ \ \ \ \| \| \|_\|/ \| \|/\| \|
\| * \| \|	k 4 infest: prepare Regression for stockholm	makefu	2017-06-27	1	-10/+4
\| * \| \|	ma arduino-user-env: init	makefu	2017-06-27	1	-0/+35
\| * \| \|	ma task-client: systemPackages -> per-user	makefu	2017-06-27	1	-0/+14
\| * \| \|	doc/makefu: init logbook	makefu	2017-06-27	2	-0/+33
\| * \| \|	ma docker: init config	makefu	2017-06-27	1	-0/+4
\| * \| \|	ma tools: add more software	makefu	2017-06-27	2	-1/+6
\| * \| \|	ma x.r: cleanup imports	makefu	2017-06-27	1	-31/+18
\| * \| \|	ma hw: refactor	makefu	2017-06-27	3	-2/+5
\| * \| \|	doc: init Commit Messages Guideline	makefu	2017-06-27	1	-0/+53
\| * \| \|	m 2 dirctator: bump to latest logstash5	makefu	2017-06-27	1	-1/+5
\| \| \|/ \| \|/\|
* \| \|	l nixpkgs: 4847963 -> e84de79	lassulus	2017-06-27	1	-1/+1
* \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2017-06-27	7	-7/+4
\|\ \ \ \| \|/ / \|/\| / \| \|/
\| *	tv: add htop to default systemPackages	tv	2017-06-27	5	-5/+2
\| *	tv: properly use symlinkJoin paths	tv	2017-06-25	2	-2/+2
* \|	l 2 nixpkgs: e84de79 -> 4847963	lassulus	2017-06-24	1	-1/+1
* \|	l: set symlinkJoin pkgs in correct order	lassulus	2017-06-24	5	-5/+5
* \|	k 4 infest prepare: add stockholm as supported OS	lassulus	2017-06-24	1	-0/+7
* \|	k 3 setuid: activate only if cfg is not empty	lassulus	2017-06-24	1	-1/+1
* \|	l 2 nixpkgs: 0a4db15 -> e84de79	lassulus	2017-06-23	1	-1/+1
* \|	l 1 mors: use virtualbox instead of libvirt	lassulus	2017-06-20	1	-1/+1
* \|	l 1 prism: activate pyload	lassulus	2017-06-20	1	-0/+3
* \|	l 2 websites domsen: remove obsolete 360video.tv	lassulus	2017-06-20	1	-3/+1
* \|	l 2 radio: join #krebs	lassulus	2017-06-20	1	-1/+4
* \|	l 1 mors: add brain to pkgs	lassulus	2017-06-20	1	-0/+1
* \|	l: add ciko.nix for ciko's mail setup	lassulus	2017-06-20	2	-0/+24
* \|	l 1 mors: remove obsolete powersaving scripts	lassulus	2017-06-20	1	-9/+0
* \|	Merge remote-tracking branch 'ni/master'	lassulus	2017-06-20	10	-159/+164
\|\\|
\| *	concat: RIP	tv	2017-06-20	10	-159/+164
* \|	brain: rename brain-pass -> brain	lassulus	2017-06-20	1	-2/+2
* \|	Merge remote-tracking branch 'gum/master' into HEAD	lassulus	2017-06-20	2	-1/+2
\|\ \
\| * \|	m 2 default: revert to working ref	makefu	2017-06-18	2	-1/+2