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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge branch 'master' of prism.r:stockholm	jeschli	2019-04-09	5	-9/+187
\|\
\| *	Merge remote-tracking branch 'ni/master'	lassulus	2019-04-08	1	-0/+126
\| \|\
\| \| *	q-power_supply: init from tv's q	tv	2019-03-29	1	-0/+126
\| * \|	l: add green.r	lassulus	2019-04-07	1	-0/+40
\| * \|	syncthing: add id option	lassulus	2019-04-07	1	-3/+7
\| * \|	l phone.w: rotate all keys	lassulus	2019-04-07	2	-3/+3
\| * \|	l skynet.r: add wiregrill	lassulus	2019-04-07	1	-0/+7
\| * \|	l prism.r: add syncthing.id	lassulus	2019-04-07	1	-0/+1
\| * \|	nixpkgs: 8abca4b -> 2229509	lassulus	2019-04-07	1	-3/+3
* \| \|	:Merge branch 'master' of prism.r:stockholm	jeschli	2019-04-02	48	-859/+796
\|\\| \|
\| * \|	syncthing: increase rescanInterval to track upstream	lassulus	2019-03-23	1	-1/+1
\| * \|	syncthing: wait for service startup	lassulus	2019-03-23	1	-0/+2
\| * \|	syncthing folders: add watch & ignorePerms options	lassulus	2019-03-23	1	-0/+18
\| * \|	l phone: add syncthing.id	lassulus	2019-03-23	1	-0/+1
\| * \|	l blue: add syncthing.id	lassulus	2019-03-23	1	-0/+1
\| * \|	l littleT: add wiregrill & syncthing	lassulus	2019-03-23	1	-0/+8
\| * \|	l: add syncthing ids for mors, icarus & skynet	lassulus	2019-03-22	1	-0/+3
\| * \|	k: add syncthing module	lassulus	2019-03-22	2	-0/+130
\| * \|	power-action module: no need for stockholm/lib	makefu	2019-03-19	1	-2/+1
\| * \|	Merge remote-tracking branch 'enklave/master'	lassulus	2019-03-12	1	-36/+0
\| \|\ \
\| * \ \	Merge remote-tracking branch 'ni/master'	lassulus	2019-03-12	4	-17/+6
\| \|\ \ \ \| \| \| \|/ \| \| \|/\|
\| \| * \|	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
\| \| * \|	Revert "brscan4: init at 0.4.4-4"	tv	2019-02-16	1	-9/+0
\| \| * \|	symlinkJoin: remove compatibility	tv	2019-02-16	1	-5/+0
\| \| * \|	flameshot-once: default filenamePattern w/o .png	tv	2019-02-16	1	-1/+1
\| * \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2019-03-12	19	-124/+66
\| \|\ \ \
\| \| * \| \|	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	8	-37/+246
\| \|\ \ \
\| \| * \| \|	nixpkgs: 168cbb3 -> 9bd45dd	lassulus	2019-02-16	1	-3/+3
\| \| * \| \|	nixpkgs: b01a89d -> 168cbb3	lassulus	2019-02-12	1	-3/+3
\| \| \|/ /
\| \| * \|	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
\| \| * \|	flameshot-once: add config	tv	2019-02-09	3	-15/+149
\| \| * \|	flameshot-once: use qt5.qtbase	tv	2019-02-09	1	-1/+2
\| \| * \|	nixpkgs: 97e0d53 -> b01a89d	lassulus	2019-02-08	1	-3/+3
\| \| * \|	external: actually import palo.nix	lassulus	2019-02-08	1	-0/+1
\| \| * \|	flameshot-once: 1.0.0 -> 1.0.1	tv	2019-02-08	1	-7/+8
\| \| * \|	flameshot-once: init at 1.0.0	tv	2019-02-08	2	-0/+34
\| \| * \|	blessings: 2.1.0 -> 2.2.0	tv	2019-02-08	1	-4/+5
\| \| * \|	krebs-hosts-*: don't add lines without alias	tv	2019-02-08	1	-1/+1
\| \| * \|	krebs-hosts_combined: init	tv	2019-02-08	1	-8/+12
\| \| * \|	retiolum-hosts: RIP	tv	2019-02-08	2	-9/+0
\| \| * \|	krebs-hosts-*: generate from krebs.hosts	tv	2019-02-08	2	-24/+59
\| * \| \|	ma: cleanup hosts	makefu	2019-02-26	27	-680/+188
\| \|/ /
\| * \|	external: add catullus.r	lassulus	2019-02-05	1	-0/+25