diff --git a/.forgejo/workflows/build.yaml b/.forgejo/workflows/build.yaml index ee456fc..213dd15 100644 --- a/.forgejo/workflows/build.yaml +++ b/.forgejo/workflows/build.yaml @@ -8,7 +8,7 @@ jobs: - uses: actions/checkout@v4 name: Checkout repository - name: Attic login - run: attic login nixfleet http://sisko.wg.aciceri.dev:8081 ${{secrets.ATTIC_NIXFLEET_TOKEN}} + run: attic login nixfleet http://10.100.0.1:8081 ${{secrets.ATTIC_NIXFLEET_TOKEN}} - name: Build with nix run: nix-fast-build --no-nom --systems "x86_64-linux aarch64-linux" --attic-cache "nixfleet" --skip-cached --result-file result.json || true - name: Report checks diff --git a/modules/zerotier/default.nix b/modules/zerotier/default.nix index 0b5a552..b326c9e 100644 --- a/modules/zerotier/default.nix +++ b/modules/zerotier/default.nix @@ -1,16 +1,17 @@ { config, lib, ... }: { - services.zerotierone = { - enable = true; - joinNetworks = [ "632ea29085af0cb4" ]; - }; - environment = - if (config.networking.hostName == "sisko") then - { - persistence."/persist".directories = [ - "/var/lib/zerotier-one" - ]; - } - else - { }; + config = lib.mkMerge [ + { + services.zerotierone = { + enable = true; + joinNetworks = [ "632ea29085af0cb4" ]; + }; + + } + (lib.mkIf (config.networking.hostName == "sisko") { + environment.persistence."/persist".directories = [ + "/var/lib/zerotier-one" + ]; + }) + ]; }