From 1b9162d085c2df756033d1363498fcb04be20fad Mon Sep 17 00:00:00 2001
From: diniamo <diniamo53@gmail.com>
Date: Sun, 29 Jun 2025 09:18:16 +0200
Subject: [PATCH] nixos/fish: add `extraCompletionPackages` option

---
 nixos/modules/programs/fish.nix | 11 ++++++++++-
 1 file changed, 10 insertions(+), 1 deletion(-)

diff --git a/nixos/modules/programs/fish.nix b/nixos/modules/programs/fish.nix
index 93983970958e..1031a0bd8dc0 100644
--- a/nixos/modules/programs/fish.nix
+++ b/nixos/modules/programs/fish.nix
@@ -77,6 +77,15 @@ in
         example = false;
       };
 
+      extraCompletionPackages = lib.mkOption {
+        type = lib.types.listOf lib.types.package;
+        default = [ ];
+        example = lib.literalExpression "config.users.users.alice.packages";
+        description = ''
+          Additional packages to generate completions from, if {option}`programs.fish.generateCompletions` is enabled.
+        '';
+      };
+
       vendor.config.enable = lib.mkOption {
         type = lib.types.bool;
         default = true;
@@ -295,7 +304,7 @@ in
           pkgs.buildEnv {
             name = "system_fish-completions";
             ignoreCollisions = true;
-            paths = map generateCompletions config.environment.systemPackages;
+            paths = map generateCompletions (config.environment.systemPackages ++ cfg.extraCompletionPackages);
           };
       })