summary refs log tree commit diff stats
path: root/user
diff options
context:
space:
mode:
authorAlan Pearce2023-04-30 19:38:30 +0200
committerAlan Pearce2023-04-30 19:38:30 +0200
commit14c7fd647930130f70b712617822ca5c5f49f663 (patch)
tree8ff389b9ac9f13b65ae643a6ec70d870c2e18e57 /user
parentf6787504038ea5a69c4c2ed0cd73dfcc1a4558e4 (diff)
downloadnixfiles-14c7fd647930130f70b712617822ca5c5f49f663.tar.lz
nixfiles-14c7fd647930130f70b712617822ca5c5f49f663.tar.zst
nixfiles-14c7fd647930130f70b712617822ca5c5f49f663.zip
emacs: use native undo-redo instead of undo-tree package
Diffstat (limited to 'user')
-rw-r--r--user/emacs/init.el11
-rw-r--r--user/settings/emacs.nix1
2 files changed, 2 insertions, 10 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el
index 480c411b..a060b352 100644
--- a/user/emacs/init.el
+++ b/user/emacs/init.el
@@ -360,9 +360,8 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
   :commands (evil-mode evil-delete-buffer evil-ex-define-cmd)
   :config (progn
             (setq-default evil-shift-width 2)
-            (setq evil-mode-line-format nil
-                  evil-undo-system 'undo-tree)
-            (evil-set-undo-system 'undo-tree)
+            (setq evil-mode-line-format nil)
+            (evil-set-undo-system 'undo-redo)
             (add-to-list 'evil-emacs-state-modes 'eshell-mode)
             (add-to-list 'evil-emacs-state-modes 'ledger-reconcile-mode)
             (evil-mode +1))
@@ -695,12 +694,6 @@ _p_rev       _u_pper              _=_: upper/lower       _r_esolve
 (use-package ws-butler
   :ghook ('prog-mode-hook))
 
-(use-package undo-tree
-  :defer 1
-  :config (progn
-            (setq undo-tree-auto-save-history nil)
-            (global-undo-tree-mode)))
-
 (use-package rainbow-mode
   :ghook ('(css-mode-hook
             conf-xdefaults-mode-hook)
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index e50b5e15..bb73385b 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -152,7 +152,6 @@ in
         tree-sitter
         tree-sitter-langs
         tree-sitter-indent
-        undo-tree
         use-package
         vertico
         vertico-prescient