summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* Merge remote-tracking branch 'prism/master'makefu2016-08-2414-28/+31
|\
| * l 1 helios: remove obsolete importlassulus2016-08-241-3/+0
| * Merge remote-tracking branch 'gum/master'lassulus2016-08-2410-30/+550
| |\
| * | l 2 nixpkgs: 671cc4e -> c5cbda2 & fix indentlassulus2016-08-241-3/+3
| * | l 2 mail: add default value for from=lassulus2016-08-241-0/+1
| * | l 2 default: remove oboslete workaroundlassulus2016-08-241-7/+0
| * | l 2 baseX: add synaptics configlassulus2016-08-241-0/+5
| * | l 1 prism: add android-weechat keylassulus2016-08-241-0/+1
| * | l 1 helios: update guest configlassulus2016-08-241-5/+11
| * | l 2 vim: change from nvim to vimlassulus2016-08-241-1/+1
| * | l: import retiolum.nix explicitlassulus2016-08-249-8/+8
| * | l 2 nixpkgs: a75c0d9 -> 671cc4elassulus2016-08-221-1/+1
| * | k 3 l: update mors ssh keylassulus2016-08-221-1/+1
* | | m 3 rtorrent: cleanup loggingmakefu2016-08-241-22/+19
| |/ |/|
* | m 3 rtorrent:for rss plugin to work - phpfpm user needs curl in pathmakefu2016-08-241-0/+1
* | m 3 rtorrent: only buidl rutorrent if webcfg is enabled as wellmakefu2016-08-241-2/+4
* | m 3 rtorrent: mkIf, recursiveUpdate and multiple changes in systemd.services ...makefu2016-08-241-81/+79
* | m 1 wbob: use xfce instead of awesomemakefu2016-08-231-23/+42
* | m rtorrent: split web rpc and rutorrent functionalitymakefu2016-08-232-42/+102
* | m 3 rtorrent: add TODOmakefu2016-08-221-0/+1
* | m 1 gum: enable opentrackermakefu2016-08-221-0/+1
* | m 1 omo: configure delugemakefu2016-08-221-0/+13
* | m 2 rtorrent: initial config with rutorrentmakefu2016-08-221-0/+13
* | m 2 torrent: update config for otpimized seedingmakefu2016-08-221-6/+7
* | k 3 m: move tracker.makefu.r to gummakefu2016-08-221-1/+28
* | m 3 default: enable opentracker and rtorrentmakefu2016-08-221-0/+2
* | m 2 opentracker: initmakefu2016-08-221-0/+16
* | m 3 rtorrent: initmakefu2016-08-221-0/+311
* | m 3 opentracker: initmakefu2016-08-221-0/+55
|/
* Merge remote-tracking branch 'gum/master'lassulus2016-08-2120-9/+500
|\
| * m 6 secrets: add daemon-pwmakefu2016-08-211-0/+1
| * m 2 temp: initmakefu2016-08-213-0/+16
| * Merge remote-tracking branch 'prism/master'makefu2016-08-2126-89/+223
| |\
| * | m 2 udpt: initmakefu2016-08-211-0/+31
| * | m 1 *: add torrentmakefu2016-08-214-5/+10
| * | m 5 torrent: implement shared torrent secretmakefu2016-08-211-0/+81
| * | m 3 populate: allow minimal populatemakefu2016-08-212-4/+16
| * | m 3 udpt: initmakefu2016-08-212-1/+60
| * | m 5 udpt: initmakefu2016-08-212-0/+30
| * | m 3 deluge: implement authmakefu2016-08-211-4/+7
| * | m : init dropmakefu2016-08-212-0/+63
| * | m 3 deluge: init modulemakefu2016-08-182-0/+183
| * | m bcm4352: init for xmakefu2016-08-132-0/+7
* | | Merge remote-tracking branch 'cd/master'lassulus2016-08-216-30/+3
|\ \ \
| * | | vncdotool: RIP (upstream dilapidated)tv2016-08-214-28/+0
| * | | Merge remote-tracking branch 'prism/master'tv2016-08-218-18/+118
| |\ \ \ | | | |/ | | |/|
| * | | tv Xresources: use ff from per-user bindirtv2016-08-131-2/+2
| * | | stro: enable public_htmltv2016-08-131-0/+1
* | | | Merge remote-tracking branch 'cd/master'lassulus2016-08-111-1/+2
|\| | |
| * | | logf: don't call jq's gsub with empty regex :)tv2016-08-111-1/+2