From 33b4539bba58d347a4182c9a0ccccff6b236a729 Mon Sep 17 00:00:00 2001 From: Miquel Sabaté Solà Date: Wed, 10 Feb 2021 16:48:35 +0100 Subject: emacs: evil-magit has been deprecated MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: Miquel Sabaté Solà --- .emacs.d/init.org | 15 ++++----------- 1 file changed, 4 insertions(+), 11 deletions(-) (limited to '.emacs.d/init.org') diff --git a/.emacs.d/init.org b/.emacs.d/init.org index 3fb05c1..53943a5 100644 --- a/.emacs.d/init.org +++ b/.emacs.d/init.org @@ -1128,7 +1128,7 @@ Next is another Vim plugin that has been ported to Evil: =evil-commentary=. This (evil-commentary-mode t)) #+END_SRC -Add Vim-like keybindings to as many modes as possible. Note that this list is not exhaustive, since some of these modes are better off with specific packages (e.g. =evil-magit=), and in some cases my bindings feel more intuitive to me (e.g. =woman=): +Add Vim-like keybindings to as many modes as possible. Note that this list is not exhaustive, since some of these modes are better off with specific packages, and in some cases my bindings feel more intuitive to me (e.g. =woman=): #+BEGIN_SRC elisp (use-package evil-collection @@ -1140,6 +1140,7 @@ Add Vim-like keybindings to as many modes as possible. Note that this list is no (evil-collection-init 'calendar) (evil-collection-init 'dired) (evil-collection-init 'help) + (evil-collection-init 'magit) (evil-collection-init 'mu4e)) #+END_SRC @@ -1155,22 +1156,14 @@ Last but not least, =evil-numbers= brings a couple of bindings available on Vim * Git -[[https://magit.vc/][Magit]] is a git porcelain inside GNU Emacs. I've grown really fond of it, since it makes some git operations dead easier and faster to perform (e.g. rebasing). Moreover, some other commands are way prettier and more useful with Magit (e.g. the =log= command, staging, showing diffs, etc). So right now my situation is that I use Magit most of the time, and bare git when I want to do something fishy. Some notes on this setup: - -1. I set @@html:C-x g@@ as a binding for =magit-status= and @@html:C-c l@@ as a binding for =magit-log-buffer-file=. These are the most useful =magit= entries. -2. I install =evil-magit=, which could've been replaced by =evil-collection= but it really falls short. Thus, I keep this package. +[[https://magit.vc/][Magit]] is a git porcelain inside GNU Emacs. I've grown really fond of it, since it makes some git operations dead easier and faster to perform (e.g. rebasing). Moreover, some other commands are way prettier and more useful with Magit (e.g. the =log= command, staging, showing diffs, etc). So right now my situation is that I use Magit most of the time, and bare git when I want to do something fishy. #+BEGIN_SRC elisp (use-package magit :ensure t :config (global-set-key (kbd "C-x g") 'magit-status) - (global-set-key (kbd "C-c l") 'magit-log-buffer-file) - - (with-eval-after-load 'evil - (use-package evil-magit - :ensure t))) - + (global-set-key (kbd "C-c l") 'magit-log-buffer-file)) #+END_SRC =git-timemachine= is a package that goes hand-in-hand with Magit, and it provides a very easy way to go through the history of a file (while providing ways of jumping into Magit). You can enter it with @@html:C-x t m@@ (hopefully the mnemonic is self-evident). -- cgit v1.2.3