diff --git a/checks/flake-module.nix b/checks/flake-module.nix index 4a42fa05c..7aec75d36 100644 --- a/checks/flake-module.nix +++ b/checks/flake-module.nix @@ -67,6 +67,9 @@ in lib.mapAttrs' ( name: config: lib.nameValuePair "nixos-${name}" config.config.system.build.toplevel ) (lib.filterAttrs (n: _: !lib.hasPrefix "test-" n) self.nixosConfigurations) + // lib.mapAttrs' ( + name: config: lib.nameValuePair "darwin-${name}" config.config.system.build.toplevel + ) (self.darwinConfigurations or { }) // lib.mapAttrs' (n: lib.nameValuePair "package-${n}") packagesToBuild // lib.mapAttrs' (n: lib.nameValuePair "devShell-${n}") self'.devShells // lib.mapAttrs' (name: config: lib.nameValuePair "home-manager-${name}" config.activation-script) ( diff --git a/flake.nix b/flake.nix index f1b4568ff..ad5edac73 100644 --- a/flake.nix +++ b/flake.nix @@ -62,6 +62,14 @@ { clan = { meta.name = "clan-core"; + inventory = { + services = { }; + machines = { + "test-darwin-machine" = { + machineClass = "darwin"; + }; + }; + }; }; systems = import systems; imports = diff --git a/lib/modules/clan/module.nix b/lib/modules/clan/module.nix index f993e9989..dabea62c8 100644 --- a/lib/modules/clan/module.nix +++ b/lib/modules/clan/module.nix @@ -51,9 +51,7 @@ let allMachines = config.clanInternals.inventoryClass.machines; # <- inventory.machines <- clan.machines - machineClasses = lib.mapAttrs ( - name: _: inventory.machines.${name}.machineClass - ) allMachines; + machineClasses = lib.mapAttrs (name: _: inventory.machines.${name}.machineClass) allMachines; configurations = lib.mapAttrs ( name: _: diff --git a/machines/test-darwin-machine/configuration.nix b/machines/test-darwin-machine/configuration.nix new file mode 100644 index 000000000..1cfb23056 --- /dev/null +++ b/machines/test-darwin-machine/configuration.nix @@ -0,0 +1,7 @@ +{ + # Basic system configuration + system.stateVersion = 5; + + # Set the nixpkgs system + nixpkgs.hostPlatform = "aarch64-darwin"; +}