emacs: use doom-modeline

This is much fancier than what I had before. Plus, I was able to get rid off all
the ugly `diminish` calls that never actually worked.

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

2 files changed, 38 insertions, 34 deletions

diff --git a/.emacs.d/custom.el b/.emacs.d/custom.el
index c339f2b..8d20166 100644
--- a/.emacs.d/custom.el
+++ b/.emacs.d/custom.el
@@ -6,16 +6,14 @@
  '(ansi-color-names-vector
    ["#1c1c1c" "#d78787" "#b9dc92" "#ffffaf" "#87afd7" "#875f87" "#dfafdf" "#d0d0d0"])
  '(custom-safe-themes
-   (quote
-    ("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)))
+   '("708596834a786b3ebb569d6d4771aff24ebbfc7152c52d1991f567441f7c87b2" "62fd5b6647652e31ffe3c4a00395cf550df955d38b19e2e8507eeca2cc1ffd41" "448eab4d4809d412e440174cdbc363511d6250ab3e6b561006422198aa0263b8" "712e9c04f8a0ba4a3411eb87c1fc918febf101459157eb41512c9e545eb5eb80" "5d2a5375a91c4cbc4e85e93f7d8d98fed255bc71c01513eeada00c83857d5020" "32a649d3661460e7a8f9d812e191bd9c48820eee148dbc2cde1bd0fa365bd7cc" "8ba7471490e4944281482fbaf5f49835087e8c0d774ed8228e7bb4e8dbd630bf" "82de05bf675a89b35ee408a8782a267ca55c5df7ae192c7b498af1c1a14ed3df" "3f9f46c0872143158b32076feb14836b3a8d85bd0ac553613a24d5c450165b20" "f97323e7475f749ff53326ba9dba57f46540bded2178e22ebc9bcb10ece3fecb" "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 (quote ("--all" "--verbose" "--signoff")))
- '(magit-log-arguments (quote ("--graph" "--color" "--decorate" "-n256")))
+ '(magit-commit-arguments '("--all" "--verbose" "--signoff"))
+ '(magit-log-arguments '("--graph" "--color" "--decorate" "-n256"))
  '(markdown-command "/usr/bin/markdown-calibre")
  '(package-selected-packages
-   (quote
-    (evil-collection highlight-numbers langtool clang-format+ keycast gif-screencast py-autopep8 elpy inf-ruby move-text git-timemachine debbugs async-await request emojify auctex diminish bats-mode bool-flip salt-mode flycheck-rust rust-playground rust-mode vue-mode coffee-mode json-reformat erc-hl-nicks emoji-cheat-sheet-plus helm-circe htmlize cmake-mode websocket markdown-mode go-mode magit evil-leader evil helm projectile org-eldoc evil-commentary yasnippet yaml-mode which-key web-mode wc-mode use-package terraform-mode smart-tabs-mode slim-mode scss-mode rainbow-delimiters php-mode org-evil olivetti mu4e-alert mmm-jinja2 markdown-preview-mode helm-projectile helm-ag go-eldoc go-add-tags flycheck evil-surround evil-org evil-numbers evil-magit evil-args dockerfile-mode disable-mouse default-text-scale crux cmake-font-lock ag))))
+   '(let-alist doom-modeline evil-collection highlight-numbers langtool clang-format+ keycast gif-screencast py-autopep8 elpy inf-ruby move-text git-timemachine debbugs async-await request emojify auctex diminish bats-mode bool-flip salt-mode flycheck-rust rust-playground rust-mode vue-mode coffee-mode json-reformat erc-hl-nicks emoji-cheat-sheet-plus helm-circe htmlize cmake-mode websocket markdown-mode go-mode magit evil-leader evil helm projectile org-eldoc evil-commentary yasnippet yaml-mode which-key web-mode wc-mode use-package terraform-mode smart-tabs-mode slim-mode scss-mode rainbow-delimiters php-mode org-evil olivetti mu4e-alert mmm-jinja2 markdown-preview-mode helm-projectile helm-ag go-eldoc go-add-tags flycheck evil-surround evil-org evil-numbers evil-magit evil-args dockerfile-mode disable-mouse default-text-scale crux cmake-font-lock ag)))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.
  ;; If you edit it by hand, you could mess it up, so be careful.
