Emacs: replace diminish with minions

1 files changed, 5 insertions, 26 deletions

diff --git a/emacs/.emacs.d/main.el b/emacs/.emacs.d/main.el
index bdbe66a2..2386dfe3 100644
--- a/emacs/.emacs.d/main.el
+++ b/emacs/.emacs.d/main.el
@@ -68,7 +68,6 @@
                            ("melpa" . "https://melpa.org/packages/")))
   (unless nix-emacs
     (setq package-pinned-packages '(("use-package" . melpa-stable)
-                                    ("diminish" . melpa-stable)
                                     ("bind-key" . melpa-stable))
           package-archive-priorities '(("melpa" . 10)
                                        ("gnu" . 10)
@@ -83,7 +82,6 @@
       (package-install 'use-package))))
 (eval-when-compile (require 'use-package))
 (unless (featurep 'use-package)
-  (require 'diminish)
   (require 'bind-key)
   (use-package use-package
     :commands (use-package-autoload-keymap)
@@ -145,8 +143,7 @@
 ;; Highlighting quasi-quoted expressions in lisps is quite useful, but I
 ;; don't need it all the time.  I'll keep it around for a while so that I
 ;; can enable it if needed.
-(use-package highlight-stages
-  :diminish highlight-stages-mode)
+(use-package highlight-stages)
 
 (global-hl-line-mode +1)
 
@@ -220,7 +217,6 @@
 
 (use-package page-break-lines
   :defer 5
-  :diminish page-break-lines-mode
   :config (progn
             (global-page-break-lines-mode)
             (unless (eq (char-displayable-p ?─) (char-displayable-p ?a))
@@ -246,7 +242,9 @@
         window-divider-default-places t)
   (window-divider-mode +1))
 
-;;;;; Renaming major modes
+(use-package minions
+  :config (progn
+            (minions-mode +1)))
 
 
 ;;;; Environment Variables
@@ -404,7 +402,6 @@
          ("C-x g" . projectile-vc)
          ("C-M-g" . projectile-vc))
   :demand t
-  :diminish projectile-mode
   :config (progn
             (projectile-global-mode +1)
             (add-to-list 'projectile-globally-ignored-directories ".stversions")
@@ -542,7 +539,6 @@
 (eval-when-compile (require 'fringe-helper))
 (use-package git-gutter-fringe
   :defer 2
-  :diminish git-gutter-mode
   :config (progn
             (global-git-gutter-mode 1)
             ;; places the git gutter outside the margins.
@@ -631,7 +627,6 @@
 ;;;;; autorevert
 
 (use-package autorevert
-  :diminish auto-revert-mode
   :init (progn
           (global-auto-revert-mode 1)
           (setq auto-revert-verbose t
@@ -755,7 +750,6 @@
 ;;;;; editorconfig
 
 (use-package editorconfig
-  :diminish editorconfig-mode
   :init (progn
           (unless (executable-find "editorconfig")
             (warn "Missing `editorconfig' executable.")))
@@ -933,7 +927,6 @@
 ;; seems to work perfectly well for me.
 
 (use-package company
-  :diminish " C"
   :bind* (("C-<tab>" . company-complete))
   :bind  (("TAB" . company-complete))
   :init (progn
@@ -1103,7 +1096,6 @@ With two prefix arguments, write out the day and month name."
 ;; Popup keybindings following a prefix automatically.
 
 (use-package which-key
-  :diminish which-key-mode
   :config (progn
             (which-key-mode 1)
             (which-key-setup-side-window-right-bottom)))
@@ -1115,7 +1107,6 @@ With two prefix arguments, write out the day and month name."
 
 (use-package eldoc
   :commands (eldoc-mode global-eldoc-mode)
-  :diminish eldoc-mode
   :config (progn
             (setq eldoc-idle-delay 0.1)
             (global-eldoc-mode +1)
@@ -1232,7 +1223,6 @@ With two prefix arguments, write out the day and month name."
   :bind (("C-s" . swiper)
          ("C-r" . swiper)
          ("C-=" . swiper))
-  :diminish ivy-mode
   :demand t
   :config (progn
             (ivy-mode 1)
@@ -1490,7 +1480,6 @@ With two prefix arguments, write out the day and month name."
 ;; On-the-fly error checking in programming modes?  Yes please.
 
 (use-package flycheck
-  :diminish " ✓"
   :defer 5
   :config (progn
             (global-flycheck-mode)
@@ -1598,7 +1587,6 @@ With two prefix arguments, write out the day and month name."
 ;; operations that aren’t part of paredit, like extracting variables into
 ;; let bindings.
 (use-package redshank
-  :diminish redshank-mode
   :after (paredit)
   :config (progn
             (add-hook 'lisp-mode-common-hook #'turn-on-redshank-mode)))
@@ -1609,7 +1597,6 @@ With two prefix arguments, write out the day and month name."
 
 (use-package elisp-slime-nav
   :commands elisp-slime-nav-mode
-  :diminish elisp-slime-nav-mode
   :init (progn
           (add-hook 'emacs-lisp-mode-hook #'elisp-slime-nav-mode)))
 
@@ -1772,7 +1759,6 @@ With two prefix arguments, write out the day and month name."
 
 (use-package js2-refactor
   :after js2-mode
-  :diminish js2-refactor-mode
   :config (progn
             (bind-key "C-k" #'js2r-kill js2-mode-map)
             (add-hook 'js2-mode-hook #'js2-refactor-mode)
@@ -1827,7 +1813,6 @@ With two prefix arguments, write out the day and month name."
 ;; ~M-x indium-connect-to-nodejs RET 127.0.0.1 RET PORT RET~
 
 (use-package indium
-  :diminish (indium-interaction-mode . "In")
   :config (progn
             (add-hook 'js2-mode-hook #'indium-interaction-mode)))
 
@@ -1845,7 +1830,6 @@ With two prefix arguments, write out the day and month name."
 ;; completions, besides other IDE-like things.
 
 (use-package tern
-  :diminish tern-mode
   :if (executable-find "tern")
   :defer 5
   :config (progn
@@ -1897,7 +1881,6 @@ With two prefix arguments, write out the day and month name."
 ;; frameworks that require multiple nested elements to do anything useful.
 (use-package emmet-mode
   :commands (emmet-mode)
-  :diminish (emmet-mode . " >")
   :init (progn
           (setq emmet-indentation 2
                 emmet-self-closing-tag-style " /")
@@ -1981,7 +1964,6 @@ With two prefix arguments, write out the day and month name."
                                                  ispell-really-hunspell t)))))
 
 (use-package flyspell
-  :diminish " ﹏"
   :config (progn
             (defun flyspell-detect-ispell-args (&optional run-together)
               "If RUN-TOGETHER is true, spell check the CamelCase words.
@@ -2195,7 +2177,6 @@ Pass ARG to `comint-delchar-or-maybe-eof'."
 ;; movement commands are much more interesting.
 
 (use-package paredit
-  :diminish "()"
   :config (progn
             (add-hook 'lisp-mode-common-hook #'enable-paredit-mode)
             (put #'paredit-forward-delete 'delete-selection 'supersede)
@@ -2220,8 +2201,7 @@ Pass ARG to `comint-delchar-or-maybe-eof'."
                     (set-mark m)
                     (set-marker p nil)
                     (set-marker m nil))
-                ad-do-it)))
-  :diminish undo-tree-mode)
+                ad-do-it))))
 
 ;;;;; replace
 
@@ -2338,7 +2318,6 @@ Pass ARG to `comint-delchar-or-maybe-eof'."
 
 (use-package evil-space
   :if evil-mode
-  :diminish (evil-space-mode)
   :config (progn
             (evil-space-mode +1)))