From d1ed412ae63e847f1e1460dc7777c4f8d1bf23bc Mon Sep 17 00:00:00 2001 From: sinanmohd Date: Fri, 30 Aug 2024 07:00:02 +0530 Subject: flake/makeHomeImports: append imports from makeGlobalImports --- flake.nix | 8 +++----- 1 file changed, 3 insertions(+), 5 deletions(-) diff --git a/flake.nix b/flake.nix index caee568..d29e372 100644 --- a/flake.nix +++ b/flake.nix @@ -24,7 +24,7 @@ ] ++ lib.optional (builtins.pathExists ./global/${host}) ./global/${host}; - makeHomeImports = host: [ + makeHomeImports = host: makeGlobalImports host ++ [ ./home/common/home.nix ] ++ lib.optional (builtins.pathExists ./home/${host}) ./home/${host}/home.nix; @@ -50,8 +50,7 @@ useGlobalPkgs = true; useUserPackages = true; users.${username} = { ... }: { - imports = (makeHomeImports host) - ++ (makeGlobalImports host); + imports = makeHomeImports host; }; }; }) @@ -60,8 +59,7 @@ makeHome = host: system: home-manager.lib.homeManagerConfiguration { pkgs = nixpkgs.legacyPackages.${system}; - modules = (makeHomeImports host) - ++ (makeGlobalImports host); + modules = makeHomeImports host; }; in { -- cgit v1.2.3