chn/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2026-01-11 17:39:37 +08:00
Code Issues Packages Projects Releases Wiki Activity

broot: get rid of IFDs (backport of #6723)

Browse Source 
(cherry picked from commit f4d9d1e2ad)
This commit is contained in:
Robin Stumm
2025-04-01 19:07:51 +02:00
committed by Austin Horstman
parent a9f8b3db21
commit b4e98224ad
2 changed files with 17 additions and 22 deletions
Download Patch File Download Diff File Expand all files Collapse all files

35
modules/programs/broot.nix
View File

@@ -6,10 +6,10 @@ let
cfg = config.programs.broot;
tomlFormat = pkgs.formats.toml { };
jsonFormat = pkgs.formats.json { };
settingsModule = {
freeformType = tomlFormat.type;
freeformType = jsonFormat.type;
options = {
modal = mkEnableOption "modal (vim) mode";
@@ -203,7 +203,7 @@ in {
config = mkIf cfg.enable {
home.packages = [ cfg.package ];
xdg.configFile."broot" = {
xdg.configFile.broot = {
recursive = true;
source = pkgs.symlinkJoin {
name = "xdg.configFile.broot";
@@ -214,31 +214,26 @@ in {
# Dummy file to prevent broot from trying to reinstall itself
(pkgs.writeTextDir "launcher/installed-v1" "")
];
postBuild = ''
ln -s ${
tomlFormat.generate "broot-config" cfg.settings
} $out/conf.toml
# Remove conf.hjson, whose content has been merged into programs.broot.settings
rm $out/conf.hjson
${getExe pkgs.jq} --slurp add > $out/conf.hjson \
<(${
getExe pkgs.hjson-go
} -c ${cfg.package.src}/resources/default-conf/conf.hjson) \
${jsonFormat.generate "broot-config.json" cfg.settings}
'';
};
};
programs.broot.settings = builtins.fromJSON (builtins.readFile
(pkgs.runCommand "default-conf.json" {
nativeBuildInputs = [ pkgs.hjson ];
}
"hjson -c ${cfg.package.src}/resources/default-conf/conf.hjson > $out"));
programs = {
bash.initExtra = mkIf cfg.enableBashIntegration (shellInit "bash");
programs.bash.initExtra = mkIf cfg.enableBashIntegration (shellInit "bash");
zsh.initExtra = mkIf cfg.enableZshIntegration (shellInit "zsh");
programs.zsh.initExtra = mkIf cfg.enableZshIntegration (shellInit "zsh");
fish.shellInit = mkIf cfg.enableFishIntegration (shellInit "fish");
programs.fish.shellInit = mkIf cfg.enableFishIntegration (shellInit "fish");
programs.nushell.extraConfig =
mkIf cfg.enableNushellIntegration (shellInit "nushell");
nushell.extraConfig =
mkIf cfg.enableNushellIntegration (shellInit "nushell");
};
};
}

4
tests/modules/programs/broot/broot.nix
View File

@@ -7,7 +7,7 @@
};
nmt.script = ''
assertFileExists home-files/.config/broot/conf.toml
assertFileContains home-files/.config/broot/conf.toml 'modal = true'
assertFileExists home-files/.config/broot/conf.hjson
assertFileContains home-files/.config/broot/conf.hjson '"modal": true'
'';
}