diff --git a/flake.nix b/flake.nix index 2141d65..17180f1 100644 --- a/flake.nix +++ b/flake.nix @@ -19,6 +19,7 @@ defaultMachine = { system = "x86_64-linux"; + modules = [ ]; config = { pkgs, ... }: { dualBoot = false; @@ -26,7 +27,6 @@ keyMap = "us"; keyboardLayout = "us"; localeSettings = { }; - modules = [ ]; users = { }; }; }; @@ -102,7 +102,7 @@ ) // { nixosConfigurations = builtins.mapAttrs ( - hostname: { system, config }@machine: nixpkgs.lib.nixosSystem { + hostname: { system, config, modules }@machine: nixpkgs.lib.nixosSystem { inherit system; modules = [ @@ -125,7 +125,7 @@ sops-nix.nixosModules.sops ./lib/configuration.nix (tryFiles [ ./lib/machines/${hostname}.nix ] ./lib/hardware/base.nix) - ]; + ] ++ modules; }) machines; diff --git a/lib/configuration.nix b/lib/configuration.nix index d25dc51..1e2f16a 100644 --- a/lib/configuration.nix +++ b/lib/configuration.nix @@ -5,7 +5,7 @@ ./modules/my-users.nix ./modules/sddm.nix ./modules/unfree.nix - ] ++ machine.modules; + ]; config = { system.stateVersion = "23.11";