From 0ebba48c9322a7d0fb4926b65e4b00d2f3737ad2 Mon Sep 17 00:00:00 2001
From: Bozhidar Batsov <bozhidar@batsov.com>
Date: Tue, 24 Nov 2020 09:40:14 +0200
Subject: [PATCH] Clean up the modeline a bit

---
 CHANGELOG.md                   | 1 +
 core/prelude-editor.el         | 3 +++
 modules/prelude-company.el     | 2 ++
 modules/prelude-ivy.el         | 3 +++
 modules/prelude-programming.el | 3 ++-
 5 files changed, 11 insertions(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 56fda03..90547ac 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -22,6 +22,7 @@
 * Added `transient/` to `.gitignore`.
 * Fallback to `sample/prelude-modules.el` in the absence of a `prelude-modules.el` in one's personal folder.
 * [Ruby] Don't auto-insert coding comments.
+* Hide (via `diminish`) `editorconfig-mode`, `super-save`, `company`, `abbrev` and `ivy` in the modeline.
 
 ### Bugs fixed
 
diff --git a/core/prelude-editor.el b/core/prelude-editor.el
index 11d999b..999c021 100644
--- a/core/prelude-editor.el
+++ b/core/prelude-editor.el
@@ -146,6 +146,7 @@
 ;; add integration with ace-window
 (add-to-list 'super-save-triggers 'ace-window)
 (super-save-mode +1)
+(diminish 'super-save-mode)
 
 (defadvice set-buffer-major-mode (after set-major-mode activate compile)
   "Set buffer major mode according to `auto-mode-alist'."
@@ -307,6 +308,7 @@ indent yanked text (with prefix arg don't indent)."
 
 ;; abbrev config
 (add-hook 'text-mode-hook 'abbrev-mode)
+(diminish 'abbrev-mode)
 
 ;; make a shell script executable automatically on save
 (add-hook 'after-save-hook
@@ -415,6 +417,7 @@ and file 'filename' will be opened and cursor set on line 'linenumber'"
 ;; use settings from .editorconfig file when present
 (require 'editorconfig)
 (editorconfig-mode 1)
+(diminish 'editorconfig-mode)
 
 (provide 'prelude-editor)
 
diff --git a/modules/prelude-company.el b/modules/prelude-company.el
index f9f0972..5dc291f 100644
--- a/modules/prelude-company.el
+++ b/modules/prelude-company.el
@@ -32,6 +32,7 @@
 (prelude-require-packages '(company))
 
 (require 'company)
+(require 'diminish)
 
 (setq company-idle-delay 0.5)
 (setq company-show-numbers t)
@@ -43,6 +44,7 @@
 (setq company-tooltip-flip-when-above t)
 
 (global-company-mode 1)
+(diminish 'global-company-mode)
 
 (provide 'prelude-company)
 ;;; prelude-company.el ends here
diff --git a/modules/prelude-ivy.el b/modules/prelude-ivy.el
index a6eb19a..134fe95 100644
--- a/modules/prelude-ivy.el
+++ b/modules/prelude-ivy.el
@@ -38,6 +38,7 @@
 ;; ivy is a powerful alternative to the popular ido-mode
 
 (require 'ivy)
+(require 'diminish)
 
 (ivy-mode 1)
 (setq ivy-use-virtual-buffers t)
@@ -45,6 +46,8 @@
 (global-set-key (kbd "C-c C-r") 'ivy-resume)
 (global-set-key (kbd "<f6>") 'ivy-resume)
 
+(diminish 'ivy-mode)
+
 (setq projectile-completion-system 'ivy)
 
 ;;; Swiper
diff --git a/modules/prelude-programming.el b/modules/prelude-programming.el
index edfc0ef..9907478 100644
--- a/modules/prelude-programming.el
+++ b/modules/prelude-programming.el
@@ -65,7 +65,8 @@
              prelude-flyspell)
     (flyspell-prog-mode))
   (when prelude-guru
-    (guru-mode +1))
+    (guru-mode +1)
+    (diminish 'guru-mode))
   (smartparens-mode +1)
   (prelude-enable-whitespace)
   (prelude-local-comment-auto-fill))