diff --git a/.emacs.d/init.org b/.emacs.d/init.org
index 489146d..640fd89 100644
--- a/.emacs.d/init.org
+++ b/.emacs.d/init.org
@@ -142,14 +142,6 @@ package-install, I decided on use-package because I feel more well-organized.
 (require 'use-package)
 #+END_SRC
 
-Some =use-package= calls require =diminish.el= to be available. So, let's
-require it here on the very top.
-
-#+BEGIN_SRC elisp
-(use-package diminish
-  :ensure t)
-#+END_SRC
-
 * General
 ** GUI
 
@@ -172,21 +164,22 @@ Disable the menu, scroll and tool bars. At the same time, enable line and column
 modes.
 
 #+BEGIN_SRC elisp
-  (menu-bar-mode -1)
-  (when (fboundp 'set-scroll-bar-mode)
-    (set-scroll-bar-mode nil))
-  (when (fboundp 'tool-bar-mode)
-    (tool-bar-mode -1))
-  (when (fboundp 'tooltip-mode)
-    (tooltip-mode 0))
+(menu-bar-mode -1)
+(when (fboundp 'set-scroll-bar-mode)
+  (set-scroll-bar-mode nil))
+(when (fboundp 'tool-bar-mode)
+  (tool-bar-mode -1))
+(when (fboundp 'tooltip-mode)
+  (tooltip-mode 0))
 
-  (line-number-mode 1)
-  (column-number-mode 1)
+(line-number-mode 1)
+(column-number-mode 1)
+(size-indication-mode 1)
 
-  ;; Nice scrolling
-  (setq scroll-margin 0
-        scroll-conservatively 100000
-        scroll-preserve-screen-position 1)
+;; Nice scrolling
+(setq scroll-margin 0
+      scroll-conservatively 100000
+      scroll-preserve-screen-position 1)
 #+END_SRC
 
 Relative line numbers support is builtin since GNU Emacs 26.1:
@@ -198,6 +191,25 @@ Relative line numbers support is builtin since GNU Emacs 26.1:
   (global-set-key (kbd "C-c L") 'display-line-numbers-mode))
 #+END_SRC
 
+Use the much fancier =doom-modeline= as our modeline:
+
+#+BEGIN_SRC elisp
+(use-package doom-modeline
+  :ensure t
+  :init
+  ;; We display project info in the modeline ourselves
+  (setq projectile-dynamic-mode-line nil)
+  ;; Set these early so they don't trigger variable watchers
+  (setq doom-modeline-height 20
+        doom-modeline-mu4e t
+        doom-modeline-persp-name nil
+        doom-modeline-major-mode-icon nil
+        doom-modeline-buffer-file-name-style 'relative-from-project)
+
+  ;; And finally enable it.
+  (doom-modeline-mode 1))
+#+END_SRC
+
 Do no resize the frame when a newly set font is different than the system's default. This is not affecting but it has some performance issues: around 0.3s when starting GNU Emacs in GUI mode, but negligible when in text mode.
 
 #+BEGIN_SRC elisp
@@ -612,10 +624,7 @@ recent versions of GNU Emacs.
 
   (setq undo-tree-visualizer-diff t
         undo-tree-visualizer-timestamps t
-        undo-tree-visualizer-relative-timestamps t)
-
-  (require 'diminish)
-  (diminish 'undo-tree-mode))
+        undo-tree-visualizer-relative-timestamps t))
 #+END_SRC
 
 A recurring issue in speeches and presentations is that when showing something
@@ -654,7 +663,6 @@ remember some of these snippets, I've mapped @@html:<kbd>, h</kbd>@@ to
 #+BEGIN_SRC elisp
 (use-package yasnippet
   :ensure t
-  :diminish yas-minor-mode
   :init (yas-global-mode)
   :config
   (yas-global-mode 1))
@@ -740,7 +748,6 @@ Basic =flycheck= configuration:
 
 (use-package flycheck
   :ensure t
-  :diminish
   :config
   (add-hook 'after-init-hook 'global-flycheck-mode)
 
@@ -864,7 +871,6 @@ commands for the current chord as a list.
 #+BEGIN_SRC elisp
 (use-package which-key
   :ensure t
-  :diminish which-key-mode
   :config
   (which-key-mode))
 #+END_SRC