From 81bc14dcb9b649451939a01d3828ca4c170dc897 Mon Sep 17 00:00:00 2001 From: clan-tool Date: Tue, 16 Sep 2025 15:16:12 +0200 Subject: [PATCH] kaas --- clan.nix | 5 +++ flake.lock | 41 ++++++------------- .../c1/k3s-token/token/users/nixos | 1 - .../zerotier-identity-secret/machines/c1 | 1 - .../zerotier-identity-secret/users/nixos | 1 - 5 files changed, 18 insertions(+), 31 deletions(-) delete mode 120000 vars/per-machine/c1/k3s-token/token/users/nixos delete mode 120000 vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1 delete mode 120000 vars/per-machine/c1/zerotier/zerotier-identity-secret/users/nixos diff --git a/clan.nix b/clan.nix index 0582c93..2d030e3 100644 --- a/clan.nix +++ b/clan.nix @@ -48,6 +48,11 @@ 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 0b21c58..90ca109 100644 --- a/flake.lock +++ b/flake.lock @@ -8,15 +8,14 @@ "amarth", "clan-core", "nixpkgs" - ], - "systems": "systems_2" + ] }, "locked": { - "lastModified": 1757947021, - "narHash": "sha256-BinQx0l//FdLRxYzvQG6lwP8HR9g8iiJ5I6vt5Mm1Fs=", + "lastModified": 1758024845, + "narHash": "sha256-aMhb+b0LA3IxoaXJ+5YoGSs5mf/N18z+/tj+NjASTmU=", "ref": "refs/heads/main", - "rev": "5525d770f1f73145860f2f929496d3d85ee058dc", - "revCount": 3, + "rev": "ceed1a0cdf5b72c290ad5e060f8a68539847df67", + "revCount": 8, "type": "git", "url": "https://git.amarth.cloud/amarth/services.git" }, @@ -60,15 +59,15 @@ "nixos-facter-modules": "nixos-facter-modules_2", "nixpkgs": "nixpkgs_2", "sops-nix": "sops-nix_2", - "systems": "systems_3", + "systems": "systems_2", "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1757912940, - "narHash": "sha256-Xypz7pxa1L09GooMueosv0CRW4Cx5/gdtvSPBrnXf6M=", - "rev": "93280a9f987bbe689c74f1ea21d0c2fa4645c359", + "lastModified": 1758021280, + "narHash": "sha256-tnXjO1KpfFRKqe9tPZ5ZrM6O2E1DG2nJiE0QKJACPG8=", + "rev": "f2134754c5f0fdca982487de82a16428021a0e0e", "type": "tarball", - "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/93280a9f987bbe689c74f1ea21d0c2fa4645c359.tar.gz" + "url": "https://git.clan.lol/api/v1/repos/clan/clan-core/archive/f2134754c5f0fdca982487de82a16428021a0e0e.tar.gz" }, "original": { "type": "tarball", @@ -404,11 +403,11 @@ ] }, "locked": { - "lastModified": 1757449901, - "narHash": "sha256-qwN8nYdSRnmmyyi+uR6m4gXnVktmy5smG1MOrSFD8PI=", + "lastModified": 1758007585, + "narHash": "sha256-HYnwlbY6RE5xVd5rh0bYw77pnD8lOgbT4mlrfjgNZ0c=", "owner": "Mic92", "repo": "sops-nix", - "rev": "3b4a369df9dd6ee171a7ea4448b50e2528faf850", + "rev": "f77d4cfa075c3de66fc9976b80e0c4fc69e2c139", "type": "github" }, "original": { @@ -433,20 +432,6 @@ } }, "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-token/token/users/nixos b/vars/per-machine/c1/k3s-token/token/users/nixos deleted file mode 120000 index b1bb8e7..0000000 --- a/vars/per-machine/c1/k3s-token/token/users/nixos +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/nixos \ No newline at end of file diff --git a/vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1 b/vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1 deleted file mode 120000 index 01430a8..0000000 --- a/vars/per-machine/c1/zerotier/zerotier-identity-secret/machines/c1 +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/machines/c1 \ No newline at end of file diff --git a/vars/per-machine/c1/zerotier/zerotier-identity-secret/users/nixos b/vars/per-machine/c1/zerotier/zerotier-identity-secret/users/nixos deleted file mode 120000 index b1bb8e7..0000000 --- a/vars/per-machine/c1/zerotier/zerotier-identity-secret/users/nixos +++ /dev/null @@ -1 +0,0 @@ -../../../../../../sops/users/nixos \ No newline at end of file