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

	Commit message (Expand)	Author	Age	Files	Lines
*	Merge remote-tracking branch 'lass/master'	makefu	2017-09-06	2	-20/+19
\|\
\| *	Merge remote-tracking branch 'onondaga/master'	lassulus	2017-09-05	1	-1/+1
\| \|\
\| \| *	nin nixpkgs: 01c3847 -> 799435b	nin	2017-09-05	1	-1/+1
\| * \|	news: cleanup	lassulus	2017-09-05	1	-19/+18
\| \|/
* \|	ma source: add tpm-fix	makefu	2017-09-05	1	-1/+2
* \|	ma source: apply mitmproxy	makefu	2017-09-05	1	-1/+2
* \|	ma drozer: re-enable with protbuf3_2	makefu	2017-09-05	2	-3/+3
* \|	ma gen-oath-safe: do not build with yubikey-manager	makefu	2017-09-04	1	-2/+3
* \|	ma gen-oath-safe: fix typo	makefu	2017-09-04	1	-1/+1
* \|	ma android-pentest: disable due to broken dependency	makefu	2017-09-04	1	-1/+2
* \|	ma zsh-user: krebs.per-user -> users.users	makefu	2017-09-04	1	-1/+1
* \|	ma configs: use buildCores with maxJobs	makefu	2017-09-04	1	-2/+2
* \|	ma tools: add sec-gui	makefu	2017-09-04	4	-1/+11
* \|	ma hw: add tpm to x2x0	makefu	2017-09-04	3	-1/+10
* \|	ma umts module: add missing module from stable	makefu	2017-09-04	2	-0/+71
* \|	ma x: enable tpm	makefu	2017-09-04	1	-0/+2
* \|	ma x: use new dnscrypt client	makefu	2017-09-04	1	-1/+1
* \|	ma gum: enable dnscrypt server	makefu	2017-09-04	1	-2/+1
* \|	ma dnscrypt: provide client and server config	makefu	2017-09-04	2	-3/+41
* \|	Merge remote-tracking branch 'lass/master'	makefu	2017-09-04	52	-494/+635
\|\\|
\| *	news: merge all telegraph feeds	lassulus	2017-09-04	1	-4/+1
\| *	hotdog.r: add build.r	lassulus	2017-09-04	1	-0/+1
\| *	nixpkgs: 51a8326 -> 56da88a	lassulus	2017-09-04	1	-1/+1
\| *	l echelon.r: deactivate realwallpaper	lassulus	2017-09-04	1	-1/+0
\| *	move news & deps: echelon.r -> puyak.r	lassulus	2017-09-04	7	-186/+185
\| *	move go.r: echelon.r -> puyak.r	lassulus	2017-09-04	2	-1/+1
\| *	l pkgs.xmonad: add quick brightness control keys	lassulus	2017-09-03	1	-0/+5
\| *	l: add btce@lassul.us	lassulus	2017-09-03	1	-0/+1
\| *	l mors.r: add c-base config	lassulus	2017-09-03	1	-0/+1
\| *	Reaktor plugins wiki-todo: update feedback text	lassulus	2017-09-03	1	-2/+3
\| *	l daedalus.r: add remote control	lassulus	2017-09-02	1	-0/+9
\| *	l daedalus.r: add pkgs.libreoffice	lassulus	2017-09-02	1	-0/+1
\| *	l mors.r: remove elasticsearch	lassulus	2017-09-02	1	-5/+0
\| *	l source: make overrideable	lassulus	2017-09-02	1	-18/+21
\| *	l xresources: set browser-select on active browser	lassulus	2017-09-02	1	-1/+3
\| *	l reaktor-krebs: show tiki-todo with nginx	lassulus	2017-09-02	1	-0/+4
\| *	l daedalus.r: add de keyboard layout	lassulus	2017-09-02	1	-0/+1
\| *	l git: add nixpkgs	lassulus	2017-09-01	1	-0/+4
\| *	l: no longer sync nixpkgs	lassulus	2017-09-01	2	-5/+0
\| *	Reaktor plugins wiki-todo: fix flag injection	lassulus	2017-09-01	1	-2/+2
\| *	l: coders-irc -> reaktor-coders	lassulus	2017-09-01	2	-1/+1
\| *	l: add Reaktor\|krebs	lassulus	2017-09-01	2	-0/+22
\| *	Merge remote-tracking branch 'ni/master'	lassulus	2017-09-01	6	-9/+27
\| \|\
\| \| *	tv mu: add kdeApplications.l10n.de.qt5	tv	2017-08-31	1	-0/+1
\| \| *	tv mu: sort systemPackages	tv	2017-08-31	1	-8/+8
\| \| *	mv dummy_secrets: add root ssh authorized key	tv	2017-08-31	1	-1/+8
\| \| *	mv dummy_secrets: add ssh.ed25519	tv	2017-08-31	1	-0/+3
\| \| *	Merge derp	tv	2017-08-31	11	-83/+66
\| \| \|\
\| \| \| *	tv: set external = true where appropriate	tv	2017-08-31	1	-0/+5
\| \| \| *	mv stro: ci = true	tv	2017-08-31	1	-0/+1