-1

flake.nix

··· 14 14 ./lib.nix 15 15 ./modules/flake-module.nix 16 16 ./templates/flake-module.nix 17 17 - ./users/flake-module.nix 18 17 # keep-sorted end 19 18 ]; 20 19

+18 -9

modules/flake-module.nix

··· 12 12 imports = loadDir ./homelab; 13 13 }; 14 14 }; 15 15 - homeModules = rec { 16 16 - default = { 17 17 - imports = loadDir ./shared ++ loadDir ./home; 18 18 - }; 19 19 - root = lib.mkMerge [ 20 20 - default 21 21 - { imports = loadDir ./root; } 22 22 - ]; 23 23 - }; 15 15 + homeModules = lib.mkMerge [ 16 16 + (rec { 17 17 + default = { 18 18 + imports = loadDir ./shared ++ loadDir ./home; 19 19 + }; 20 20 + root = lib.mkMerge [ 21 21 + default 22 22 + { imports = loadDir ./root; } 23 23 + ]; 24 24 + }) 25 25 + ( 26 26 + builtins.readDir ./users 27 27 + |> lib.filterAttrs (n: k: k == "directory") 28 28 + |> lib.mapAttrs ( 29 29 + path: kind: { imports = [ self.homeModules.default ] ++ self.lib.loadDir (./users + "/${path}"); } 30 30 + ) 31 31 + ) 32 32 + ]; 24 33 }; 25 34 }

users/da157/cli/git/default.nix modules/users/da157/cli/git/default.nix

users/da157/cli/ssh/default.nix modules/users/da157/cli/ssh/default.nix

users/da157/tui/lazygit/default.nix modules/users/da157/tui/lazygit/default.nix

-9

users/flake-module.nix

··· 1 1 - { lib, self, ... }: 2 2 - { 3 3 - flake.homeModules = 4 4 - builtins.readDir ./. 5 5 - |> lib.filterAttrs (n: k: k == "directory") 6 6 - |> lib.mapAttrs ( 7 7 - path: kind: { imports = [ self.homeModules.default ] ++ self.lib.loadDir (./. + "/${path}"); } 8 8 - ); 9 9 - }