summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge branch 'master' of https://cgit.lassul.us/stockholmJeschli2019-12-2066-3117/+854
|\
| * nixpkgs-unstable: e89b215 -> 3140fa8lassulus2019-12-141-3/+3
| * nixpkgs: 4ad6f14 -> 45ea609lassulus2019-12-141-3/+3
| * Merge remote-tracking branch 'gum/master'lassulus2019-12-105-11/+193
| |\
| | * pkgs.tinc_graphs: bump to 3.11makefu2019-12-101-2/+4
| | * ma iso: add justdoit,target-config.nixmakefu2019-11-294-9/+189
| * | realwallpaper: use working cloudmaplassulus2019-12-081-1/+1
| * | l br: set new iplassulus2019-12-071-1/+1
| * | l shodan.r: add gg23 configlassulus2019-12-023-76/+138
| * | l prism.r: add transmission session id headerlassulus2019-12-021-0/+1
| * | l prism.r: add flix endpointlassulus2019-12-021-0/+13
| * | l prism.r: open udp for murmurlassulus2019-12-021-0/+1
| * | l prism.r: merge palos keyslassulus2019-12-021-5/+1
| * | l prism.r: don't rebuild hotdog onchangelassulus2019-12-021-2/+1
| * | l icarus.r: add media centerlassulus2019-12-021-0/+13
| * | l hilum.r: mount nfs-dllassulus2019-12-021-0/+1
| * | l blue.r: dont populate nixpkgs-unstablelassulus2019-12-021-0/+3
| * | Merge remote-tracking branch 'ni/master'lassulus2019-12-026-51/+125
| |\ \
| | * | krops: 1.18.0 -> 1.18.1tv2019-12-021-0/+0
| | * | tv im: add weechat relay supporttv2019-12-021-0/+13
| | * | tv im: add mosh supporttv2019-12-021-5/+30
| | * | tv im: configs -> modulestv2019-12-024-25/+73
| | * | iana-etc module: allow adding new servicestv2019-12-021-26/+14
| * | | update-nixpkgs-unstable: fix commit msglassulus2019-12-011-1/+1
| * | | l: remove archprismlassulus2019-12-011-38/+0
| * | | bepasty-server use python3lassulus2019-12-011-4/+4
| |/ /
| * | Merge remote-tracking branch 'prism/master'tv2019-11-297-100/+138
| |\ \
| | * | Merge branch 'master' of http://cgit.gum.r/stockholmlassulus2019-11-296-100/+137
| | |\|
| | | * shack: streamline ssh-key deployment onto puyak and wolfmakefu2019-11-253-14/+13
| | | * gitlab-ci: add puyak deploymentmakefu2019-11-251-2/+16
| | | * ma shack/prometheus: import alerting-rules from mayflowermakefu2019-11-252-84/+108
| | * | ci: redownload all reposlassulus2019-11-291-0/+1
| | |/
| * | krops: 1.17.0 -> 1.18.0tv2019-11-291-0/+0
| * | Merge remote-tracking branch 'prism/master'tv2019-11-2734-2832/+214
| |\|
| | * l codimd: remove deprecated overridelassulus2019-11-251-13/+1
| | * newsbot-js: fix build on 19.09lassulus2019-11-244-272/+204
| | * delete mbmb-riplassulus2019-11-2424-2315/+0
| | * nixpkgs: 07e6648 -> 4ad6f14lassulus2019-11-241-3/+3
| | * nixpkgs-unstable: c196652 -> e89b215lassulus2019-11-241-3/+3
| | * l autowifi: convert to submodulelassulus2019-11-204-229/+6
| * | krebs exim-smarthost: RIP slash16tv2019-11-271-2/+1
| |/
| * l codimd: fix by using old versionlassulus2019-11-171-2/+13
| * nixpkgs-unstable: 7827d3f -> c196652lassulus2019-11-171-3/+3
| * nixpkgs: cb2cdab -> 07e6648lassulus2019-11-171-3/+3
| * m: use correct tinc addresses for amy/claraJörg Thalheim2019-11-151-4/+4
| * Merge remote-tracking branch 'enklave/master'lassulus2019-11-145-16/+33
| |\
| * | nixpkgs: c5aabb0 -> cb2cdablassulus2019-11-141-3/+3
| * | Merge remote-tracking branch 'ni/master'lassulus2019-11-122-12/+0
| |\ \
| | * \ Merge remote-tracking branch 'prism/master'tv2019-11-1244-136/+1176
| | |\ \
| | * | | exim: remove because upstream has caught uptv2019-11-121-12/+0