diff --git a/home/laozi/jeroboam.nix b/home/laozi/jeroboam.nix index c65c82b..ccd201f 100644 --- a/home/laozi/jeroboam.nix +++ b/home/laozi/jeroboam.nix @@ -1,21 +1,25 @@ { inputs, configVars, configLib, ... }: +#map with prefix to refactor +let + optionals = (configLib.mapPathsToPrefix { prefix = common/optional; list = [ /system /internet /comms /utilities /dev/foot.nix /office ];}); +in { - imports = builtins.concatLists [ + imports = [ # ======================= Hardware Configs ========================= # # ======================= Required Configs ========================= # common/core # ================ Host-specific Optional Configs ================== # - (configLib.concatPathsWithPrefix { - prefix = "common/optional"; - paths = [ system internet comms utilities dev/foot.nix office]; - } - ) + #(configLib.mapPathsToPrefix { + # prefix = common/optional; + # list = [ /system /internet /comms /utilities /dev/foot.nix /office]; + # } + #) # ============================= Themeing =========================== # inputs.nix-colors.homeManagerModules.default - ]; + ] ++ optionals; colorScheme = inputs.nix-colors.colorSchemes.atelier-dune; home = { diff --git a/lib/default.nix b/lib/default.nix index c0079e1..1a6ddbd 100644 --- a/lib/default.nix +++ b/lib/default.nix @@ -22,10 +22,9 @@ (builtins.readDir path) ) ); - concatPathsWithPrefix = { prefix, path }: - builtins.concatLists - [ - (builtins.map (path: "${prefix}/${path}") paths) - ]; + + mapPathsToPrefix = { prefix, list }: + # Filter... sth like builtins.filter (path: builtins.pathExists path) + builtins.map (path: prefix + path) list; }