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

	Commit message (Collapse)	Author	Age	Files	Lines
*	Merge branch 'master' of prism.r:stockholm into new-master	jeschli	2019-03-21	102	-1236/+1831
\|\
\| *	Merge remote-tracking branch 'enklave/master'	lassulus	2019-03-12	8	-261/+101
\| \|\
\| * \	Merge remote-tracking branch 'ni/master'	lassulus	2019-03-12	7	-26/+15
\| \|\ \
\| \| * \|	external: add palo-pepe.pubkey	tv	2019-03-01	1	-0/+3
\| \| \| \|
\| \| * \|	Reaktor: 0.7.0 -> 0.7.1	tv	2019-02-17	1	-2/+2
\| \| \| \|
\| \| * \|	tv vim: map <f3> :ShowSyntax	tv	2019-02-16	1	-0/+2
\| \| \| \|
\| \| * \|	tv vim: add xmodmap	tv	2019-02-16	1	-0/+4
\| \| \| \|
\| \| * \|	tv vim: add todoComment	tv	2019-02-16	1	-1/+2
\| \| \| \|
\| \| * \|	Revert "tv: add deploy alias"	tv	2019-02-16	1	-7/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit edeb11956553242749a35c9459b45c7bb079881e.
\| \| * \|	lib.types.filename.check: remove unnecessary ()	tv	2019-02-16	1	-1/+1
\| \| \| \|
\| \| * \|	Revert "tv brscan4: init at 0.4.4-4"	tv	2019-02-16	1	-8/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit aa5bccf9e3f49b7e0aaef541a54e5ff58f89fcf7.
\| \| * \|	Revert "brscan4: init at 0.4.4-4"	tv	2019-02-16	2	-9/+8
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit 1993cbc42114c759a47fed8de1e73980d3df57d9.
\| \| * \|	symlinkJoin: remove compatibility	tv	2019-02-16	1	-5/+0
\| \| \| \| \| \| \| \| \| \| \| \| \| \| \| \|	This reverts commit f46b3153c0c85883c9b3a98291f6d440f83bd717.
\| \| * \|	flameshot-once: default filenamePattern w/o .png	tv	2019-02-16	1	-1/+1
\| \| \| \|
\| * \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2019-03-12	47	-440/+821
\| \|\ \ \
\| \| * \| \|	ma nixpkgs.json: bump revision	makefu	2019-03-06	2	-3/+4
\| \| \| \| \|
\| \| * \| \|	ma pkgs.init-host: init	makefu	2019-03-06	2	-0/+48
\| \| \| \| \|
\| \| * \| \|	ma save-diskspace: programs.info -> documentation.info	makefu	2019-03-06	1	-2/+2
\| \| \| \| \|
\| \| * \| \|	ma x.r: re-enable virtualbox	makefu	2019-03-06	1	-1/+1
\| \| \| \| \|
\| \| * \| \|	ma crapi.r: split into software and hardware config	makefu	2019-03-06	2	-32/+40
\| \| \| \| \|
\| \| * \| \|	ma pkgs.ampel: bump rev	makefu	2019-03-06	1	-3/+3
\| \| \| \| \|
\| \| * \| \|	ma homeautomation: update google-muell	makefu	2019-03-06	2	-13/+55
\| \| \| \| \|
\| \| * \| \|	ma bureautomation: split into files	makefu	2019-03-06	16	-262/+560
\| \| \| \| \|
\| \| * \| \|	ma pkgs.Fluffy: init at 2.7	makefu	2019-03-04	1	-0/+42
\| \| \| \| \|
\| \| * \| \|	ma: add base name to aliases when overriding	makefu	2019-02-27	1	-0/+3
\| \| \| \| \|
\| \| * \| \|	ma: make extensive use of defaults for inventory	makefu	2019-02-27	19	-126/+65
\| \| \| \| \|
\| * \| \| \|	nixpkgs: 4c0be40 -> 8abca4b	lassulus	2019-03-07	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	nixpkgs: 9bd45dd -> 4c0be40	lassulus	2019-03-04	1	-3/+3
\| \| \| \| \|
\| * \| \| \|	external: add toastbrot.r	Jan Heidbrink	2019-02-26	1	-0/+30
\| \|/ / /
\| * \| \|	Merge remote-tracking branch 'lass/master'	makefu	2019-02-26	22	-113/+584
\| \|\ \ \
\| \| * \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2019-02-16	4	-16/+142
\| \| \|\\| \|
\| \| \| * \|	lib.xml.render-term: quote strings	tv	2019-02-16	1	-2/+6
\| \| \| \| \|
\| \| \| * \|	lib.xml: init	tv	2019-02-16	2	-0/+85
\| \| \| \| \|
\| \| \| * \|	tv bash-fzf-history: use overrideDerivation	tv	2019-02-16	1	-3/+2
\| \| \| \| \|
\| \| \| * \|	lib.warnOldVersion: init	tv	2019-02-16	1	-0/+5
\| \| \| \| \|
\| \| \| * \|	tv iptables extraTypes: add Retiolum	tv	2019-02-10	1	-0/+4
\| \| \| \| \|
\| \| \| * \|	tv iptables: add extra{4,6}	tv	2019-02-10	1	-13/+42
\| \| \| \| \|
\| \| * \| \|	nixpkgs: 168cbb3 -> 9bd45dd	lassulus	2019-02-16	1	-3/+3
\| \| \| \| \|
\| \| * \| \|	nixpkgs: b01a89d -> 168cbb3	lassulus	2019-02-12	1	-3/+3
\| \| \|/ /
\| \| * \|	tv xmonad: use launch	tv	2019-02-09	1	-1/+1
\| \| \| \|
\| \| * \|	tv xmonad: remove unused language extensions	tv	2019-02-09	1	-4/+0
\| \| \| \|
\| \| * \|	flameshot-once: 1.0.1 -> 1.1.0	tv	2019-02-09	3	-4/+4
\| \| \| \|
\| \| * \|	flameshot-once: make filenamePattern configurable	tv	2019-02-09	1	-0/+7
\| \| \| \|
\| \| * \|	tv xmonad: add dbus	tv	2019-02-09	1	-3/+16
\| \| \| \|
\| \| * \|	flameshot-once: add config	tv	2019-02-09	3	-15/+149
\| \| \| \|
\| \| * \|	flameshot-once: use qt5.qtbase	tv	2019-02-09	1	-1/+2
\| \| \| \|
\| \| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2019-02-08	0	-0/+0
\| \| \|\ \
\| \| \| * \|	flameshot-once: 1.0.0 -> 1.0.1	tv	2019-02-07	1	-7/+8
\| \| \| \| \|
\| \| \| * \|	flameshot-once: init at 1.0.0	tv	2019-02-07	2	-0/+34
\| \| \| \| \|
\| \| \| * \|	tv gitrepos: add flameshot-once	tv	2019-02-07	1	-0/+3
\| \| \| \| \|