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

	Commit message (Expand)	Author	Age	Files	Lines
*	tv: use pidgin-with-plugins.override	tv	2017-11-02	2	-4/+6
*	tv querel: init	tv	2017-11-02	3	-0/+130
*	tv: netzclub -> ppp	tv	2017-10-27	3	-38/+33
*	tv netzclub: simplify AT code	tv	2017-10-27	1	-10/+2
*	tv netzclub: add missing "	tv	2017-10-26	1	-1/+1
*	tv netzclub: fix example	tv	2017-10-26	1	-1/+1
*	tv netzclub: { -> pkgs.}ppp	tv	2017-10-26	1	-1/+1
*	tv modules: rm umts	tv	2017-10-26	1	-1/+0
*	tv xu: lol wvdial	tv	2017-10-26	1	-1/+0
*	tv netzclub: init	tv	2017-10-26	2	-0/+46
*	tv umts: RIP	tv	2017-10-26	2	-108/+0
*	Merge remote-tracking branch 'prism/master'	tv	2017-10-26	26	-43/+204
\|\
\| *	n nixpkgs: 9824ca6 -> c99239b	nin	2017-10-24	1	-1/+1
\| *	n 2 default: add pavucontrol	nin	2017-10-24	1	-0/+1
\| *	nin hiawatha firefox: remove flash	nin	2017-10-24	1	-4/+0
\| *	n 2 default: update binary-cache	nin	2017-10-24	1	-6/+1
\| *	Merge remote-tracking branch 'prism/master'	nin	2017-10-20	14	-38/+84
\| \|\
\| \| *	l: make screenlock configureable	lassulus	2017-10-19	6	-19/+42
\| \| *	l nixpkgs: 68ef4b1 -> c99239b	lassulus	2017-10-18	1	-1/+1
\| \| *	Merge remote-tracking branch 'ni/master'	lassulus	2017-10-18	1	-12/+13
\| \| \|\
\| \| * \|	l dns: don't resolve local queries	lassulus	2017-10-18	1	-0/+1
\| \| * \|	l baseX: set default font to clean	lassulus	2017-10-18	1	-3/+3
\| \| * \|	l: set ca-bundle to /etc/ssl	lassulus	2017-10-18	1	-1/+1
\| \| * \|	l pkgs.xmonad: add color invert	lassulus	2017-10-18	1	-0/+2
\| \| * \|	l prism.r: add hellrazor user	lassulus	2017-10-18	1	-0/+8
\| \| * \|	Reaktor plugins: fix wiki-todo-show	lassulus	2017-10-18	1	-1/+2
\| \| * \|	news: add painload	lassulus	2017-10-18	1	-0/+1
\| \| * \|	Merge remote-tracking branch 'ni/master'	lassulus	2017-10-17	1	-1/+10
\| \| \|\ \
\| * \| \| \|	Merge remote-tracking branch 'temp/master'	nin	2017-10-17	8	-106/+61
\| \|\\| \| \|
\| \| * \| \|	Merge remote-tracking branch 'ni/master'	lassulus	2017-10-17	8	-106/+61
\| \| \|\ \ \
\| * \| \| \| \|	Merge remote-tracking branch 'temp/master'	nin	2017-10-17	124	-690/+2318
\| \|\\| \| \| \|
\| \| * \| \| \|	l nixpkgs: 2231575 -> 68ef4b1	lassulus	2017-10-16	1	-1/+1
\| \| * \| \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-10-13	2	-0/+2
\| \| \|\ \ \ \
\| \| \| * \| \| \|	ma modules.wvdial: re-init	makefu	2017-10-11	1	-0/+1
\| \| \| * \| \| \|	ma binary-cache/lass: add new cache key	makefu	2017-10-11	1	-0/+1
\| \| * \| \| \| \|	l nixpkgs: 1987983 -> 2231575	lassulus	2017-10-13	1	-1/+1
\| \| * \| \| \| \|	types: add cidr and use as net.address	lassulus	2017-10-11	1	-3/+23
\| \| * \| \| \| \|	l eddie.r: route to edinburgh	lassulus	2017-10-11	1	-1/+7
\| \| * \| \| \| \|	Merge remote-tracking branch 'gum/master'	lassulus	2017-10-10	6	-3/+79
\| \| \|\\| \| \| \|
\| \| \| * \| \| \|	ma cake.r: add tv	makefu	2017-10-10	1	-0/+3
\| \| \| * \| \| \|	ma wvdial: re-add	makefu	2017-10-10	2	-2/+72
\| \| \| * \| \| \|	ma latte.r: add torrent	makefu	2017-10-10	2	-1/+3
\| \| \| * \| \| \|	ma tools/dev: add cdrtools	makefu	2017-10-09	1	-0/+1
\| \| * \| \| \| \|	Revert "zandroum: RIP"	lassulus	2017-10-10	1	-0/+83
\| \| * \| \| \| \|	zandroum: RIP	lassulus	2017-10-10	1	-83/+0
\| * \| \| \| \| \|	Merge branch 'master' of prism:stockholm	nin	2017-09-29	57	-333/+979
\| \|\ \ \ \ \ \
\| * \| \| \| \| \| \|	nin nixpkgs 9e7d9a -> 9824ca6	nin	2017-09-29	1	-1/+1
\| * \| \| \| \| \| \|	nin nixpkgs: 799435b -> 9e7db9a	nin	2017-09-14	1	-1/+1
\| * \| \| \| \| \| \|	Merge remote-tracking branch 'prism/master'	nin	2017-09-14	54	-359/+798
\| \|\ \ \ \ \ \ \
\| * \| \| \| \| \| \| \|	nin: add skype	nin	2017-09-06	2	-0/+28