mirrors/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2024-12-14 11:57:55 +00:00
Code Activity

zellij: use full executable path

Browse source
This commit is contained in:
Alexis (Poliorcetics) Bourget 2024-02-07 08:45:44 +01:00 committed by Robert Helgesson
parent f99eace7c1
commit 5b9156fa9a
No known key found for this signature in database
GPG key ID: 96E745BD17AA17ED
2 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

7
modules/programs/zellij.nix
View file

@ -6,6 +6,7 @@ let
cfg = config.programs.zellij; cfg = config.programs.zellij;
yamlFormat = pkgs.formats.yaml { }; yamlFormat = pkgs.formats.yaml { };
zellijCmd = getExe cfg.package;
in { in {
meta.maintainers = [ hm.maintainers.mainrs ]; meta.maintainers = [ hm.maintainers.mainrs ];
@ -69,16 +70,16 @@ in {
}; };
programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 200 '' programs.bash.initExtra = mkIf cfg.enableBashIntegration (mkOrder 200 ''
eval "$(zellij setup --generate-auto-start bash)" eval "$(${zellijCmd} setup --generate-auto-start bash)"
''); '');
programs.zsh.initExtra = mkIf cfg.enableZshIntegration (mkOrder 200 '' programs.zsh.initExtra = mkIf cfg.enableZshIntegration (mkOrder 200 ''
eval "$(zellij setup --generate-auto-start zsh)" eval "$(${zellijCmd} setup --generate-auto-start zsh)"
''); '');
programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration programs.fish.interactiveShellInit = mkIf cfg.enableFishIntegration
(mkOrder 200 '' (mkOrder 200 ''
eval (zellij setup --generate-auto-start fish | string collect) eval (${zellijCmd} setup --generate-auto-start fish | string collect)
''); '');
}; };
} }

6
tests/modules/programs/zellij/enable-shells.nix
View file

@ -26,16 +26,16 @@
assertFileExists home-files/.bashrc assertFileExists home-files/.bashrc
assertFileContains \ assertFileContains \
home-files/.bashrc \ home-files/.bashrc \
'eval "$(zellij setup --generate-auto-start bash)"' 'eval "$(@zellij@/bin/dummy setup --generate-auto-start bash)"'
assertFileExists home-files/.zshrc assertFileExists home-files/.zshrc
assertFileContains \ assertFileContains \
home-files/.zshrc \ home-files/.zshrc \
'eval "$(zellij setup --generate-auto-start zsh)"' 'eval "$(@zellij@/bin/dummy setup --generate-auto-start zsh)"'
assertFileExists home-files/.config/fish/config.fish assertFileExists home-files/.config/fish/config.fish
assertFileContains \ assertFileContains \
home-files/.config/fish/config.fish \ home-files/.config/fish/config.fish \
'eval (zellij setup --generate-auto-start fish | string collect)' 'eval (@zellij@/bin/dummy setup --generate-auto-start fish | string collect)'
''; '';
} }