diff --git a/modules/programs/granted.nix b/modules/programs/granted.nix index 9128a917f..6a4cf928a 100644 --- a/modules/programs/granted.nix +++ b/modules/programs/granted.nix @@ -5,7 +5,6 @@ with lib; let cfg = config.programs.granted; - package = pkgs.granted; in { meta.maintainers = [ hm.maintainers.wcarlsen ]; @@ -13,6 +12,8 @@ in { options.programs.granted = { enable = mkEnableOption "granted"; + package = lib.mkPackageOption pkgs "granted" { }; + enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { inherit config; }; @@ -21,19 +22,19 @@ in { }; config = mkIf cfg.enable { - home.packages = [ package ]; + home.packages = [ cfg.package ]; programs.zsh.initContent = mkIf cfg.enableZshIntegration '' function assume() { export GRANTED_ALIAS_CONFIGURED="true" - source ${package}/bin/assume "$@" + source ${cfg.package}/bin/assume "$@" unset GRANTED_ALIAS_CONFIGURED } ''; programs.fish.functions.assume = mkIf cfg.enableFishIntegration '' set -x GRANTED_ALIAS_CONFIGURED "true" - source ${package}/share/assume.fish $argv + source ${cfg.package}/share/assume.fish $argv set -e GRANTED_ALIAS_CONFIGURED ''; };