summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
| *-. Merge remote-tracking branches 'gum/master' and 'prism/master'tv2017-05-1658-143/+696
| |\ \
| | | * l 2 retiolum: enable legacy /etc/tinclassulus2017-05-161-0/+1
| | | * tinc module: add option enableLegacylassulus2017-05-161-0/+7
| | | * l 2 retiolum: don't open smtplassulus2017-05-161-1/+0
| | | * k3: retiolum.nix -> tinc.nixlassulus2017-05-162-1/+1
| | | * krebs.tinc: expose confDirtv2017-05-161-20/+21
| * | | whatsupnix: inittv2017-05-162-0/+59
* | | | shared: move shack config to shack/makefu2017-06-017-6/+110
* | | | s: enable save-diskspacemakefu2017-05-253-1/+14
* | | | m 2: rename stats and sharemakefu2017-05-2510-8/+11
* | | | m 2 gui/base: euro-signmakefu2017-05-241-1/+1
* | | | m 1 gum: use upstream taskserver configmakefu2017-05-241-2/+13
* | | | m 2 wiki-irc-bot: move to subdir, add patchmakefu2017-05-242-1/+32
* | | | m 2 games: include games-user-envmakefu2017-05-241-0/+1
* | | | s wolf: enable influx for rashmakefu2017-05-241-0/+3
* | | | m 2 led-fader: wait for mosquitto if defined locallymakefu2017-05-241-1/+2
* | | | m 2 jack-on-pulse: start as systemd user servicemakefu2017-05-241-5/+9
* | | | m 2 central-stats-server: redirect http://stats.makefu.r to grafanamakefu2017-05-241-1/+3
* | | | m 2 aralast: initmakefu2017-05-241-0/+38
* | | | m 2 time-machine: initmakefu2017-05-191-0/+31
* | | | m 2 zsh: enable autocompletion for nix commandsmakefu2017-05-191-0/+4
* | | | m 3 taskserver: ripmakefu2017-05-172-61/+0
| |/ / |/| |
* | | m 2 wiki-irc: also notify #nixosmakefu2017-05-161-2/+2
* | | Merge remote-tracking branch 'lass/master'makefu2017-05-163-37/+22
|\ \ \ | | |/ | |/|
| * | Merge remote-tracking branch 'gum/master'lassulus2017-05-168-7/+8
| |\ \
| * | | l 2 buildbot: use buildbotworker as userlassulus2017-05-161-12/+6
| * | | l 2 buildbot: use correct NIX_PATHlassulus2017-05-161-22/+13
| * | | l 3 news: use correct name in enablelassulus2017-05-151-1/+1
| * | | weechat: 1.7.1 -> 1.8lassulus2017-05-151-2/+2
* | | | m 2 realtime-audio:enable optimizationmakefu2017-05-161-0/+4
| |/ / |/| |
* | | s 2 default: bump to 22da5d02466ffe465735986d705675982f3646a0makefu2017-05-151-1/+1
* | | Merge remote-tracking branch 'lass/master'makefu2017-05-1513-21/+141
|\| |
| * | l 2 nixpkgs: 11b82a9 -> 2bb9c1classulus2017-05-151-1/+1
| * | l 5 xml2json: initlassulus2017-05-152-0/+18
| * | l 3 news: initlassulus2017-05-122-0/+77
| * | Merge remote-tracking branch 'gum/master'lassulus2017-05-1226-31/+441
| |\ \
| * | | k 5 R sed: write englishlassulus2017-05-121-1/+1
| * | | k 5 R sed: make pep80 happylassulus2017-05-121-7/+9
| * | | l 2 mpv: install mpv for all userslassulus2017-05-111-1/+1
| * | | l 2 w lass: /etc/hosts -> pkgs.retiolum-hostslassulus2017-05-111-1/+1
| * | | l 3 l: .internet -> .ilassulus2017-05-111-5/+4
| * | | Merge remote-tracking branch 'ni/master'lassulus2017-05-094-5/+29
| |\ \ \ | | | |/ | | |/|
| | * | retiolum-hosts: inittv2017-05-091-0/+23
| | * | krebs.dns.providers: drop internet and retiolumtv2017-05-091-2/+0
| | * | tv git: add hstooltv2017-05-091-0/+3
| | * | tv: mv-cd -> mv-nitv2017-05-062-3/+3
* | | | m 2 default: fix nixpkgs requests2 fuckupmakefu2017-05-151-1/+1
* | | | m 2 urlwatch: follow msfmakefu2017-05-151-0/+1
* | | | m: requests2 -> requestsmakefu2017-05-125-5/+5
| |_|/ |/| |
* | | m 2 default: bump to 0afb6d7makefu2017-05-121-1/+1