diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index 414848e1..b3c4db75 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -1096,7 +1096,6 @@ tasks." :nvmeg "d" 'org-timeblock-set-duration) ;;;------ magit configuration ------;;; - ;; Need the following two blocks to make magit work with git bare repos (defun ~/magit-process-environment (env) "Add GIT_DIR and GIT_WORK_TREE to ENV when in a special directory. @@ -1112,36 +1111,6 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." (advice-add 'magit-process-environment :filter-return #'~/magit-process-environment) -(evil-set-initial-state 'magit-status-mode 'motion) -(evil-set-initial-state 'magit-log-mode 'motion) -(evil-set-initial-state 'magit-diff-mode 'motion) -(evil-set-initial-state 'magit-refs-mode 'motion) -(evil-define-key 'motion magit-status-mode-map - "j" 'evil-next-visual-line - "k" 'evil-previous-visual-line - "c" 'magit-commit - "s" 'magit-stage - "u" 'magit-unstage - "l" 'magit-log - "F" 'magit-pull - "p" 'magit-push - "q" '+magit/quit - (kbd "") 'magit-diff-visit-file-worktree) -(evil-define-key 'motion magit-log-mode-map - "j" 'evil-next-visual-line - "k" 'evil-previous-visual-line - "q" '+magit/quit - (kbd "") 'magit-visit-ref) -(evil-define-key 'motion magit-diff-mode-map - "j" 'evil-next-visual-line - "k" 'evil-previous-visual-line - "q" '+magit/quit - (kbd "") 'magit-visit-ref) -(evil-define-key 'motion magit-refs-mode-map - "j" 'evil-next-visual-line - "k" 'evil-previous-visual-line - "q" '+magit/quit - (kbd "") 'magit-visit-ref) (require 'magit-todos) (magit-todos-mode 1) diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index cab7b941..b9afc810 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -1264,7 +1264,6 @@ On Wayland, EAF doesn't work. ** Magit Configuration #+BEGIN_SRC emacs-lisp :tangle config.el ;;;------ magit configuration ------;;; - ;; Need the following two blocks to make magit work with git bare repos (defun ~/magit-process-environment (env) "Add GIT_DIR and GIT_WORK_TREE to ENV when in a special directory. @@ -1280,36 +1279,6 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." (advice-add 'magit-process-environment :filter-return #'~/magit-process-environment) -(evil-set-initial-state 'magit-status-mode 'motion) -(evil-set-initial-state 'magit-log-mode 'motion) -(evil-set-initial-state 'magit-diff-mode 'motion) -(evil-set-initial-state 'magit-refs-mode 'motion) -(evil-define-key 'motion magit-status-mode-map - "j" 'evil-next-visual-line - "k" 'evil-previous-visual-line - "c" 'magit-commit - "s" 'magit-stage - "u" 'magit-unstage - "l" 'magit-log - "F" 'magit-pull - "p" 'magit-push - "q" '+magit/quit - (kbd "") 'magit-diff-visit-file-worktree) -(evil-define-key 'motion magit-log-mode-map - "j" 'evil-next-visual-line - "k" 'evil-previous-visual-line - "q" '+magit/quit - (kbd "") 'magit-visit-ref) -(evil-define-key 'motion magit-diff-mode-map - "j" 'evil-next-visual-line - "k" 'evil-previous-visual-line - "q" '+magit/quit - (kbd "") 'magit-visit-ref) -(evil-define-key 'motion magit-refs-mode-map - "j" 'evil-next-visual-line - "k" 'evil-previous-visual-line - "q" '+magit/quit - (kbd "") 'magit-visit-ref) (require 'magit-todos) (magit-todos-mode 1)