From 25024f7fbd5c9a052567c667293f9e37e1bd381a Mon Sep 17 00:00:00 2001 From: Chris Kruining Date: Mon, 22 Sep 2025 08:44:04 +0200 Subject: [PATCH] . --- clan.nix | 11 +++++++++++ flake.lock | 5 +++-- flake.nix | 27 +++++++++------------------ 3 files changed, 23 insertions(+), 20 deletions(-) create mode 100644 clan.nix diff --git a/clan.nix b/clan.nix new file mode 100644 index 0000000..27d7768 --- /dev/null +++ b/clan.nix @@ -0,0 +1,11 @@ +{ + meta.name = "amarth-services"; + + inventory = { + machines = { + "test-darwin-machine" = { + machineClass = "darwin"; + }; + }; + }; +} \ No newline at end of file diff --git a/flake.lock b/flake.lock index 7370d87..3f19c1b 100644 --- a/flake.lock +++ b/flake.lock @@ -216,8 +216,9 @@ "type": "github" }, "original": { - "id": "systems", - "type": "indirect" + "owner": "nix-systems", + "repo": "default", + "type": "github" } }, "treefmt-nix": { diff --git a/flake.nix b/flake.nix index b010c9a..abfce2a 100644 --- a/flake.nix +++ b/flake.nix @@ -14,20 +14,21 @@ inputs.nixpkgs.follows = "nixpkgs"; inputs.flake-parts.follows = "flake-parts"; }; + + systems = { + url = "github:nix-systems/default"; + }; }; outputs = - inputs@{ flake-parts, systems, ... }: + inputs@{ flake-parts, clan-core, systems, ... }: flake-parts.lib.mkFlake { inherit inputs; } ({ ... }: { - systems = [ - "x86_64-linux" - ]; + systems = import systems; imports = [ flake-parts.flakeModules.modules - inputs.clan-core.flakeModules.default - inputs.clan-core.flakeModules.testModule - + clan-core.flakeModules.default + clan-core.flakeModules.testModule ./devShells/flake-module.nix ./clanServices/flake-module.nix @@ -37,16 +38,6 @@ modules = {}; }; - clan = { - meta.name = "amarth-services"; - - inventory = { - machines = { - "test-darwin-machine" = { - machineClass = "darwin"; - }; - }; - }; - }; + clan = import ./clan.nix; }); }