diff --git a/configs/home-manager/foo-dogsquared/modules/setups/desktop.nix b/configs/home-manager/foo-dogsquared/modules/setups/desktop.nix index 4586efac..9d311a69 100644 --- a/configs/home-manager/foo-dogsquared/modules/setups/desktop.nix +++ b/configs/home-manager/foo-dogsquared/modules/setups/desktop.nix @@ -60,10 +60,9 @@ in topdirs = "~/Downloads ~/Documents ~/library"; "skippedNames+" = let - inherit (config.state) dev ignoreDirectories; - ignoreDirectories' = ignoreDirectories ++ dev.ignoreDirectories; + inherit (config.state) ignoreDirectories; in - lib.concatStringsSep " " ignoreDirectories'; + lib.concatStringsSep " " ignoreDirectories; "~/library/projects" = { "skippedNames+" = ".editorconfig .gitignore result flake.lock go.sum"; diff --git a/configs/home-manager/foo-dogsquared/modules/setups/development.nix b/configs/home-manager/foo-dogsquared/modules/setups/development.nix index 701badc8..4d4e1c9d 100644 --- a/configs/home-manager/foo-dogsquared/modules/setups/development.nix +++ b/configs/home-manager/foo-dogsquared/modules/setups/development.nix @@ -10,7 +10,7 @@ in config = lib.mkIf cfg.enable (lib.mkMerge [ { - state.dev.ignoreDirectories = [ + state.ignoreDirectories = [ "node_modules" # For Node projects. "result" # For Nix builds. "target" # For Rust builds. diff --git a/modules/home-manager/_private/suites/dev.nix b/modules/home-manager/_private/suites/dev.nix index 9406c286..accb73dc 100644 --- a/modules/home-manager/_private/suites/dev.nix +++ b/modules/home-manager/_private/suites/dev.nix @@ -20,7 +20,7 @@ in { ({ # Contains a dev-adjacent list of directory names to be ignored usually # used in walking through directories. - state.dev.ignoreDirectories = [ + state.ignoreDirectories = [ ".git" ".direnv" ]; @@ -112,7 +112,7 @@ in { changeDirWidgetCommand = "${fd} --type directory --unrestricted"; defaultCommand = "${fd} --type file --hidden"; defaultOptions = let - skipDirectories' = lib.concatStringsSep "," config.state.dev.ignoreDirectories; + skipDirectories' = lib.concatStringsSep "," config.state.ignoreDirectories; in [ "--walker-skip=${skipDirectories'}" ]; @@ -175,7 +175,7 @@ in { programs.eza = { enable = true; extraOptions = let - ignoreDirectories = lib.concatStringsSep "|" config.state.dev.ignoreDirectories; + ignoreDirectories = lib.concatStringsSep "|" config.state.ignoreDirectories; in [ "--group-directories-first" "--header"