diff --git a/clan.nix b/clan.nix index 2d030e3..0582c93 100644 --- a/clan.nix +++ b/clan.nix @@ -48,11 +48,6 @@ name = "@amarth/k3s"; input = "amarth"; }; - - roles.server.machines."c1" = {}; - - roles.agent.machines."c2" = {}; - roles.agent.machines."c3" = {}; }; }; diff --git a/flake.lock b/flake.lock index 90ca109..0b21c58 100644 --- a/flake.lock +++ b/flake.lock @@ -8,14 +8,15 @@ "amarth", "clan-core", "nixpkgs" - ] + ], + "systems": "systems_2" }, "locked": { - "lastModified": 1758024845, - "narHash": "sha256-aMhb+b0LA3IxoaXJ+5YoGSs5mf/N18z+/tj+NjASTmU=", + "lastModified": 1757947021, + "narHash": "sha256-BinQx0l//FdLRxYzvQG6lwP8HR9g8iiJ5I6vt5Mm1Fs=", "ref": "refs/heads/main", - "rev": "ceed1a0cdf5b72c290ad5e060f8a68539847df67", - "revCount": 8, + "rev": "5525d770f1f73145860f2f929496d3d85ee058dc", + "revCount": 3, "type": "git", "url": "https://git.amarth.cloud/amarth/services.git" }, @@ -59,15 +60,15 @@ "nixos-facter-modules": "nixos-facter-modules_2", "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix_2", - "systems": "systems_2", + "systems": "systems_3", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1758021280, - "narHash": "sha256-tnXjO1KpfFRKqe9tPZ5ZrM6O2E1DG2nJiE0QKJACPG8=", - "rev": "f2134754c5f0fdca982487de82a16428021a0e0e", + "lastModified": 1757912940, + "narHash": "sha256-Xypz7pxa1L09GooMueosv0CRW4Cx5/gdtvSPBrnXf6M=", + "rev": "93280a9f987bbe689c74f1ea21d0c2fa4645c359", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/f2134754c5f0fdca982487de82a16428021a0e0e.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/93280a9f987bbe689c74f1ea21d0c2fa4645c359.tar.gz" }, "original": { "type": "tarball", @@ -403,11 +404,11 @@ ] }, "locked": { - "lastModified": 1758007585, - "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", + "lastModified": 1757449901, + "narHash": "sha256-qwN8nYdSRnmmyyi+uR6m4gXnVktmy5smG1MOrSFD8PI=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", + "rev": "3b4a369df9dd6ee171a7ea4448b50e2528faf850", "type": "github" }, "original": { @@ -432,6 +433,20 @@ } }, "systems_2": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "id": "systems", + "type": "indirect" + } + }, + "systems_3": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", diff --git a/vars/per-machine/c1/k3s-ip/ip_v4/value b/vars/per-machine/c1/k3s-ip/ip_v4/value deleted file mode 100644 index 7b9ad53..0000000 --- a/vars/per-machine/c1/k3s-ip/ip_v4/value +++ /dev/null @@ -1 +0,0 @@ -127.0.0.1 diff --git a/vars/per-machine/c1/k3s-ip/ip_v6/value b/vars/per-machine/c1/k3s-ip/ip_v6/value deleted file mode 100644 index 20e29b1..0000000 --- a/vars/per-machine/c1/k3s-ip/ip_v6/value +++ /dev/null @@ -1 +0,0 @@ -::1 diff --git a/vars/per-machine/c1/k3s-token/token/secret b/vars/per-machine/c1/k3s-token/token/secret deleted file mode 100644 index 0c21df6..0000000 --- a/vars/per-machine/c1/k3s-token/token/secret +++ /dev/null @@ -1,15 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:KAyQJfDtHcwT2MP+C74ovM1k5Rw1rEjF5LsyH2CjS1VBxbQ+ACen/qEDzGw5db15/NZW,iv:1HzHYAgHtcyQbJRN2BHK+DPhhIPTao2yJMSZTDWO5xQ=,tag:vUKOJTpv/y6pm6pzzfEfZw==,type:str]", - "sops": { - "age": [ - { - "recipient": "age1ewes0f5snqx3sh5ul6fa6qtxzhd25829v6mf5rx2wnheat6fefps5rme2x", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1dmZJNCtGeXNCTEp6T2Fq\nRmxsUHBVRmszT0RhdDUyckh1MHZhNUxkUTB3ClYxWnFOaWpocXBhY2EvbWJCaEVa\nQUR6cnBmajkySVo4dHdlTnl0NVJFQTQKLS0tIEQ3UW5ZUGVQckorWlpMSkovaGZt\nblJRaVd1NkkxLzJRT0o0Y1JPMlpwaW8KaqYT1lqsLjzRScgSapz+5anOGaS/SXPW\nzZkKQbYKa6ZmjOwuBJ2GBdni7iNSd7BGmZhyzgvs1h30kMLEkW2GtA==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2025-09-16T12:18:00Z", - "mac": "ENC[AES256_GCM,data:VD+Swc/5+f3vWHIoTBQmtiLc6GhEKX/suygfKJWpum3INnxCTvj4QXcGVc6Hzn5Yeat9tdiiXXcuu0F2zTcDjikGL167iuf6HlC1ASfBh/gt7yau5SiD0WYhouxZFo+b4FvnNv0sb4+JTGMSkOLdJD2h6UvA15iXe5vTS9+ZCq8=,iv:f4TZkVrriKxZBMcJLLtyR/RJ7vDtBOSx/stwoWV/A3A=,tag:JGIExjoT/zTj4NPEsJ+vBg==,type:str]", - "unencrypted_suffix": "_unencrypted", - "version": "3.10.2" - } -} diff --git a/vars/per-machine/c1/zerotier/zerotier-identity-secret/secret b/vars/per-machine/c1/zerotier/zerotier-identity-secret/secret deleted file mode 100644 index ecbf66f..0000000 --- a/vars/per-machine/c1/zerotier/zerotier-identity-secret/secret +++ /dev/null @@ -1,19 +0,0 @@ -{ - "data": "ENC[AES256_GCM,data:aWunrs+Y0zsINHpVRHpBsj1loN3K4qP8rfWz4QY7DyteXQbCoomZuoc+OCJuQ8Y2VPDlc93shaRXcarnKTwztVZezfs09KazxALmwQmKzExY/4Fg2pnc8A18JKAY0PmSbcpKiMCUfwuD8XsAUPQ09aJQTBPPWOq23VDujlnQTO/waO/zaYhgOHw9QKFxknOL+Jyd2T9coB6aK8pkgOu65RbC5nlzS7noUGIVPA+5pi1y16p6f/1MibIV0oMO7+7Tgx8jKKESYbQUCuPqJUJsiMTEu6JXf25eLaHEmsPYTkaPYXda2bcAt4nA5DEq+vFhb3KYiSXbxoRp2phaozZSb4VgzqNUaoDCPwsn4bo7,iv:NPDB2pe++UNXjM3MQUvDMh4qDD072G+onboqGuZb4QU=,tag:QWByLe294QAqmH0HVsnGOQ==,type:str]", - "sops": { - "age": [ - { - "recipient": "age19cnepqj2xclqwgv9esldz3znsezxazz0599ctkn2t5znsvxjxdjqvnxl80", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBUMGlzZzEzTTNhRzYrNG9Q\nMTFGNEtmVVdMRlNrellBb0diR2dTWmhYbURNCmR3bmE3VWkvd1EzRFRKQWRkT2g0\nd0dVUUtKTTlmL3YvTUdPZ0VKT1ZabVEKLS0tIGVteVFCNnVHS25VY3U3OUpCNHg3\nSUZaYU9iVWY1MXRqZjhRYTRIVUpqNWsKFjrxGe+1zGBQrJzfPrPyTX5cQ2aQs2V7\njMUY6l9/RmYhmHnvaTiEzKfBmJKBV284G2N3zLg3jORboYNe6gmU0A==\n-----END AGE ENCRYPTED FILE-----\n" - }, - { - "recipient": "age1ewes0f5snqx3sh5ul6fa6qtxzhd25829v6mf5rx2wnheat6fefps5rme2x", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBBZWdqaVpwZjVHMlNJbmFF\nSjF3ODNiNGVGMkZNUDFycVNQNGFpVDJvU21FCmdML1VMMzFYcHd2Rk0vMUg1Uzg5\neEVhUW1FNWVzeHZlWldLQ1kxcmlyYzAKLS0tIEhMdkYwOHo0b2E2OS9RekY4a3c1\naW1uTklBQVgxdHYxYzRhbjVTRXBxNUEK7szc1EoEfLP7w5KM8p+Nt/zxNm/Zih7r\nyjMWJ8upJ3baL6fCJAwI8DhBQy3WenQKHXp4g2cH2AUxOnYk1jaPIA==\n-----END AGE ENCRYPTED FILE-----\n" - } - ], - "lastmodified": "2025-09-16T12:11:44Z", - "mac": "ENC[AES256_GCM,data:bbZVtnTwkWC+9w/zM6FfAr42wmsm0ymDBmtc4ZGCDtsizMYKB955B4XG0jI8oavyv4HxPZo/XETo7Eo30T6LpGge0qQ53ZMygYP/xIsM9vwF8rk8f1qNGfNAUDYSBk95Fe5/l9YzCRwZunGw0Dz427VeSJnKLXPjYdvGctWlowM=,iv:DGMxTXhNHgoLI+8E6SaKbALwqsq68A/qXhqTmqRYvdE=,tag:6iSUxFnE1lb7kTc3+VTewQ==,type:str]", - "unencrypted_suffix": "_unencrypted", - "version": "3.10.2" - } -} diff --git a/vars/per-machine/c1/zerotier/zerotier-ip/value b/vars/per-machine/c1/zerotier/zerotier-ip/value deleted file mode 100644 index 62c0836..0000000 --- a/vars/per-machine/c1/zerotier/zerotier-ip/value +++ /dev/null @@ -1 +0,0 @@ -fd03:2623:9523:e639:2899:933b:7273:40e9 \ No newline at end of file