diff options
| -rw-r--r-- | .emacs.d/custom.el | 2 | ||||
| -rw-r--r-- | .emacs.d/init.org | 15 |
2 files changed, 5 insertions, 12 deletions
diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el index 1fed58c..bb2abf6 100644 --- a/.emacs.d/custom.el +++ b/.emacs.d/custom.el @@ -6,7 +6,7 @@ '(ansi-color-names-vector ["#1c1c1c" "#d78787" "#b9dc92" "#ffffaf" "#87afd7" "#875f87" "#dfafdf" "#d0d0d0"]) '(custom-safe-themes - '("3afe64cb2dff7a6c9fc0051fb95025d3a0791cf009e77144e7c93ecf62c3b51f" "498a7ffd55baa7beea27a6183734ff70db6a1dc62efac5fd63229053e2fafd31" "243729c252151a3f6a546e81d935dd47cfe158921fcb1bfd57d1a3fe9d24c41a" "7635a41e4f99b45a2f11fe5014a304cde0e10ed46bb4350131690970bbdf8a5f" "6b2636879127bf6124ce541b1b2824800afc49c6ccd65439d6eb987dbf200c36" "ad65ed3a11b46cea7fafbbdbc468346f35780d92f900a04c21cdabbf7a67aa6d" "445406a1aa8a183aef171f5c658a4c095a372db9b2ec46b26ed9ce7d9e742498" "d49482920f57593d7ce10574184d9b86aa064aac2b50acea97a87f3be93b878b" "f71d8b3d3435a5db6619ce51628a59197342e1da05c410c4f54be18587e81bbd" "9a8588f99059f6db7f4dd659de92448e16d6ea20d074ae4ffa89da8189fa071e" "007e48f31b076aa98e794d94bad1c18056b055c5146f1de57726e0d8a5bac512" "00e32f665855322a94805a8c4053b572665804b2fca205ea2b096373b3a4e9fd" "5d5134b45a16314b23253cb7a7b5f96b95206ec2c22dafeed33c13c36b6504cb" "a04113b22218ecfc8d0734975b1919549bb30f28298807c9fcb780360a9baac9" "018b6d9e79dbb1125d31795ec5bedc5cc606b28677a81fe6b75a4238df1cdf83" "edc728e05e405ad1c7f191ac46b4dbd9a486bbf3681052037f09b7aa83770b9a" "93ef1583c4efd5833f1026ab38ac7981bd1a24a053c446a3b494c2cfea76286a" "d58be516c9c0f93124b841e275f529e72dc42b15a277e00b69743650f9e12650" "eef6c3689fa629971c44da73ae89754d83ba0acdbb028b8a8970c49055b6bd07" "15ce6de2b6b6ce08506d56645161b413d9f70850874b0c6b63a8dd7462e819dc" "9db8bc75dd89061088e9e88bbf50231a75ae8bd4a03a62213e97632f5464b6d9" "6c35c3f6131d6772a242d65ffa6db0858ea4d4bfdcfc7d254eb7034bfb776a9d" "fd4e3a01107cfe4a570ef20e745e993086e58cd8d6ddc517e519b8d65d0db949" "bf80f24a381f48b153203f34787fed256a9956fbc90c6a635a423af369a32bfd" "8cef808aa57c52949b7535cffe11aa4df6eef27270509cbdb31586ce5b5abeb2" "012f8f59588d156e47f365977ebdbf609aa87a2eba852eac6e63e7f52b85fc6b" "bd0e3cc9db0fd5492e45b8bd8b294b7307ab25488a60f9567aabd7075ed200e2" "708596834a786b3ebb569d6d4771aff24ebbfc7152c52d1991f567441f7c87b2" "f256e66e5a80cf0d189cde7a2e63ec2762ebb39112b493bacfe5a6f3cd656c09" "df3cf7c6cdcdf6b19194c5e1341f06b7a8e82faea04a730962cb1221d9fdf7a7" "2637747c64ee19317fb896fdef24eda37f9e9c472294c965f78bcae61a338714" "44c996124982462f61fa04eeccb9e3661fbe995489eacd3b0f289e37aed29c98" "613d432fab88d34f9a4451bdbe714a31749de6c5a4d9d0bf0929399ad50f1ac6" "03f4de3e9d5df2d34dc4085ea2fe4906edf6377bf02eef7eb3430b97155c1398" "c2ea64b5a0d8042da7ff3979fc03e5cc13fc1e4bc839c5ab464f69c2dada0804" "1c79d160e207fcd2193beaf95bf25d55e15f3237f6943cc04f516e7ef600bdd7" "6a32c414a3d1a493d534a28e7814a4d6055bc607bbf45d57196cd6ee9215461b" "da9b51d7ba5c03589a7cb74f0da136cf4c9b2fdc6c58e48d78f077c8ccca39a9" "6a068d53e7b2bf41ac4a3874ea296b78c3f90cd1fd44d1769812c4c578313539" "8ebd5ccdc11c1e53647c9efc153dbcf0b00a61a519825d2698ce065913cecd35" "7e69e41a60afea0bea1e5f7a89416466db331ec45cbafe47ebec694411c997b8" "3762f105d8ea307cec0ee7cc36dcbce1ab0009ca1ae448fd07e8e8e65647431f" "75080b8936556e23444bd76fcfc042e484a50a403ccb7f36fd190c21f7bf8941" "e2669e7d32201debd97395277167b6a1d93606b9445ebce01b9f878eb980e200" "92eb47cefb2f03abaaaa52c60a0b89845361577c2201d3399d19b944828505f4" "62c1fac02f61eaad07bf39fd461f5c78ee3424ba87a1f5fe91b1bea25475f327" "62f08bc59e1ac24e6df5b5b01fea2da24f2fec201b285ccda9991b7052a3a46a" "ce1c38b72f45eed22f3dfaf7f3f0df4b0b6ed975cc5d2012fb1aad13e8055840" "e8b0224a3bd5da096120bf19c976a29cfe67af41bfe73171348bfe99ee0da62d" "ad1c0d9498ad9344082d47e3a1bb6b75f0d004e0ae8361613b0c9963b23fbb4d" "8e6f5b61626315a98a6b38acfe966800777bf6a1841aa2b812b471772cc17114" "5869e98ef7446c9e2283e5788c0f6e2790676bdb52e9e1e112bb74e2415733c4" "5a3f33eefbcf2a3098bafd22d7ad44358e66c3e844797e7bf9ef552a08dfeb6f" default)) + '("6ab422f2ab8160a27091c0dbbcf1c459a7fb32e3e779d5d0543642d9d8b5337e" "73ea4ec83f888ff6d6837379c1181fd9c0e9270082601b21667a0766057af5d9" "3afe64cb2dff7a6c9fc0051fb95025d3a0791cf009e77144e7c93ecf62c3b51f" "498a7ffd55baa7beea27a6183734ff70db6a1dc62efac5fd63229053e2fafd31" "243729c252151a3f6a546e81d935dd47cfe158921fcb1bfd57d1a3fe9d24c41a" "7635a41e4f99b45a2f11fe5014a304cde0e10ed46bb4350131690970bbdf8a5f" "6b2636879127bf6124ce541b1b2824800afc49c6ccd65439d6eb987dbf200c36" "ad65ed3a11b46cea7fafbbdbc468346f35780d92f900a04c21cdabbf7a67aa6d" "445406a1aa8a183aef171f5c658a4c095a372db9b2ec46b26ed9ce7d9e742498" "d49482920f57593d7ce10574184d9b86aa064aac2b50acea97a87f3be93b878b" "f71d8b3d3435a5db6619ce51628a59197342e1da05c410c4f54be18587e81bbd" "9a8588f99059f6db7f4dd659de92448e16d6ea20d074ae4ffa89da8189fa071e" "007e48f31b076aa98e794d94bad1c18056b055c5146f1de57726e0d8a5bac512" "00e32f665855322a94805a8c4053b572665804b2fca205ea2b096373b3a4e9fd" "5d5134b45a16314b23253cb7a7b5f96b95206ec2c22dafeed33c13c36b6504cb" "a04113b22218ecfc8d0734975b1919549bb30f28298807c9fcb780360a9baac9" "018b6d9e79dbb1125d31795ec5bedc5cc606b28677a81fe6b75a4238df1cdf83" "edc728e05e405ad1c7f191ac46b4dbd9a486bbf3681052037f09b7aa83770b9a" "93ef1583c4efd5833f1026ab38ac7981bd1a24a053c446a3b494c2cfea76286a" "d58be516c9c0f93124b841e275f529e72dc42b15a277e00b69743650f9e12650" "eef6c3689fa629971c44da73ae89754d83ba0acdbb028b8a8970c49055b6bd07" "15ce6de2b6b6ce08506d56645161b413d9f70850874b0c6b63a8dd7462e819dc" "9db8bc75dd89061088e9e88bbf50231a75ae8bd4a03a62213e97632f5464b6d9" "6c35c3f6131d6772a242d65ffa6db0858ea4d4bfdcfc7d254eb7034bfb776a9d" "fd4e3a01107cfe4a570ef20e745e993086e58cd8d6ddc517e519b8d65d0db949" "bf80f24a381f48b153203f34787fed256a9956fbc90c6a635a423af369a32bfd" "8cef808aa57c52949b7535cffe11aa4df6eef27270509cbdb31586ce5b5abeb2" "012f8f59588d156e47f365977ebdbf609aa87a2eba852eac6e63e7f52b85fc6b" "bd0e3cc9db0fd5492e45b8bd8b294b7307ab25488a60f9567aabd7075ed200e2" "708596834a786b3ebb569d6d4771aff24ebbfc7152c52d1991f567441f7c87b2" "f256e66e5a80cf0d189cde7a2e63ec2762ebb39112b493bacfe5a6f3cd656c09" "df3cf7c6cdcdf6b19194c5e1341f06b7a8e82faea04a730962cb1221d9fdf7a7" "2637747c64ee19317fb896fdef24eda37f9e9c472294c965f78bcae61a338714" "44c996124982462f61fa04eeccb9e3661fbe995489eacd3b0f289e37aed29c98" "613d432fab88d34f9a4451bdbe714a31749de6c5a4d9d0bf0929399ad50f1ac6" "03f4de3e9d5df2d34dc4085ea2fe4906edf6377bf02eef7eb3430b97155c1398" "c2ea64b5a0d8042da7ff3979fc03e5cc13fc1e4bc839c5ab464f69c2dada0804" "1c79d160e207fcd2193beaf95bf25d55e15f3237f6943cc04f516e7ef600bdd7" "6a32c414a3d1a493d534a28e7814a4d6055bc607bbf45d57196cd6ee9215461b" "da9b51d7ba5c03589a7cb74f0da136cf4c9b2fdc6c58e48d78f077c8ccca39a9" "6a068d53e7b2bf41ac4a3874ea296b78c3f90cd1fd44d1769812c4c578313539" "8ebd5ccdc11c1e53647c9efc153dbcf0b00a61a519825d2698ce065913cecd35" "7e69e41a60afea0bea1e5f7a89416466db331ec45cbafe47ebec694411c997b8" "3762f105d8ea307cec0ee7cc36dcbce1ab0009ca1ae448fd07e8e8e65647431f" "75080b8936556e23444bd76fcfc042e484a50a403ccb7f36fd190c21f7bf8941" "e2669e7d32201debd97395277167b6a1d93606b9445ebce01b9f878eb980e200" "92eb47cefb2f03abaaaa52c60a0b89845361577c2201d3399d19b944828505f4" "62c1fac02f61eaad07bf39fd461f5c78ee3424ba87a1f5fe91b1bea25475f327" "62f08bc59e1ac24e6df5b5b01fea2da24f2fec201b285ccda9991b7052a3a46a" "ce1c38b72f45eed22f3dfaf7f3f0df4b0b6ed975cc5d2012fb1aad13e8055840" "e8b0224a3bd5da096120bf19c976a29cfe67af41bfe73171348bfe99ee0da62d" "ad1c0d9498ad9344082d47e3a1bb6b75f0d004e0ae8361613b0c9963b23fbb4d" "8e6f5b61626315a98a6b38acfe966800777bf6a1841aa2b812b471772cc17114" "5869e98ef7446c9e2283e5788c0f6e2790676bdb52e9e1e112bb74e2415733c4" "5a3f33eefbcf2a3098bafd22d7ad44358e66c3e844797e7bf9ef552a08dfeb6f" default)) '(delete-selection-mode nil) '(electric-indent-mode t) '(magit-commit-arguments '("--all" "--verbose" "--signoff")) 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:<kbd>C-x g</kbd>@@ as a binding for =magit-status= and @@html:<kbd>C-c l</kbd>@@ 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:<kbd>C-x t m</kbd>@@ (hopefully the mnemonic is self-evident). |