From 8ad37dcf643b82eb1e8fa42b8158a138a53ac35e Mon Sep 17 00:00:00 2001 From: Farid Zakaria Date: Fri, 28 Mar 2025 11:45:57 -0700 Subject: [PATCH] granted: Add override for package I would like to use the unstable version in my home-manager so let's make it possible to override. --- modules/programs/granted.nix | 14 ++++++++++---- 1 file changed, 10 insertions(+), 4 deletions(-) diff --git a/modules/programs/granted.nix b/modules/programs/granted.nix index 9128a917f..e83b3f965 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,13 @@ in { options.programs.granted = { enable = mkEnableOption "granted"; + package = mkOption { + type = types.package; + default = pkgs.granted; + defaultText = literalExpression "pkgs.granted"; + description = "The granted package to install."; + }; + enableZshIntegration = lib.hm.shell.mkZshIntegrationOption { inherit config; }; @@ -21,19 +27,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 ''; };