From 56c93c8dc650ce12cb9414b89babcdb8aa72b0a9 Mon Sep 17 00:00:00 2001
From: Evie Litherland-Smith <evie.litherland-smith@ukaea.uk>
Date: Fri, 8 Dec 2023 15:15:21 +0000
Subject: [PATCH] Switch git-gutter for diff-hl

---
 home/emacs/default.nix |  3 +--
 home/emacs/init.el     | 13 +++----------
 home/emacs/init.org    | 15 ++++-----------
 3 files changed, 8 insertions(+), 23 deletions(-)

diff --git a/home/emacs/default.nix b/home/emacs/default.nix
index e8cccba4..40633d50 100644
--- a/home/emacs/default.nix
+++ b/home/emacs/default.nix
@@ -77,8 +77,7 @@
         which-key
         link-hint
         darkroom
-        nlinum
-        git-gutter
+        diff-hl
 
         # writing-packages
         markdown-mode
diff --git a/home/emacs/init.el b/home/emacs/init.el
index d9587a45..280b3dde 100644
--- a/home/emacs/init.el
+++ b/home/emacs/init.el
@@ -284,18 +284,11 @@
   :ensure t
   :config (zone-when-idle (* 60 60 2))) ; 2 hours
 
-;; git-gutter needs obsolete `global-linum-mode', `nlinum' provides
-;; this until updated
-(use-package nlinum
-  :ensure t)
-
-(use-package git-gutter
+(use-package diff-hl
   :ensure t
-  :after nlinum
-  :config (global-git-gutter-mode +1)
+  :config (global-diff-hl-mode)
   :custom
-  (git-gutter:visual-line t)
-  (git-gutter:update-interval 0.5))
+  (diff-hl-disable-on-remote t))
 
 (setq org-directory "~/Org"
       org-default-notes-file (expand-file-name "notes.org" org-directory)
diff --git a/home/emacs/init.org b/home/emacs/init.org
index e6852c42..fa747dee 100644
--- a/home/emacs/init.org
+++ b/home/emacs/init.org
@@ -343,20 +343,13 @@
     :config (zone-when-idle (* 60 60 2))) ; 2 hours
 #+end_src
 
-** Git-gutter
+** Git status in fringe
 #+begin_src emacs-lisp
-  ;; git-gutter needs obsolete `global-linum-mode', `nlinum' provides
-  ;; this until updated
-  (use-package nlinum
-    :ensure t)
-
-  (use-package git-gutter
+  (use-package diff-hl
     :ensure t
-    :after nlinum
-    :config (global-git-gutter-mode +1)
+    :config (global-diff-hl-mode)
     :custom
-    (git-gutter:visual-line t)
-    (git-gutter:update-interval 0.5))
+    (diff-hl-disable-on-remote t))
 #+end_src
 * Org-mode
 For reference information, see [[https://orgmode.com][Org-mode website]]