summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* 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
* | Merge remote-tracking branch 'tv/master'makefu2017-04-174-50/+56
|\ \
| * | shared shack-drivedroid: cleanuptv2017-04-171-11/+16
| * | shared shack-nix-cacher: krebs.nginx -> services.nginxtv2017-04-171-17/+20
| * | shared shack-drivedroid: krebs.nginx -> services.nginxtv2017-04-171-15/+15
| * | wolf: cleanuptv2017-04-171-7/+5
| * | tv nixpkgs: 76c6313 -> b647a67tv2017-04-171-1/+1
| * | tv nixpkgs: 5acb454 -> 76c6313tv2017-04-151-1/+1
* | | Merge remote-tracking branch 'lass/master'makefu2017-04-1718-57/+140
|\ \ \
| * \ \ Merge remote-tracking branch 'gum/master'lassulus2017-04-161-3/+3
| |\ \ \
| * | | | l 2: add syncthing.nixlassulus2017-04-163-0/+14
| * | | | l 1 mors: enable torlassulus2017-04-161-0/+6
| * | | | l 2: add sshn to pkgslassulus2017-04-161-0/+4
| * | | | l 1 iso: make sshd worklassulus2017-04-161-8/+1
| * | | | l 1 mors: disable ipfslassulus2017-04-161-4/+0
| * | | | irc-announce: fix cat2 on live systemslassulus2017-04-161-1/+1
| | |_|/ | |/| |
| * | | k 3 hidden-ssh: start after network-online.targetlassulus2017-04-161-1/+1
| * | | l 1 iso: enable hidden-sshlassulus2017-04-151-0/+3