summaryrefslogtreecommitdiffstats
Commit message (Collapse)AuthorAgeFilesLines
* 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
| | | |
| * | | Merge remote-tracking branch 'gum/master'lassulus2017-04-155-9/+63
| |\ \ \
| * | | | l 2 realwallpaper: listen on .rlassulus2017-04-151-0/+1
| | | | |
| * | | | l 2 realwallpaper: allow only from .rlassulus2017-04-151-0/+5
| | | | |
| * | | | lass: update realwallpaper locationslassulus2017-04-152-3/+9
| | | | |
| * | | | realwallpaper: introduce marker_filelassulus2017-04-152-10/+6
| | | | |
| * | | | l 2 nixpkgs: a563923 -> 5acb454lassulus2017-04-141-1/+1
| | | | |
| * | | | Merge remote-tracking branch 'ni/master' into HEADlassulus2017-04-142-7/+7
| |\ \ \ \ | | | |_|/ | | |/| |
| | * | | tv nixpkgs: 7ad99e9 -> 5acb454tv2017-04-141-1/+1
| | | | |
| | * | | htgen: 1.2.1 -> 1.2.2tv2017-04-131-6/+6
| | | | |
| | * | | htgen: 1.2 -> 1.2.1tv2017-04-131-2/+2
| | | | |
| * | | | Merge remote-tracking branch 'ni/master'lassulus2017-04-131-2/+2
| |\| | |
| | * | | htgen: 1.1 -> 1.2tv2017-04-131-2/+2
| | | | |
| * | | | l 1 prism: update chat authorized_keylassulus2017-04-131-1/+1
| | | | |
| * | | | l 1 prism: add Reaktor for #retiolumlassulus2017-04-131-0/+12
| | | | |
| * | | | l 1 prism: change nickname for #coders Reaktorlassulus2017-04-131-8/+9
| | | | |
| * | | | Merge remote-tracking branch 'ni/master'lassulus2017-04-132-2/+1
| |\| | |
| | * | | lass news: -wired_scitv2017-04-131-1/+0
| | | | |
| | * | | tv nixpkgs: 33bd699 -> 7ad99e9tv2017-04-131-1/+1
| | | | |
| | * | | Merge remote-tracking branch 'gum/master'tv2017-04-131-1/+1
| | |\ \ \
| * | \ \ \ Merge remote-tracking branch 'gum/master'lassulus2017-04-131-1/+1
| |\ \ \ \ \ | | |/ / / / | |/| / / / | | |/ / /
| * | | | Merge remote-tracking branch 'prism/lassulus'tv2017-04-135-2/+22
| |\ \ \ \
| * | | | | types.net: normalize IPv6 addresstv2017-04-131-0/+1
| | | | | |
| * | | | | lib: add normalize-ip6-addrtv2017-04-131-0/+46
| | | | | |
| * | | | | tv: normalize all ip6.addrtv2017-04-131-11/+11
| | | | | |
| * | | | | krebs.search-domain: retiolum -> rtv2017-04-131-1/+1
| | | | | |
| * | | | | tv nixpkgs: 69d9061 -> 33bd699tv2017-04-121-1/+1
| | | | | |
* | | | | | m 1 shoney: graphs -> graphmakefu2017-04-171-1/+1
| | | | | |
* | | | | | m 2 tools: add packagesmakefu2017-04-174-1/+4
| | | | | |
* | | | | | m 2 default: 2982661 -> 4fac473makefu2017-04-171-2/+2
| | | | | |
* | | | | | m 2 urxvtd: initmakefu2017-04-174-3/+28
| | | | | |
* | | | | | m: init syncthing for hostsmakefu2017-04-175-5/+23
| |_|_|_|/ |/| | | |
* | | | | k 5 tinc_graphs: bump to 0.3.10makefu2017-04-151-3/+3
| |_|_|/ |/| | |
* | | | k 3 hidden-ssh: initmakefu2017-04-152-0/+54
| | | |