nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-21 17:59:39 +01:00
Code Activity

dircolors: refactor preferXdgDirectories

Browse source 
Store the paths in variables to deduplicate.
This commit is contained in:
Austin Horstman 2025-02-22 13:14:55 -06:00
parent 413e9b35f1
commit c327afbfd8
1 changed files with 17 additions and 26 deletions
Download patch file Download diff file Expand all files Collapse all files

43
modules/programs/dircolors.nix
View file

@ -54,7 +54,16 @@ in {
}; };
}; };
config = mkIf cfg.enable (mkMerge [ config = let
dircolorsPath = if config.home.preferXdgDirectories then
"${config.xdg.configHome}/dir_colors"
else
"~/.dir_colors";
dircolorsConfig = concatStringsSep "\n" ([ ]
++ mapAttrsToList formatLine cfg.settings ++ [ "" ]
++ optional (cfg.extraConfig != "") cfg.extraConfig);
in mkIf cfg.enable (mkMerge [
{ {
# Add default settings from `dircolors --print-database`. # Add default settings from `dircolors --print-database`.
programs.dircolors.settings = { programs.dircolors.settings = {
@ -188,43 +197,25 @@ in {
".spx" = mkDefault "00;36"; ".spx" = mkDefault "00;36";
".xspf" = mkDefault "00;36"; ".xspf" = mkDefault "00;36";
}; };
}
(mkIf (!config.home.preferXdgDirectories) {
home.file.".dir_colors".text = concatStringsSep "\n" ([ ]
++ mapAttrsToList formatLine cfg.settings ++ [ "" ]
++ optional (cfg.extraConfig != "") cfg.extraConfig);
programs.bash.initExtra = mkIf cfg.enableBashIntegration '' programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors) eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolorsPath})
''; '';
programs.fish.shellInit = mkIf cfg.enableFishIntegration '' programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
eval (${pkgs.coreutils}/bin/dircolors -c ~/.dir_colors) eval (${pkgs.coreutils}/bin/dircolors -c ${dircolorsPath})
''; '';
# Set `LS_COLORS` before Oh My Zsh and `initExtra`. # Set `LS_COLORS` before Oh My Zsh and `initExtra`.
programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration '' programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration ''
eval $(${pkgs.coreutils}/bin/dircolors -b ~/.dir_colors) eval $(${pkgs.coreutils}/bin/dircolors -b ${dircolorsPath})
''; '';
}
(mkIf (!config.home.preferXdgDirectories) {
home.file.".dir_colors".text = dircolorsConfig;
}) })
(mkIf config.home.preferXdgDirectories { (mkIf config.home.preferXdgDirectories {
xdg.configFile.dir_colors.text = concatStringsSep "\n" ([ ] xdg.configFile.dir_colors.text = dircolorsConfig;
++ mapAttrsToList formatLine cfg.settings ++ [ "" ]
++ optional (cfg.extraConfig != "") cfg.extraConfig);
programs.bash.initExtra = mkIf cfg.enableBashIntegration ''
eval $(${pkgs.coreutils}/bin/dircolors -b ${config.xdg.configHome}/dir_colors)
'';
programs.fish.shellInit = mkIf cfg.enableFishIntegration ''
eval (${pkgs.coreutils}/bin/dircolors -c ${config.xdg.configHome}/dir_colors)
'';
# Set `LS_COLORS` before Oh My Zsh and `initExtra`.
programs.zsh.initExtraBeforeCompInit = mkIf cfg.enableZshIntegration ''
eval $(${pkgs.coreutils}/bin/dircolors -b ${config.xdg.configHome}/dir_colors)
'';
}) })
]); ]);
} }