stockholm - Make all the systems into 1systems!

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of https://cgit.lassul.us/stockholm	Jeschli	2019-12-20	66	-3117/+854
\|\
\| *	nixpkgs-unstable: e89b215 -> 3140fa8	lassulus	2019-12-14	1	-3/+3
\| *	nixpkgs: 4ad6f14 -> 45ea609	lassulus	2019-12-14	1	-3/+3
\| *	Merge remote-tracking branch 'gum/master'	lassulus	2019-12-10	5	-11/+193
\| \|\
\| \| *	pkgs.tinc_graphs: bump to 3.11	makefu	2019-12-10	1	-2/+4
\| \| *	ma iso: add justdoit,target-config.nix	makefu	2019-11-29	4	-9/+189
\| * \|	realwallpaper: use working cloudmap	lassulus	2019-12-08	1	-1/+1
\| * \|	l br: set new ip	lassulus	2019-12-07	1	-1/+1
\| * \|	l shodan.r: add gg23 config	lassulus	2019-12-02	3	-76/+138
\| * \|	l prism.r: add transmission session id header	lassulus	2019-12-02	1	-0/+1
\| * \|	l prism.r: add flix endpoint	lassulus	2019-12-02	1	-0/+13
\| * \|	l prism.r: open udp for murmur	lassulus	2019-12-02	1	-0/+1
\| * \|	l prism.r: merge palos keys	lassulus	2019-12-02	1	-5/+1
\| * \|	l prism.r: don't rebuild hotdog onchange	lassulus	2019-12-02	1	-2/+1
\| * \|	l icarus.r: add media center	lassulus	2019-12-02	1	-0/+13
\| * \|	l hilum.r: mount nfs-dl	lassulus	2019-12-02	1	-0/+1
\| * \|	l blue.r: dont populate nixpkgs-unstable	lassulus	2019-12-02	1	-0/+3
\| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2019-12-02	6	-51/+125
\| \|\ \
\| \| * \|	krops: 1.18.0 -> 1.18.1	tv	2019-12-02	1	-0/+0
\| \| * \|	tv im: add weechat relay support	tv	2019-12-02	1	-0/+13
\| \| * \|	tv im: add mosh support	tv	2019-12-02	1	-5/+30
\| \| * \|	tv im: configs -> modules	tv	2019-12-02	4	-25/+73
\| \| * \|	iana-etc module: allow adding new services	tv	2019-12-02	1	-26/+14
\| * \| \|	update-nixpkgs-unstable: fix commit msg	lassulus	2019-12-01	1	-1/+1
\| * \| \|	l: remove archprism	lassulus	2019-12-01	1	-38/+0
\| * \| \|	bepasty-server use python3	lassulus	2019-12-01	1	-4/+4
\| \|/ /
\| * \|	Merge remote-tracking branch 'prism/master'	tv	2019-11-29	7	-100/+138
\| \|\ \
\| \| * \|	Merge branch 'master' of http://cgit.gum.r/stockholm	lassulus	2019-11-29	6	-100/+137
\| \| \|\\|
\| \| \| *	shack: streamline ssh-key deployment onto puyak and wolf	makefu	2019-11-25	3	-14/+13
\| \| \| *	gitlab-ci: add puyak deployment	makefu	2019-11-25	1	-2/+16
\| \| \| *	ma shack/prometheus: import alerting-rules from mayflower	makefu	2019-11-25	2	-84/+108
\| \| * \|	ci: redownload all repos	lassulus	2019-11-29	1	-0/+1
\| \| \|/
\| * \|	krops: 1.17.0 -> 1.18.0	tv	2019-11-29	1	-0/+0
\| * \|	Merge remote-tracking branch 'prism/master'	tv	2019-11-27	34	-2832/+214
\| \|\\|
\| \| *	l codimd: remove deprecated override	lassulus	2019-11-25	1	-13/+1
\| \| *	newsbot-js: fix build on 19.09	lassulus	2019-11-24	4	-272/+204
\| \| *	delete mb	lassulus	2019-11-24	24	-2315/+0
\| \| *	nixpkgs: 07e6648 -> 4ad6f14	lassulus	2019-11-24	1	-3/+3
\| \| *	nixpkgs-unstable: c196652 -> e89b215	lassulus	2019-11-24	1	-3/+3
\| \| *	l autowifi: convert to submodule	lassulus	2019-11-20	4	-229/+6
\| * \|	krebs exim-smarthost: RIP slash16	tv	2019-11-27	1	-2/+1
\| \|/
\| *	l codimd: fix by using old version	lassulus	2019-11-17	1	-2/+13
\| *	nixpkgs-unstable: 7827d3f -> c196652	lassulus	2019-11-17	1	-3/+3
\| *	nixpkgs: cb2cdab -> 07e6648	lassulus	2019-11-17	1	-3/+3
\| *	m: use correct tinc addresses for amy/clara	Jörg Thalheim	2019-11-15	1	-4/+4
\| *	Merge remote-tracking branch 'enklave/master'	lassulus	2019-11-14	5	-16/+33
\| \|\
\| * \|	nixpkgs: c5aabb0 -> cb2cdab	lassulus	2019-11-14	1	-3/+3
\| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2019-11-12	2	-12/+0
\| \|\ \
\| \| * \	Merge remote-tracking branch 'prism/master'	tv	2019-11-12	44	-136/+1176
\| \| \|\ \
\| \| * \| \|	exim: remove because upstream has caught up	tv	2019-11-12	1	-12/+0