emacs: added git-modes for git files

I've also added various minor changes here and there.

Signed-off-by: Miquel Sabaté Solà <msabate@suse.com>

1 files changed, 22 insertions, 9 deletions

diff --git a/.emacs.d/init.org b/.emacs.d/init.org
index 03859e6..ddab794 100644
--- a/.emacs.d/init.org
+++ b/.emacs.d/init.org
@@ -69,7 +69,7 @@ From now on our code will be tangled, meaning that it will go into the final =in
 ;; This file has been autogenerated by `org-mode', by tangling what I had in my
 ;; init.org.
 ;;
-;; NOTE DO NOT MODIFY THIS FILE.  All changes should go into init.org.
+;; NOTE: DO NOT MODIFY THIS FILE.  All changes should go into init.org.
 
 ;;; Code:
 #+END_SRC
@@ -107,13 +107,13 @@ I'm using GNU Emacs 27, but everything should be working since GNU Emacs 24. The
 
 #+BEGIN_SRC elisp
 (defconst EMACS-25-OR-LATER (>= emacs-major-version 25)
-  "Whether we are using GNU Emacs 25.x")
+  "Whether we are using GNU Emacs 25.x or later")
 
 (defconst EMACS-26-OR-LATER (>= emacs-major-version 26)
-  "Whether we are using GNU Emacs 26.x")
+  "Whether we are using GNU Emacs 26.x or later")
 
 (defconst EMACS-27-OR-LATER (>= emacs-major-version 27)
-  "Whether we are using GNU Emacs 27.x")
+  "Whether we are using GNU Emacs 27.x or later")
 
 (let ((minver "25.3")
       (recver "26.1"))
@@ -200,10 +200,10 @@ These are the two main weird things you will see from an otherwise pretty standa
     (setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3"))
 
   (setq package-archives
-        '(("gnu" . "https://elpa.gnu.org/packages/")
+        '(("gnu"          . "https://elpa.gnu.org/packages/")
           ("MELPA Stable" . "https://stable.melpa.org/packages/")
           ("MELPA"        . "https://melpa.org/packages/")
-          ("org" .  "https://orgmode.org/elpa/"))
+          ("org"          .  "https://orgmode.org/elpa/"))
         package-archive-priorities
         '(("MELPA Stable" . 15)
           ("org"          . 10)
@@ -226,7 +226,7 @@ After that has been done we could go around calling =(package-install 'package)=
 * General
 ** GUI
 
-Over the years I've come to appreciate more and more minimalistic GUIs. That is, I don't want too many things distracting me from I care the most: text. As you will see, I disable basically every possible GUI element out there. For starters, let's disable the menu, scroll and tool bars.
+Over the years I've come to appreciate more and more minimalistic GUIs. That is, I don't want too many things distracting me from what I care the most: text. As you will see, I disable basically every possible GUI element out there. For starters, let's disable the menu, scroll and tool bars.
 
 #+BEGIN_SRC elisp
 (menu-bar-mode -1)
@@ -1147,7 +1147,7 @@ Last but not least, =evil-numbers= brings a couple of bindings available on Vim
 [[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 and insist on my bindings around moving through windows.
+2. I install =evil-magit=, which could've been replaced by =evil-collection= but it really falls short. Thus, I keep this package.
 
 #+BEGIN_SRC elisp
 (use-package magit
@@ -1170,9 +1170,22 @@ Last but not least, =evil-numbers= brings a couple of bindings available on Vim
   :bind (("C-x t m" . git-timemachine-toggle)))
 #+END_SRC
 
+[[https://github.com/magit/git-modes][git-modes]] provides minor modes for various git files, which are listed below:
+
+#+BEGIN_SRC elisp
+(use-package gitattributes-mode
+  :ensure t)
+
+(use-package gitconfig-mode
+  :ensure t)
+
+(use-package gitignore-mode
+  :ensure t)
+#+END_SRC
+
 * Email
 
-I use [[http://www.djcbsoftware.nl/code/mu/][mu]] and [[http://www.djcbsoftware.nl/code/mu/mu4e.html][mu4e]] to manage my email. =mu= is the indexer itself, and =mu4e= is the interface for GNU Emacs. The configuration for this has been taken mainly from the documentation, plus some cool remarks on Reddit. This configuration makes quite some assumptions. Read the =emacs/README.org= file as provided in my [[https://github.com/mssola/dotfiles][dotfiles]] project to get more details.
+I use [[http://www.djcbsoftware.nl/code/mu/][mu]] and [[http://www.djcbsoftware.nl/code/mu/mu4e.html][mu4e]] to manage my email. =mu= is the indexer itself, and =mu4e= is the interface for GNU Emacs. The configuration for this has been taken mainly from the documentation, plus some cool remarks on Reddit.
 
 I'm using [[https://build.opensuse.org/package/show/server:mail/maildir-utils][this package from OBS]] to install =mu= and =mu4e=, which installs things globally. Moreover, because of this, I expect =mu= to be on its latest and shiniest release always.