summaryrefslogtreecommitdiffstats
Commit message (Expand)AuthorAgeFilesLines
* Merge remote-tracking branch 'prism/master'tv2022-01-0325-19/+80
|\
| * Merge remote-tracking branch 'lass/master'makefu2022-01-0313-39/+414
| |\
| | * Merge remote-tracking branch 'gum/master'lassulus2022-01-021-1/+0
| | |\
| | * | krebs.tinc: make /etc/tinc/ writable by tincdlassulus2022-01-021-8/+7
| | * | Merge remote-tracking branch 'mic92/master'lassulus2022-01-021-1/+5
| | |\ \
| | | * | mic92: drop ipv4 for bernieJörg Thalheim2022-01-021-1/+0
| | | * | mic92: add ip address for yasminJörg Thalheim2022-01-021-0/+5
| | * | | Merge remote-tracking branch 'ni/master'lassulus2022-01-022-13/+13
| | |\ \ \
| | * \ \ \ Merge remote-tracking branch 'gum/master'lassulus2022-01-0220-1/+60
| | |\ \ \ \
| | * | | | | nixpkgs-unstable: ac169ec -> 59bfda7lassulus2022-01-021-4/+4
| | * | | | | nixpkgs: 5730959 -> d1e59cflassulus2022-01-021-4/+4
| | | |_|/ / | | |/| | |
| * | | | | k 3 ma: removing trace output for ed25519 keysmakefu2022-01-031-1/+1
| | |_|_|/ | |/| | |
| * | | | ma tools: remove tightvncmakefu2022-01-021-1/+0
| | |/ / | |/| |
| * | | ma pkgs.pkgrename: initmakefu2022-01-021-0/+30
| * | | Merge remote-tracking branch 'tv/master'makefu2021-12-292-31/+12
| |\ \ \
| * | | | k 3 ma: add ed25519 keys for all hostsmakefu2021-12-2911-0/+18
| * | | | k 3 ma: make ed25519 keys available for hostsmakefu2021-12-288-1/+12
* | | | | tv querel: set autoLogin like it's the futuretv2022-01-021-3/+2
* | | | | Merge remote-tracking branch 'prism/master'tv2022-01-016-4/+330
|\ \ \ \ \ | | |_|/ / | |/| | / | |_|_|/ |/| | |
| * | | mic92: add tts.rJörg Thalheim2021-12-311-1/+1
| * | | hotdog.r: add mud prototypelassulus2021-12-312-0/+172
| * | | weechat-declarative: fix example and filter generationKierán Meinhardt2021-12-301-2/+2
| * | | Merge remote-tracking branch 'kmein/master'lassulus2021-12-301-1/+2
| |\ \ \
| | * | | external: update kmein ssh keysKierán Meinhardt2021-12-301-1/+2
| * | | | weechat-declarative: initlassulus2021-12-301-0/+153
| * | | | Merge remote-tracking branch 'ni/master'lassulus2021-12-291-6/+6
| |\ \ \ \ | | |/ / / | |/| | |
| * | | | external: pinpox-ahorn.r -> ahorn.rlassulus2021-12-291-2/+2
* | | | | ircaids: 1.2.0 -> 1.3.0tv2021-12-291-2/+2
* | | | | krebs.systemd: don't offer to reload servicestv2021-12-291-11/+11
| |/ / / |/| | |
* | | | ergo: fix multiclient default configtv2021-12-291-6/+6
|/ / /
* | | ergo: reload, accounts, channels, doclassulus2021-12-291-4/+49
* | | Revert "nixpkgs: 5730959 -> d887ac7"lassulus2021-12-291-4/+4
* | | Merge remote-tracking branch 'ni/master'lassulus2021-12-292-32/+10
|\ \ \ | | |/ | |/|
| * | ircaids: 1.1.0 -> 1.2.0tv2021-12-291-2/+2
| * | ergo: kill dead code and stufftv2021-12-281-30/+8
* | | hotdog.r tinc: add ed25519 pubkeylassulus2021-12-281-0/+1
* | | hotdog.r: charydbis -> ergolassulus2021-12-281-1/+1
|/ /
* | ircaids: 1.0.1 -> 1.1.0tv2021-12-281-2/+2
* | ergo: always merge default configtv2021-12-281-1/+4
|/
* ergo: use DynamicUserlassulus2021-12-281-41/+3
* l proxychains-ng: follow upstreamlassulus2021-12-281-16/+0
* ergo: 2.7.0-rc1 -> 2.8.0lassulus2021-12-281-2/+2
* nixpkgs-unstable: b0bf5f8 -> ac169eclassulus2021-12-281-4/+4
* nixpkgs: 5730959 -> d887ac7lassulus2021-12-281-4/+4
* Merge remote-tracking branch 'mic92/master'lassulus2021-12-281-22/+21
|\
| * fooJörg Thalheim2021-12-280-0/+0
| * mic92: fix ssh ed25519 keysKierán Meinhardt2021-12-281-22/+21
* | Merge remote-tracking branch 'gum/master'lassulus2021-12-281-0/+68
|\ \
| * | ma tonie: use new backend_is_local deploymentmakefu2021-12-271-5/+2
| * | ma home/tonie: fall back to container for front-endmakefu2021-12-271-19/+1