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

	Commit message (Expand)	Author	Age	Files	Lines
*	j bln: fix xserver service	jeschli	2018-06-27	1	-8/+17
*	j: services.xserver removed from 2config	jeschli	2018-06-27	1	-20/+0
*	j vim: +fileline ; cosmetics	jeschli	2018-06-27	1	-12/+22
*	j brauerei: xserver	jeschli	2018-06-27	1	-21/+16
*	j brauerei: vagrant fix	jeschli	2018-06-27	1	-2/+12
*	j brauerei: +vagrant	jeschli	2018-06-19	1	-0/+1
*	Merge remote-tracking branch 'origin/staging/jeschli'	jeschli	2018-06-19	199	-1882/+2651
\|\
\| *	Merge remote-tracking branch 'origin/master'	jeschli	2018-06-19	140	-926/+1349
\| \|\
\| \| *	Merge remote-tracking branch 'onondaga-http/master'	lassulus	2018-06-14	1	-2/+13
\| \| \|\
\| \| \| *	nin axon: add login manager & some programs	nin	2018-06-14	1	-2/+13
\| \| * \|	ma wbob.r: disable hydra (for now)	makefu	2018-06-14	1	-1/+1
\| \| * \|	Merge remote-tracking branch 'lass/master'	makefu	2018-06-14	36	-313/+287
\| \| \|\\|
\| \| \| *	Merge remote-tracking branch 'gum/master'	lassulus	2018-06-13	9	-51/+77
\| \| \| \|\
\| \| \| * \	Merge remote-tracking branch 'ni/master'	lassulus	2018-06-13	6	-27/+19
\| \| \| \|\ \
\| \| \| \| * \|	tv gitrepos: add nix-writers	tv	2018-06-12	1	-0/+1
\| \| \| \| * \|	tv kaepsele: RIP	tv	2018-05-31	1	-24/+0
\| \| \| \| * \|	ejabberd: use utillinux's flock	tv	2018-05-25	1	-2/+1
\| \| \| \| * \|	tv urlwatch nixos: 17.09 -> 18.03	tv	2018-05-12	1	-1/+1
\| \| \| \| * \|	tv xmonad: add otpmenu	tv	2018-05-09	1	-0/+1
\| \| \| \| * \|	tv otpmenu: init	tv	2018-05-09	1	-0/+15
\| \| \| * \| \|	github krebscode -> krebs	lassulus	2018-06-12	9	-13/+13
\| \| \| * \| \|	Revert "l prism.r: remove unnecessary iptables forward"	lassulus	2018-06-11	1	-0/+15
\| \| \| * \| \|	l: remove xerxes from authorizedKeys	lassulus	2018-06-08	1	-1/+0
\| \| \| * \| \|	l baseX: add ag to pkgs	lassulus	2018-06-08	1	-0/+1
\| \| \| * \| \|	l prism.r: open ports for mosh	lassulus	2018-06-08	1	-0/+5
\| \| \| * \| \|	l websites domsen: serve www.freemonkey.art	lassulus	2018-06-08	1	-1/+4
\| \| \| * \| \|	l git: fix typo	lassulus	2018-06-08	1	-1/+1
\| \| \| * \| \|	l blue: add ag & nmap to pkgs	lassulus	2018-06-08	1	-0/+5
\| \| \| * \| \|	l prism.r: remove unnecessary iptables forward	lassulus	2018-06-08	1	-15/+0
\| \| \| * \| \|	move Reaktor\|krebs from prism to hotdog	lassulus	2018-06-08	2	-1/+1
\| \| \| * \| \|	reaktor: add agenda todo plugin	lassulus	2018-06-08	2	-2/+6
\| \| \| * \| \|	Reaktor plugins: add todo plugin generator	lassulus	2018-06-08	1	-0/+22
\| \| \| * \| \|	Reaktor plugins: remove wiki-todo	lassulus	2018-06-08	2	-27/+0
\| \| \| * \| \|	l: kops -> krops	lassulus	2018-06-07	3	-13/+20
\| \| \| * \| \|	ci: build steps dynamically, cleanup	lassulus	2018-06-05	6	-216/+179
\| \| \| * \| \|	nixpkgs: ef74caf -> 7295e17	lassulus	2018-06-04	1	-1/+1
\| \| \| * \| \|	kops -> krops	lassulus	2018-06-04	2	-10/+9
\| \| \| * \| \|	add lass-mors to authorizedKeys	lassulus	2018-06-04	1	-0/+1
\| \| * \| \| \|	ma pkgs.python-firetv: no need for nixpkgs-unstable anymore	makefu	2018-06-10	1	-1/+1
\| \| \| \|_\|/ \| \| \|/\| \|
\| \| * \| \|	ma tools: core -> desktop	makefu	2018-06-07	3	-9/+12
\| \| * \| \|	ma source: fix exfat-nofuse build	makefu	2018-05-31	1	-2/+3
\| \| * \| \|	Merge remote-tracking branch 'lass/master'	makefu	2018-05-31	114	-650/+993
\| \| \|\\| \|
\| \| \| * \|	l prism.r: add wireguard config	lassulus	2018-05-21	1	-0/+28
\| \| \| * \|	l: remove IM.nix	lassulus	2018-05-21	2	-74/+0
\| \| \| * \|	l: add bitlbee.nix	lassulus	2018-05-21	1	-0/+15
\| \| \| * \|	l red: forceSSL	lassulus	2018-05-21	1	-1/+1
\| \| \| * \|	l git: add blue & mors to allowed users	lassulus	2018-05-20	1	-1/+1
\| \| \| * \|	l monitoring: don't send resolved status	lassulus	2018-05-20	1	-1/+0
\| \| \| * \|	l exim: add new mail addresses	lassulus	2018-05-20	1	-0/+2
\| \| \| * \|	l backup: add blue to authorizedKeys	lassulus	2018-05-20	1	-0/+1