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

	Commit message (Expand)	Author	Age	Files	Lines
*	buildbot-classic: fix build on 21.05	lassulus	2021-06-09	2	-3/+40
*	nixpkgs: 5de44c1 -> 60cce7e	lassulus	2021-06-09	1	-4/+4
*	Revert "buildbot-classic: build with python 3"	lassulus	2021-06-09	1	-6/+7
*	Merge remote-tracking branch 'lass/master'	makefu	2021-06-09	14	-166/+265
\|\
\| *	wiki: fix ascii error	lassulus	2021-06-09	1	-0/+2
\| *	gollum: follow upstream	lassulus	2021-06-09	3	-114/+1
\| *	mic92: fix key for hydrogen	Jörg Thalheim	2021-06-09	1	-1/+1
\| *	mic92: add ed25519 keys for hydrogen	Jörg Thalheim	2021-06-08	1	-0/+1
\| *	mic92: new ed25519 key for rose	Jörg Thalheim	2021-06-08	1	-1/+1
\| *	mic92: add ed25519 keys for eve/eva	Jörg Thalheim	2021-06-08	1	-0/+3
\| *	mic92: add more ed25519 retiolum keys	Jörg Thalheim	2021-06-08	1	-6/+9
\| *	mic92: start adding ed25519 as well	Jörg Thalheim	2021-06-08	1	-0/+2
\| *	mic92: fix nardole's public ips	Jörg Thalheim	2021-06-08	1	-2/+2
\| *	mic92: remove anindya	Jörg Thalheim	2021-06-08	1	-19/+0
\| *	mic92: add aendernix	Jörg Thalheim	2021-06-08	1	-0/+24
\| *	mic92: nardole: update key + add ip addresses	Jörg Thalheim	2021-06-08	1	-6/+16
\| *	bill: add ip addresses + new key	Jörg Thalheim	2021-06-08	1	-6/+16
\| *	mic92: move loki.r to eva	Jörg Thalheim	2021-06-08	1	-1/+1
\| *	mic92: change ip address of eva	Jörg Thalheim	2021-06-08	1	-2/+2
\| *	Merge remote-tracking branch 'ni/master'	lassulus	2021-06-08	2	-3/+5
\| \|\
\| \| *	flameshot-once: 1.3.0 -> 1.4.0	tv	2021-06-08	2	-7/+8
\| * \|	module ergo: init	lassulus	2021-06-08	3	-0/+150
\| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2021-06-08	1	-6/+5
\| \|\ \
\| \| * \|	flameshot-once: 1.3.0 -> 1.4.0	tv	2021-06-08	1	-6/+5
\| \| \|/
\| * \|	nixpkgs-unstable: 7a1fbc3 -> fbfb794	lassulus	2021-06-07	1	-4/+4
\| * \|	nixpkgs: aa57635 -> 5de44c1	lassulus	2021-06-07	1	-4/+4
\| * \|	l radio: fix counting of listeners	lassulus	2021-06-07	1	-1/+1
\| * \|	l radio: stop sharing with xerxes	lassulus	2021-06-07	1	-1/+1
\| * \|	l radio: add mp3 output	lassulus	2021-06-07	1	-0/+14
\| * \|	l radio: set irc topic	lassulus	2021-06-07	1	-1/+12
\| * \|	l radio: fix starting with 21.05	lassulus	2021-06-07	1	-2/+2
\| * \|	realwallpaper: use imagemagick6 (future lassulus has to understand 7)	lassulus	2021-06-06	1	-2/+1
\| * \|	jeschli enklave.r: disable ci	lassulus	2021-06-06	1	-0/+1
* \| \|	ma pkgs.hdl-dump: rip	makefu	2021-06-09	1	-33/+0
* \| \|	Merge branch '21.05'	makefu	2021-06-06	122	-594/+607
\|\ \ \
\| * \| \|	ma bureautomation: disable puppy-proxy for now	makefu	2021-06-06	1	-1/+1
\| * \| \|	ma pkgs.droidcam: rip	makefu	2021-06-06	1	-55/+0
\| * \| \|	ma x.r: disable xm7370 kmod	makefu	2021-06-06	1	-1/+1
\| * \| \|	ma x13: boot.zfs.enableUnstable = true;	makefu	2021-06-06	1	-0/+1
\| * \| \|	ma samba: remove isNormalUser again	makefu	2021-06-06	7	-12/+6
\| * \| \|	ma tools/sec: use py3 binwalk	makefu	2021-06-05	1	-1/+1
\| * \| \|	ma tools/extra-gui: add chitubox	makefu	2021-06-05	1	-0/+1
\| * \| \|	ma smbguest: isNormalUser	makefu	2021-06-05	3	-0/+3
\| * \| \|	ma arafetch: isSystemUser	makefu	2021-06-05	1	-0/+1
\| * \| \|	puyak.r/shack: isSystemUser everything	makefu	2021-06-05	7	-1/+10
\| * \| \|	ma tools: disable binwalk	makefu	2021-06-05	1	-1/+1
\| * \| \|	ma: update home-manager	makefu	2021-06-05	1	-1/+1
\| * \| \|	module urlwatch: add isSystemUser	makefu	2021-06-05	1	-0/+1
\| * \| \|	ma treewide: make 21.05 compatible (is*User, other fixes)	makefu	2021-06-05	13	-16/+33
\| * \| \|	Merge remote-tracking branch 'lass/21.05' into 21.05	makefu	2021-06-05	2	-7/+62
\| \|\\| \|