diff options
| author | Alan Pearce | 2020-12-20 23:23:23 +0100 |
|---|---|---|
| committer | Alan Pearce | 2020-12-21 09:31:35 +0100 |
| commit | 280490105e3ce5faa8eb96704a2760866d67243f (patch) | |
| tree | b9b82acfa1194eb6aa60b8d89ce42af7e249af7d /user | |
| parent | 308f036b910b8c548ecd5c9a65dc8b12039a120e (diff) | |
| download | nixfiles-280490105e3ce5faa8eb96704a2760866d67243f.tar.lz nixfiles-280490105e3ce5faa8eb96704a2760866d67243f.tar.zst nixfiles-280490105e3ce5faa8eb96704a2760866d67243f.zip | |
Emacs: remove deprecated evil-magit package
Consumed by evil-collection
Diffstat (limited to 'user')
| -rw-r--r-- | user/emacs/init.el | 10 | ||||
| -rw-r--r-- | user/settings/emacs.nix | 1 |
2 files changed, 3 insertions, 8 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index 517670e2..4311419b 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -310,6 +310,9 @@ _p_rev _u_pper _=_: upper/lower _r_esolve :demand t :commands (evil-collection-init) :config (progn + (setq evil-collection-magit-use-y-for-yank nil) + (general-unbind 'normal magit-mode-map + "<escape>") (evil-collection-init))) (general-create-definer my-leader-def @@ -359,13 +362,6 @@ _p_rev _u_pper _=_: upper/lower _r_esolve :defer 2 :config (evil-commentary-mode +1)) -(use-package evil-magit - :after magit - :config (progn - (setq evil-magit-use-y-for-yank nil) - (general-unbind 'normal magit-mode-map - "<escape>"))) - (use-package evil-matchit :after evil :defer 2 diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index 4e150a54..017f8eee 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -108,7 +108,6 @@ in evil-commentary evil-embrace evil-ledger - evil-magit evil-matchit evil-mu4e evil-numbers |