mirrors/home-manager
mirrors/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-03-31 04:04:32 +00:00
Code Activity

Merge 38f36e7c3e into 09280e17bb

Browse source
This commit is contained in:
Robin Stumm 2025-03-30 19:29:19 +02:00 • committed by GitHub
commit 396694ff38
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
2 changed files with 17 additions and 22 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

33
modules/programs/broot.nix
View file

@ -6,10 +6,10 @@ let
cfg = config.programs.broot; cfg = config.programs.broot;
tomlFormat = pkgs.formats.toml { }; jsonFormat = pkgs.formats.json { };
settingsModule = { settingsModule = {
freeformType = tomlFormat.type; freeformType = jsonFormat.type;
options = { options = {
modal = mkEnableOption "modal (vim) mode"; modal = mkEnableOption "modal (vim) mode";
@ -183,7 +183,7 @@ in {
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
xdg.configFile."broot" = { xdg.configFile.broot = {
recursive = true; recursive = true;
source = pkgs.symlinkJoin { source = pkgs.symlinkJoin {
name = "xdg.configFile.broot"; name = "xdg.configFile.broot";
@ -194,31 +194,26 @@ in {
# Dummy file to prevent broot from trying to reinstall itself # Dummy file to prevent broot from trying to reinstall itself
(pkgs.writeTextDir "launcher/installed-v1" "") (pkgs.writeTextDir "launcher/installed-v1" "")
]; ];
postBuild = '' 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 rm $out/conf.hjson
${lib.getExe pkgs.jq} --slurp add > $out/conf.hjson \
<(${
lib.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 programs = {
(pkgs.runCommand "default-conf.json" { bash.initExtra = mkIf cfg.enableBashIntegration (shellInit "bash");
nativeBuildInputs = [ pkgs.hjson-go ];
}
"hjson-cli -c ${cfg.package.src}/resources/default-conf/conf.hjson > $out"));
programs.bash.initExtra = mkIf cfg.enableBashIntegration (shellInit "bash"); zsh.initContent = mkIf cfg.enableZshIntegration (shellInit "zsh");
programs.zsh.initContent = mkIf cfg.enableZshIntegration (shellInit "zsh"); fish.shellInit = mkIf cfg.enableFishIntegration (shellInit "fish");
programs.fish.shellInit = mkIf cfg.enableFishIntegration (shellInit "fish"); nushell.extraConfig =
programs.nushell.extraConfig =
mkIf cfg.enableNushellIntegration (shellInit "nushell"); mkIf cfg.enableNushellIntegration (shellInit "nushell");
}; };
};
} }

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

@ -9,7 +9,7 @@
nixpkgs.overlays = [ (self: super: { inherit (realPkgs) broot hjson-go; }) ]; nixpkgs.overlays = [ (self: super: { inherit (realPkgs) broot hjson-go; }) ];
nmt.script = '' nmt.script = ''
assertFileExists home-files/.config/broot/conf.toml assertFileExists home-files/.config/broot/conf.hjson
assertFileContains home-files/.config/broot/conf.toml 'modal = true' assertFileContains home-files/.config/broot/conf.hjson '"modal": true'
''; '';
} }