diff --git a/extern/default.nix b/extern/default.nix index 8a4e36f8..5484eb4e 100644 --- a/extern/default.nix +++ b/extern/default.nix @@ -1,7 +1,4 @@ { inputs }: with inputs; -let - hmModules = { }; -in { modules = [ home.nixosModules.home-manager @@ -19,9 +16,12 @@ in # passed to all nixos modules specialArgs = { - inherit hmModules; - overrideModulesPath = "${override}/nixos/modules"; hardware = nixos-hardware.nixosModules; }; + + # added to home-manager + userModules = [ + ]; + } diff --git a/flake.nix b/flake.nix index b10f6b69..0e945c5b 100644 --- a/flake.nix +++ b/flake.nix @@ -51,6 +51,10 @@ let moduleList = import ./modules/module-list.nix; in lib.pathsToImportedAttrs moduleList; + homeModules = + let moduleList = import ./users/modules/module-list.nix; + in lib.pathsToImportedAttrs moduleList; + overlay = import ./pkgs; overlays = lib.pathsToImportedAttrs (lib.pathsIn ./overlays); diff --git a/hosts/default.nix b/hosts/default.nix index ba6ad91c..1e8dec35 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -35,8 +35,12 @@ let }; global = { config, ... }: { - home-manager.useGlobalPkgs = true; - home-manager.useUserPackages = true; + home-manager = { + useGlobalPkgs = true; + useUserPackages = true; + + sharedModules = extern.userModules ++ (builtins.attrValues self.homeModules); + }; hardware.enableRedistributableFirmware = lib.mkDefault true; diff --git a/users/modules/module-list.nix b/users/modules/module-list.nix new file mode 100644 index 00000000..fe51488c --- /dev/null +++ b/users/modules/module-list.nix @@ -0,0 +1 @@ +[]