From 814171e5ea0a236364219adeda96e01bba4041cf Mon Sep 17 00:00:00 2001
From: Frantisek Bohacek <rutherther@proton.me>
Date: Sat, 24 Feb 2024 13:00:52 +0100
Subject: [PATCH] feat: doom emacs updates

---
 modules/editors/emacs/doom.d/config.el   |  5 +++++
 modules/editors/emacs/doom.d/init.el     | 12 ++++++------
 modules/editors/emacs/doom.d/packages.el |  7 ++++++-
 modules/editors/emacs/home.nix           |  2 ++
 4 files changed, 19 insertions(+), 7 deletions(-)

diff --git a/modules/editors/emacs/doom.d/config.el b/modules/editors/emacs/doom.d/config.el
index a520315..d4cb4f3 100644
--- a/modules/editors/emacs/doom.d/config.el
+++ b/modules/editors/emacs/doom.d/config.el
@@ -257,3 +257,8 @@
 ;; (add-hook 'prog-mode-hook #'topsy-mode)
 
 (setq company-idle-delay nil)
+
+(add-hook 'magit-mode-hook (lambda () (magit-delta-mode +1)))
+(add-hook 'xref-backend-functions #'dumb-jump-xref-activate)
+
+(setq avy-all-windows t)
diff --git a/modules/editors/emacs/doom.d/init.el b/modules/editors/emacs/doom.d/init.el
index 97b4e84..d3cd56b 100644
--- a/modules/editors/emacs/doom.d/init.el
+++ b/modules/editors/emacs/doom.d/init.el
@@ -24,8 +24,8 @@
        company           ; the ultimate code completion backend
        ;;helm              ; the *other* search engine for love and life
        ;;ido               ; the other *other* search engine...
-       ivy               ; a search engine for love and life
-       ;;vertico           ; the search engine of the future
+       ;;ivy               ; a search engine for love and life
+       vertico           ; the search engine of the future
 
        :ui
        deft              ; notational velocity for Emacs
@@ -70,14 +70,14 @@
        dired             ; making dired pretty [functional]
        electric          ; smarter, keyword-based electric-indent
        ;;ibuffer         ; interactive buffer management
-       undo              ; persistent, smarter undo for your inevitable mistakes
+       (undo +tree)              ; persistent, smarter undo for your inevitable mistakes
        vc                ; version-control and Emacs, sitting in a tree
 
        :term
-       ;;eshell            ; the elisp shell that works everywhere
-       ;;shell             ; simple shell REPL for Emacs
+       eshell            ; the elisp shell that works everywhere
+       shell             ; simple shell REPL for Emacs
        ;;term              ; basic terminal emulator for Emacs
-       vterm             ; the best terminal emulation in Emacs
+       ;;vterm             ; the best terminal emulation in Emacs
 
        :checkers
        syntax              ; tasing you for every semicolon you forget
diff --git a/modules/editors/emacs/doom.d/packages.el b/modules/editors/emacs/doom.d/packages.el
index 1b8b9ee..9248c40 100644
--- a/modules/editors/emacs/doom.d/packages.el
+++ b/modules/editors/emacs/doom.d/packages.el
@@ -50,7 +50,6 @@
 ;(unpin! t)
 
 (package! arm-mode :recipe (:host github :repo "charje/arm-mode"))
-;; (package! dumb-jump)
 (package! imenu-list)
 ;(package! combobulate)
 ;
@@ -66,3 +65,9 @@
 (package! ob-ipython)
 
 (package! matlab-mode)
+
+;; git
+(package! magit-delta)
+
+;; navigation
+(package! dumb-jump)
diff --git a/modules/editors/emacs/home.nix b/modules/editors/emacs/home.nix
index 1998194..7340d51 100644
--- a/modules/editors/emacs/home.nix
+++ b/modules/editors/emacs/home.nix
@@ -61,6 +61,8 @@ in {
     fd
     ripgrep
 
+    delta
+
     ## Optional dependencies
     fd
     imagemagick
-- 
2.48.1