From 35cd5bf0eeacd8d998ea55ee809692eed57dfc71 Mon Sep 17 00:00:00 2001 From: clan-tool Date: Mon, 22 Sep 2025 06:45:38 +0000 Subject: [PATCH] I didn't push my code again... --- clan.nix | 2 +- flake.lock | 53 ++++++------------- flake.nix | 17 +++--- vars/per-machine/c1/k3s/ip_v4/value | 1 - vars/per-machine/c1/k3s/ip_v6/value | 1 - .../c1/state-version/version/value | 1 - .../c2/state-version/version/value | 1 - .../c3/state-version/version/value | 1 - .../m1/state-version/version/value | 1 - 9 files changed, 27 insertions(+), 51 deletions(-) delete mode 100644 vars/per-machine/c1/k3s/ip_v4/value delete mode 100644 vars/per-machine/c1/k3s/ip_v6/value delete mode 100644 vars/per-machine/c1/state-version/version/value delete mode 100644 vars/per-machine/c2/state-version/version/value delete mode 100644 vars/per-machine/c3/state-version/version/value delete mode 100644 vars/per-machine/m1/state-version/version/value diff --git a/clan.nix b/clan.nix index 4cc945d..252d012 100644 --- a/clan.nix +++ b/clan.nix @@ -11,7 +11,7 @@ description = "Management node 1"; machineClass = "nixos"; tags = [ "cloud:amarth" "region:oss" "nodeType:management" "criticallity:critical" "" ]; - deploy.targetHost = "root@192.168.1.222"; + deploy.targetHost = "root@192.168.1.223"; }; c1 = { name = "compute-1"; diff --git a/flake.lock b/flake.lock index c61f67d..cf8ebef 100644 --- a/flake.lock +++ b/flake.lock @@ -157,24 +157,6 @@ "type": "github" } }, - "devshell_2": { - "inputs": { - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1741473158, - "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", - "owner": "numtide", - "repo": "devshell", - "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "devshell", - "type": "github" - } - }, "disko": { "inputs": { "nixpkgs": [ @@ -391,22 +373,6 @@ } }, "nixpkgs_3": { - "locked": { - "lastModified": 1722073938, - "narHash": "sha256-OpX0StkL8vpXyWOGUD6G+MA26wAXK6SpT94kLJXo6B4=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "e36e9f57337d0ff0cf77aceb58af4c805472bfae", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixpkgs-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1758035966, "narHash": "sha256-qqIJ3yxPiB0ZQTT9//nFGQYn8X/PBoJbofA7hRKZnmE=", @@ -426,9 +392,9 @@ "inputs": { "amarth-services": "amarth-services", "clan-core": "clan-core_2", - "devshell": "devshell_2", "flake-parts": "flake-parts_2", - "nixpkgs": "nixpkgs_4" + "nixpkgs": "nixpkgs_3", + "systems": "systems_4" } }, "sops-nix": { @@ -518,6 +484,21 @@ "type": "github" } }, + "systems_4": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "treefmt-nix": { "inputs": { "nixpkgs": [ diff --git a/flake.nix b/flake.nix index e9fb98f..e2f78b7 100644 --- a/flake.nix +++ b/flake.nix @@ -1,4 +1,6 @@ { + description = "Infrastructure of Amarth Cloud"; + inputs = { nixpkgs = { url = "github:NixOS/nixpkgs?ref=nixos-unstable"; @@ -15,23 +17,22 @@ inputs.flake-parts.follows = "flake-parts"; }; - devshell = { - url = "github:numtide/devshell"; - }; - amarth-services = { url = "git+https://git.amarth.cloud/amarth/services"; }; + + systems = { + url = "github:nix-systems/default"; + }; }; outputs = - inputs@{ flake-parts, self, clan-core, ... }: + inputs@{ flake-parts, self, clan-core, systems, ... }: flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: { - systems = [ - "x86_64-linux" - ]; + systems = import systems; imports = [ + flake-parts.flakeModules.modules clan-core.flakeModules.default ./devShells/flake-module.nix diff --git a/vars/per-machine/c1/k3s/ip_v4/value b/vars/per-machine/c1/k3s/ip_v4/value deleted file mode 100644 index 7b9ad53..0000000 --- a/vars/per-machine/c1/k3s/ip_v4/value +++ /dev/null @@ -1 +0,0 @@ -127.0.0.1 diff --git a/vars/per-machine/c1/k3s/ip_v6/value b/vars/per-machine/c1/k3s/ip_v6/value deleted file mode 100644 index 20e29b1..0000000 --- a/vars/per-machine/c1/k3s/ip_v6/value +++ /dev/null @@ -1 +0,0 @@ -::1 diff --git a/vars/per-machine/c1/state-version/version/value b/vars/per-machine/c1/state-version/version/value deleted file mode 100644 index 115ab7a..0000000 --- a/vars/per-machine/c1/state-version/version/value +++ /dev/null @@ -1 +0,0 @@ -25.11 \ No newline at end of file diff --git a/vars/per-machine/c2/state-version/version/value b/vars/per-machine/c2/state-version/version/value deleted file mode 100644 index 115ab7a..0000000 --- a/vars/per-machine/c2/state-version/version/value +++ /dev/null @@ -1 +0,0 @@ -25.11 \ No newline at end of file diff --git a/vars/per-machine/c3/state-version/version/value b/vars/per-machine/c3/state-version/version/value deleted file mode 100644 index 115ab7a..0000000 --- a/vars/per-machine/c3/state-version/version/value +++ /dev/null @@ -1 +0,0 @@ -25.11 \ No newline at end of file diff --git a/vars/per-machine/m1/state-version/version/value b/vars/per-machine/m1/state-version/version/value deleted file mode 100644 index 115ab7a..0000000 --- a/vars/per-machine/m1/state-version/version/value +++ /dev/null @@ -1 +0,0 @@ -25.11 \ No newline at end of file