diff --git a/modules/programs/pls.nix b/modules/programs/pls.nix index de9f6e869..446dc3bf4 100644 --- a/modules/programs/pls.nix +++ b/modules/programs/pls.nix @@ -13,9 +13,20 @@ let ls = "${cfg.package}/bin/pls"; ll = "${cfg.package}/bin/pls -d perm -d user -d group -d size -d mtime -d git"; }; - 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 ]; options.programs.pls = { @@ -23,24 +34,28 @@ in 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 { home.packages = [ cfg.package ]; - programs.bash.shellAliases = mkIf cfg.enableAliases aliases; + programs.bash.shellAliases = mkIf cfg.enableBashIntegration aliases; programs.fish = lib.mkMerge [ (mkIf (!config.programs.fish.preferAbbrs) { - shellAliases = mkIf cfg.enableAliases aliases; + shellAliases = mkIf cfg.enableFishIntegration aliases; }) (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; }; } diff --git a/tests/modules/programs/pls/bash.nix b/tests/modules/programs/pls/bash.nix index 2d3177a40..c2408b1f1 100644 --- a/tests/modules/programs/pls/bash.nix +++ b/tests/modules/programs/pls/bash.nix @@ -4,7 +4,7 @@ pls = { enable = true; - enableAliases = true; + enableBashIntegration = true; }; }; diff --git a/tests/modules/programs/pls/fish.nix b/tests/modules/programs/pls/fish.nix index dc49ef283..9a11772c8 100644 --- a/tests/modules/programs/pls/fish.nix +++ b/tests/modules/programs/pls/fish.nix @@ -6,7 +6,7 @@ pls = { enable = true; - enableAliases = true; + enableFishIntegration = true; package = config.lib.test.mkStubPackage { outPath = "@pls@"; }; }; }; diff --git a/tests/modules/programs/pls/zsh.nix b/tests/modules/programs/pls/zsh.nix index 40e5f1878..6fcb3007c 100644 --- a/tests/modules/programs/pls/zsh.nix +++ b/tests/modules/programs/pls/zsh.nix @@ -6,7 +6,7 @@ pls = { enable = true; - enableAliases = true; + enableZshIntegration = true; package = config.lib.test.mkStubPackage { outPath = "@pls@"; }; }; };