From 966d97c06a5f7577986c2cd89f7c380048b02928 Mon Sep 17 00:00:00 2001
From: s3igo <85787242+s3igo@users.noreply.github.com>
Date: Sun, 20 Apr 2025 13:10:20 +0900
Subject: [PATCH 1/2] ghq: make shell completion installation more idiomatic

---
 pkgs/by-name/gh/ghq/package.nix | 8 ++++++--
 1 file changed, 6 insertions(+), 2 deletions(-)

diff --git a/pkgs/by-name/gh/ghq/package.nix b/pkgs/by-name/gh/ghq/package.nix
index e644d316f253..9074e46370d3 100644
--- a/pkgs/by-name/gh/ghq/package.nix
+++ b/pkgs/by-name/gh/ghq/package.nix
@@ -2,6 +2,7 @@
   lib,
   buildGoModule,
   fetchFromGitHub,
+  installShellFiles,
   testers,
   nix-update-script,
   ghq,
@@ -26,9 +27,12 @@ buildGoModule rec {
     "-X=main.Version=${version}"
   ];
 
+  nativeBuildInputs = [ installShellFiles ];
+
   postInstall = ''
-    install -m 444 -D ${src}/misc/zsh/_ghq $out/share/zsh/site-functions/_ghq
-    install -m 444 -D ${src}/misc/bash/_ghq $out/share/bash-completion/completions/_ghq
+    installShellCompletion \
+      --bash $src/misc/bash/_ghq \
+      --zsh $src/misc/zsh/_ghq
   '';
 
   passthru = {

From 99c743986b5ff1f12850a9d8d8417cfb15ed39b0 Mon Sep 17 00:00:00 2001
From: s3igo <85787242+s3igo@users.noreply.github.com>
Date: Sun, 20 Apr 2025 13:35:05 +0900
Subject: [PATCH 2/2] ghq: add fish shell completion

---
 pkgs/by-name/gh/ghq/package.nix | 1 +
 1 file changed, 1 insertion(+)

diff --git a/pkgs/by-name/gh/ghq/package.nix b/pkgs/by-name/gh/ghq/package.nix
index 9074e46370d3..705cbfab18a5 100644
--- a/pkgs/by-name/gh/ghq/package.nix
+++ b/pkgs/by-name/gh/ghq/package.nix
@@ -32,6 +32,7 @@ buildGoModule rec {
   postInstall = ''
     installShellCompletion \
       --bash $src/misc/bash/_ghq \
+      --fish $src/misc/fish/ghq.fish \
       --zsh $src/misc/zsh/_ghq
   '';