diff --git a/flake.lock b/flake.lock index a0966d48..7b4d3a2b 100644 --- a/flake.lock +++ b/flake.lock @@ -256,11 +256,11 @@ }, "easy-hosts": { "locked": { - "lastModified": 1735855725, - "narHash": "sha256-qiQeyE1Lq7pKoHc0sNDGvFzLV5OiIOrhQ7jnMALQqxM=", + "lastModified": 1735944539, + "narHash": "sha256-scDGgA2LeJi4B0WXzFYVR7DWlgdYfwpoOwawfBJN+4E=", "owner": "isabelroses", "repo": "easy-hosts", - "rev": "67be7847369e1e003baf8cf97e20dcc79c627dc2", + "rev": "6b9d849e79c9fb12f82e4008a94c6341e3606dfb", "type": "github" }, "original": { @@ -805,11 +805,11 @@ ] }, "locked": { - "lastModified": 1735839277, - "narHash": "sha256-1nond419ZbUDj44pf3a3tmq8619fZLLybELfTio5/NU=", + "lastModified": 1735905407, + "narHash": "sha256-1hKMRIT+QZNWX46e4gIovoQ7H8QRb7803ZH4qSKI45o=", "owner": "numtide", "repo": "treefmt-nix", - "rev": "3b0afa7961c5d1d94bd02e1d6e560bd84af0525b", + "rev": "29806abab803e498df96d82dd6f34b32eb8dd2c8", "type": "github" }, "original": { diff --git a/systems/default.nix b/systems/default.nix index fc3e41d1..1e3db80a 100644 --- a/systems/default.nix +++ b/systems/default.nix @@ -27,7 +27,6 @@ let headless = profilesPath + /headless; # for headless systems in { - # this is how we get the custom module `config.hosts` imports = [ inputs.easy-hosts.flakeModule ]; config.easyHosts = { @@ -35,6 +34,9 @@ in perClass = class: { modules = [ + # import the class module, this contains the common configurations between all systems of the same class + "${self}/modules/${class}/default.nix" + (lib.lists.optionals (class != "iso") [ # import the home module, which is users for configuring users via home-manager "${self}/home/default.nix" @@ -42,9 +44,6 @@ in # import the base module, this contains the common configurations between all systems "${self}/modules/base/default.nix" ]) - - # import the class module, this contains the common configurations between all systems of the same class - "${self}/modules/${class}/default.nix" ]; };