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

	Commit message (Expand)	Author	Age	Files	Lines
*	Revert "Revert "ma nixpkgs: 86fb1e9 -> bf46294" ... for now"	makefu	2018-11-10	1	-4/+4
*	Merge remote-tracking branch 'lassul.us/master'	makefu	2018-11-10	23	-107/+110
\|\
\| *	l realwallpaper: chmod +x	lassulus	2018-11-10	1	-1/+4
\| *	l binary-cache: serve under cache.{krebsco.de,lassul.us}	lassulus	2018-11-10	1	-1/+1
\| *	l & m: fetchWallpaper: fetch realwallpaper-krebs.png	lassulus	2018-11-10	2	-2/+2
\| *	l realwallpaper: serve realwallpaper-krebs.png	lassulus	2018-11-10	1	-4/+1
\| *	l dns-stuff: sort	lassulus	2018-11-10	1	-4/+4
\| *	Merge remote-tracking branch 'ni/master'	lassulus	2018-11-10	3	-6/+14
\| \|\
\| \| *	krebs: add youtube@eloop.org	tv	2018-11-10	1	-0/+1
\| \| *	Merge remote-tracking branch 'prism/master'	tv	2018-11-10	107	-2424/+1570
\| \| \|\
\| \| * \|	tv mu: replace disk	tv	2018-11-08	1	-6/+7
\| \| * \|	tv q: add utcdate	tv	2018-11-08	1	-0/+6
\| * \| \|	l: add cache.krebsco.de & cache.lassul.us	lassulus	2018-11-10	1	-0/+2
\| \| \|/ \| \|/\|
\| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2018-11-10	1	-0/+6
\| \|\\|
\| \| *	krebs.tinc: add tincUpExtra	tv	2018-10-30	1	-0/+6
\| * \|	Merge remote-tracking branch 'nextgum/master'	lassulus	2018-11-10	91	-2340/+998
\| \|\ \
\| * \ \	Merge remote-tracking branch 'prism/master'	lassulus	2018-11-10	17	-84/+543
\| \|\ \ \
\| \| * \| \|	l ejabberd: allow registration	lassulus	2018-11-10	1	-2/+2
\| \| * \| \|	l sqlBackup: remove mysql_password	lassulus	2018-11-10	1	-1/+0
\| \| * \| \|	l mail: add nix@lassul.us to nix ml	lassulus	2018-11-10	1	-1/+1
\| \| * \| \|	l git: chmod +x /var/spool	lassulus	2018-11-10	1	-0/+4
\| \| * \| \|	l games: add steam-run & dolphinEmu to pkgs	lassulus	2018-11-10	1	-0/+2
\| \| * \| \|	l: add neocron@lassul.us	lassulus	2018-11-10	1	-0/+1
\| \| * \| \|	l ciko: chmod +x	lassulus	2018-11-10	1	-0/+4
\| \| * \| \|	l blue: add l-gen-secrets	lassulus	2018-11-10	1	-0/+1
\| \| * \| \|	l prism.r: new physical host	lassulus	2018-11-10	1	-70/+49
\| \| * \| \|	l prism.r: remove deprecated grub workaround	lassulus	2018-11-10	1	-2/+0
\| \| * \| \|	l archprism.r: new hfos ip	lassulus	2018-11-10	2	-12/+12
\| \| * \| \|	realwallpaper: e056328 -> 847faeb	lassulus	2018-11-10	1	-2/+2
\| \| * \| \|	hotdog.r: remove import of gitlab-runner-shackspace	lassulus	2018-11-10	1	-1/+0
\| \| * \| \|	nixpkgs: 06fb025 -> bf7930d	lassulus	2018-11-05	1	-3/+3
\| * \| \| \|	nixpkgs: 81f5c26 -> 06fb025	lassulus	2018-10-31	1	-3/+3
* \| \| \| \|	ma: disable some host ci	makefu	2018-11-10	1	-10/+10
* \| \| \| \|	ma secrets: add hass/darksy.apikey	makefu	2018-11-10	1	-0/+0
* \| \| \| \|	airdcpp module: after local-fs.target	makefu	2018-11-10	1	-1/+1
\| \|_\|/ / \|/\| \| \|
* \| \| \|	Merge remote-tracking branch 'lassul.us/master'	makefu	2018-11-05	30	-79/+766
\|\ \ \ \
\| * \| \| \|	nixpkgs: 06fb025 -> bf7930d	lassulus	2018-11-05	1	-3/+3
\| \| \|/ / \| \|/\| \|
\| * \| \|	Merge branch 'master' of archprism.r:stockholm	lassulus	2018-11-05	0	-0/+0
\| \|\ \ \
\| \| * \| \|	l: prism.r -> archprism.r, new prism.r	lassulus	2018-11-04	3	-1/+474
\| \| \|/ /
\| * \| \|	nixpkgs: 81f5c26 -> 06fb025	lassulus	2018-11-04	1	-3/+3
\| * \| \|	l baseX: remove broken pkgs.push	lassulus	2018-11-04	1	-1/+0
\| * \| \|	l: prism.r -> archprism.r, new prism.r	lassulus	2018-11-04	3	-1/+474
\| \|/ /
\| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2018-10-30	3	-3/+6
\| \|\\|
\| \| *	Merge remote-tracking branch 'prism/master'	tv	2018-10-27	75	-559/+935
\| \| \|\
\| \| * \|	nix-writers: 3.0.0 -> 3.2.0	tv	2018-10-27	1	-0/+0
\| \| * \|	git-preview: add GIT_PREVIEW_MERGE_STRATEGY	tv	2018-10-23	1	-1/+5
\| \| * \|	tv x220: add config argument	tv	2018-10-23	1	-2/+1
\| * \| \|	l: adopt kruck.r (palo)	lassulus	2018-10-30	1	-0/+29
\| * \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2018-10-23	1	-0/+19
\| \|\\| \| \| \| \|/ \| \|/\|
\| \| *	tv x220: add tpacpi-bat	tv	2018-10-22	1	-0/+13