nix-community/home-manager
1
0
Fork 0
mirror of https://github.com/nix-community/home-manager.git synced 2025-11-08 19:46:05 +01:00
Code Activity

pls: enableAliases -> enableShellIntegration (#6932)

Browse source 
Allow granular control of alias creation utilizing our shell integration
options.
This commit is contained in:
Austin Horstman 2025-04-29 20:37:20 -05:00 • committed by GitHub
parent e9c80e277b
commit 9389f373be
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
4 changed files with 24 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

27
modules/programs/pls.nix
View file

@ -13,9 +13,20 @@ let
ls = "${cfg.package}/bin/pls"; ls = "${cfg.package}/bin/pls";
ll = "${cfg.package}/bin/pls -d perm -d user -d group -d size -d mtime -d git"; ll = "${cfg.package}/bin/pls -d perm -d user -d group -d size -d mtime -d git";
}; };
in in
{ {
imports =
let
msg = ''
'programs.pls.enableAliases' has been deprecated and replaced with integration
options per shell, for example, 'programs.pls.enableBashIntegration'.
Note, the default for these options is 'true' so if you want to enable the
aliases you can simply remove 'programs.pls.enableAliases' from your
configuration.'';
in
[ (lib.mkRemovedOptionModule [ "programs" "pls" "enableAliases" ] msg) ];
meta.maintainers = [ lib.maintainers.arjan-s ]; meta.maintainers = [ lib.maintainers.arjan-s ];
options.programs.pls = { options.programs.pls = {
@ -23,24 +34,28 @@ in
package = lib.mkPackageOption pkgs "pls" { }; package = lib.mkPackageOption pkgs "pls" { };
enableAliases = lib.mkEnableOption "recommended pls aliases"; enableBashIntegration = lib.hm.shell.mkBashIntegrationOption { inherit config; };
enableFishIntegration = lib.hm.shell.mkFishIntegrationOption { inherit config; };
enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { inherit config; };
}; };
config = mkIf cfg.enable { config = mkIf cfg.enable {
home.packages = [ cfg.package ]; home.packages = [ cfg.package ];
programs.bash.shellAliases = mkIf cfg.enableAliases aliases; programs.bash.shellAliases = mkIf cfg.enableBashIntegration aliases;
programs.fish = lib.mkMerge [ programs.fish = lib.mkMerge [
(mkIf (!config.programs.fish.preferAbbrs) { (mkIf (!config.programs.fish.preferAbbrs) {
shellAliases = mkIf cfg.enableAliases aliases; shellAliases = mkIf cfg.enableFishIntegration aliases;
}) })
(mkIf config.programs.fish.preferAbbrs { (mkIf config.programs.fish.preferAbbrs {
shellAbbrs = mkIf cfg.enableAliases aliases; shellAbbrs = mkIf cfg.enableFishIntegration aliases;
}) })
]; ];
programs.zsh.shellAliases = mkIf cfg.enableAliases aliases; programs.zsh.shellAliases = mkIf cfg.enableZshIntegration aliases;
}; };
} }

2
tests/modules/programs/pls/bash.nix
View file

@ -4,7 +4,7 @@
pls = { pls = {
enable = true; enable = true;
enableAliases = true; enableBashIntegration = true;
}; };
}; };

2
tests/modules/programs/pls/fish.nix
View file

@ -6,7 +6,7 @@
pls = { pls = {
enable = true; enable = true;
enableAliases = true; enableFishIntegration = true;
package = config.lib.test.mkStubPackage { outPath = "@pls@"; }; package = config.lib.test.mkStubPackage { outPath = "@pls@"; };
}; };
}; };

2
tests/modules/programs/pls/zsh.nix
View file

@ -6,7 +6,7 @@
pls = { pls = {
enable = true; enable = true;
enableAliases = true; enableZshIntegration = true;
package = config.lib.test.mkStubPackage { outPath = "@pls@"; }; package = config.lib.test.mkStubPackage { outPath = "@pls@"; };
}; };
}; };