summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
...
* | | Merge remote-tracking branch 'lass/master'makefu2017-04-255-3/+83
|\| |
| * | weechat: init at 1.7.1lassulus2017-04-251-0/+80
| * | k 3 hidden-ssh: wait for irc portlassulus2017-04-241-1/+2
| * | l 2 vim: set customized vim to hiPriolassulus2017-04-241-1/+1
| * | move untilport: l/5 -> k/5lassulus2017-04-242-1/+0
* | | m 2 torrent: mkdefault downloadmakefu2017-04-241-2/+2
* | | m 1 gum: add newsbot deploymentmakefu2017-04-242-0/+19
* | | k 3 m: bump x to 4 coresmakefu2017-04-241-1/+1
|/ /
* | m 2 hw/stk1160: initmakefu2017-04-242-0/+16
* | l 2 nixpkgs: 2080f51 -> 992b6dalassulus2017-04-231-1/+1
* | l 2 websites util: give more power to wordpresslassulus2017-04-231-4/+5
* | k 5 realwallpaper: b8408cf -> e056328lassulus2017-04-231-2/+2
* | l 2 nixpkgs: c85f39e -> 2080f51lassulus2017-04-221-1/+1
* | l 5 xmonad-lass: use new wallpaper locationlassulus2017-04-221-1/+1
|/
* Revert "irc-announce: fix cat2 on live systems"tv2017-04-191-1/+1
*-. Merge remote-tracking branches 'gum/master' and 'prism/master'tv2017-04-1941-72/+319
|\ \
| | * k 3 realwallpaper: graphs.r -> graph.rlassulus2017-04-191-1/+1
| * | m 2 fetchwallpaper: use prismmakefu2017-04-191-1/+1
| * | s 2 buildbot: configure nginx for buildbotmakefu2017-04-192-1/+14
| * | m 2 stats-server: also open ports for v6makefu2017-04-191-0/+7
| * | s 1 wolf: send stats to omomakefu2017-04-192-0/+69
| * | m 2 dnscrypt: change resolvermakefu2017-04-191-0/+1
| * | m 1 x: rm krebs.nginxmakefu2017-04-191-5/+0
| * | Merge remote-tracking branch 'lass/master'makefu2017-04-1912-237/+51
| |\|
| | * l 1 iso: hack around buggy /dev/stderr in live isolassulus2017-04-191-0/+21
| | * l 2 nixpkgs: 5acb454 -> c85f39elassulus2017-04-181-1/+1
| | * l 1 iso: enable copytoramlassulus2017-04-181-0/+3
| | * m 1 shoney: graphs -> graphmakefu2017-04-181-1/+1
| | * m 2 tools: add packagesmakefu2017-04-184-1/+4
| | * m 2 default: 2982661 -> 4fac473makefu2017-04-181-2/+2
| | * m 2 urxvtd: initmakefu2017-04-184-3/+28
| | * m: init syncthing for hostsmakefu2017-04-185-5/+23
| | * krebs.nginx: RIPtv2017-04-185-194/+1
| | * retiolum-bootstrap: krebs.nginx -> services.nginxtv2017-04-181-37/+19
| | * shared shack-drivedroid: cleanuptv2017-04-181-11/+16
| | * shared shack-nix-cacher: krebs.nginx -> services.nginxtv2017-04-181-17/+20
| | * shared shack-drivedroid: krebs.nginx -> services.nginxtv2017-04-181-15/+15
| | * wolf: cleanuptv2017-04-181-7/+5
| | * tv nixpkgs: 76c6313 -> b647a67tv2017-04-181-1/+1
| | * tv nixpkgs: 5acb454 -> 76c6313tv2017-04-181-1/+1
| | * l 2 fetchWallpaper: get new wp from prismlassulus2017-04-181-1/+1
| | * l 2: set dnscrypt resolver to cs-delassulus2017-04-181-1/+4
| | * l 2 buildbot: get stockholm source from cgit.prismlassulus2017-04-181-1/+1
| | * l 2 baseX: remove redundant libvirtlassulus2017-04-181-2/+0
| | * k 5 tinc_graphs: bump to 0.3.10makefu2017-04-181-3/+3
| | * l 2: add syncthing.nixlassulus2017-04-183-0/+14
| | * l 1 mors: enable torlassulus2017-04-181-0/+6
| | * l 2: add sshn to pkgslassulus2017-04-181-0/+4
| | * l 1 iso: make sshd worklassulus2017-04-181-8/+1
| | * l 1 mors: disable ipfslassulus2017-04-181-4/+0