From ae2cc8c4747b393f158e2dfa4304505775895df2 Mon Sep 17 00:00:00 2001
From: Alan Pearce
Date: Fri, 16 Jun 2023 17:05:06 +0200
Subject: Emacs: install forked version of consult-ghq

---
 user/emacs/init.el      | 11 +++++++++--
 user/settings/emacs.nix | 23 +++++++++++++++++++++++
 2 files changed, 32 insertions(+), 2 deletions(-)

(limited to 'user')

diff --git a/user/emacs/init.el b/user/emacs/init.el
index f41c4942..8cb4b77c 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -899,14 +899,21 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 
 (use-package project
   :general (:keymaps 'project-prefix-map
-                     "s" #'project-search
-                     "o" #'consult-ghq-switch-project)
+                     "s" #'project-search)
   :config (progn
             (with-eval-after-load 'evil-ex
               (evil-ex-define-cmd "pesh[ell]" #'project-eshell)
               (evil-ex-define-cmd "pb" #'project-switch-to-buffer)
               (evil-ex-define-cmd "psw[itch]" #'project-switch-project))))
 
+(use-package consult-ghq
+  ;; :load-path "~/projects/github.com/tomoya/consult-ghq"
+  :general (:keymaps 'project-prefix-map
+                     "o" #'consult-ghq-switch-project)
+  :config (progn
+            (setq consult-ghq-grep-function #'consult-grep
+                  consult-ghq-find-function #'consult-find)))
+
 (use-package envrc
   :defer 2
   :config (progn
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index f03d108d..195bc0fe 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -45,6 +45,28 @@ in
     ../modules/eshell.nix
   ];
 
+  nixpkgs.overlays = [
+    (self: super: {
+      emacsPackagesFor = emacs:
+        (super.emacsPackagesFor emacs).overrideScope' (
+          eself: esuper:
+            (
+              {
+                consult-ghq = esuper.consult-ghq.overrideAttrs
+                  (oldAttrs: {
+                    src = pkgs.fetchFromGitHub {
+                      owner = "alanpearce";
+                      repo = "consult-ghq";
+                      rev = "3a0b366ef2e066c0d941a19d22d5a23d7f778535";
+                      sha256 = "0v7z61nx6xyhxbqkjangqrnay7pp74w4m90wfb29l99p1wkxqbzx";
+                    };
+                  });
+              }
+            )
+        );
+    })
+  ];
+
   programs.emacs = {
     enable = true;
     package = lib.mkDefault (pkgs.emacs.override { withGTK3 = true; });
@@ -90,6 +112,7 @@ in
         company-shell
         company-tabnine
         consult
+        consult-ghq # own override
         consult-eglot
         counsel
         crux
-- 
cgit 1.4.1