4 files changed, 19 insertions(+), 7 deletions(-)

M modules/editors/emacs/doom.d/config.el
M modules/editors/emacs/doom.d/init.el
M modules/editors/emacs/doom.d/packages.el
M modules/editors/emacs/home.nix

@@ 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)

@@ 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

@@ 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)

@@ 61,6 61,8 @@ in {
     fd
     ripgrep
 
+    delta
+
     ## Optional dependencies
     fd
     imagemagick