Fresh Start!

1 files changed, 36 insertions, 283 deletions

diff --git a/config/modeline.el b/config/modeline.el
index d568072..f5f520f 100644
--- a/config/modeline.el
+++ b/config/modeline.el
@@ -17,293 +17,46 @@
 ;; Adjust icon scale to prevent cutoff
 (setq nerd-icons-scale-factor 1.0))
 
-(use-package doom-modeline
-  :ensure t
-  :init (doom-modeline-mode 1))
-
-;; If non-nil, cause imenu to see `doom-modeline' declarations.
-;; This is done by adjusting `lisp-imenu-generic-expression' to
-;; include support for finding `doom-modeline-def-*' forms.
-;; Must be set before loading doom-modeline.
+;; Must be set before loading doom-modeline
 (setq doom-modeline-support-imenu t)
 
-;; How tall the mode-line should be. It's only respected in GUI.
-;; If the actual char height is larger, it respects the actual height.
-(setq doom-modeline-height 20)
-
-;; How wide the mode-line bar should be. It's only respected in GUI.
-(setq doom-modeline-bar-width 4)
-
-;; Whether to use hud instead of default bar. It's only respected in GUI.
-(setq doom-modeline-hud nil)
-
-;; The limit of the window width.
-;; If `window-width' is smaller than the limit, some information won't be
-;; displayed. It can be an integer or a float number. `nil' means no limit."
-(setq doom-modeline-window-width-limit 85)
-
-;; Override attributes of the face used for padding.
-;; If the space character is very thin in the modeline, for example if a
-;; variable pitch font is used there, then segments may appear unusually close.
-;; To use the space character from the `fixed-pitch' font family instead, set
-;; this variable to `(list :family (face-attribute 'fixed-pitch :family))'.
-;; (setq doom-modeline-spc-face-overrides nil)
-;; (setq doom-modeline-spc-face-overrides nil)
-(setq doom-modeline-spc-face-overrides
-	  (list :family (face-attribute 'fixed-pitch :family)))
-
-;; How to detect the project root.
-;; nil means to use `default-directory'.
-;; The project management packages have some issues on detecting project root.
-;; e.g. `projectile' doesn't handle symlink folders well, while `project' is unable
-;; to hanle sub-projects.
-;; You can specify one if you encounter the issue.
-(setq doom-modeline-project-detection 'auto)
-
-;; Determines the style used by `doom-modeline-buffer-file-name'.
-;;
-;; Given ~/Projects/FOSS/emacs/lisp/comint.el
-;;	 auto => emacs/l/comint.el (in a project) or comint.el
-;;	 truncate-upto-project => ~/P/F/emacs/lisp/comint.el
-;;	 truncate-from-project => ~/Projects/FOSS/emacs/l/comint.el
-;;	 truncate-with-project => emacs/l/comint.el
-;;	 truncate-except-project => ~/P/F/emacs/l/comint.el
-;;	 truncate-upto-root => ~/P/F/e/lisp/comint.el
-;;	 truncate-all => ~/P/F/e/l/comint.el
-;;	 truncate-nil => ~/Projects/FOSS/emacs/lisp/comint.el
-;;	 relative-from-project => emacs/lisp/comint.el
-;;	 relative-to-project => lisp/comint.el
-;;	 file-name => comint.el
-;;	 file-name-with-project => FOSS|comint.el
-;;	 buffer-name => comint.el<2> (uniquify buffer name)
-;;
-;; If you are experiencing the laggy issue, especially while editing remote files
-;; with tramp, please try `file-name' style.
-;; Please refer to https://github.com/bbatsov/projectile/issues/657.
-(setq doom-modeline-buffer-file-name-style 'auto)
-
-;; Whether display icons in the mode-line.
-;; While using the server mode in GUI, should set the value explicitly.
-(setq doom-modeline-icon t)
-
-;; Whether display the icon for `major-mode'. It respects option `doom-modeline-icon'.
-(setq doom-modeline-major-mode-icon t)
-
-;; Whether display the colorful icon for `major-mode'.
-;; It respects `nerd-icons-color-icons'.
-(setq doom-modeline-major-mode-color-icon t)
-
-;; Whether display the icon for the buffer state. It respects option `doom-modeline-icon'.
-(setq doom-modeline-buffer-state-icon t)
-
-;; Whether display the modification icon for the buffer.
-;; It respects option `doom-modeline-icon' and option `doom-modeline-buffer-state-icon'.
-(setq doom-modeline-buffer-modification-icon t)
-
-;; Whether display the lsp icon. It respects option `doom-modeline-icon'.
-(setq doom-modeline-lsp-icon t)
-
-;; Whether display the time icon. It respects option `doom-modeline-icon'.
-(setq doom-modeline-time-icon t)
-
-;; Whether display the live icons of time.
-;; It respects option `doom-modeline-icon' and option `doom-modeline-time-icon'.
-(setq doom-modeline-time-live-icon t)
-
-;; Whether to use an analogue clock svg as the live time icon.
-;; It respects options `doom-modeline-icon', `doom-modeline-time-icon', and `doom-modeline-time-live-icon'.
-(setq doom-modeline-time-analogue-clock t)
-
-;; The scaling factor used when drawing the analogue clock.
-(setq doom-modeline-time-clock-size 0.7)
-
-;; Whether to use unicode as a fallback (instead of ASCII) when not using icons.
-(setq doom-modeline-unicode-fallback nil)
-
-;; Whether display the buffer name.
-(setq doom-modeline-buffer-name t)
-
-;; Whether highlight the modified buffer name.
-(setq doom-modeline-highlight-modified-buffer-name t)
-
-;; When non-nil, mode line displays column numbers zero-based.
-;; See `column-number-indicator-zero-based'.
-(setq doom-modeline-column-zero-based t)
-
-;; Specification of \"percentage offset\" of window through buffer.
-;; See `mode-line-percent-position'.
-(setq doom-modeline-percent-position '(-3 "%p"))
-
-;; Format used to display line numbers in the mode line.
-;; See `mode-line-position-line-format'.
-(setq doom-modeline-position-line-format '("L%l"))
-
-;; Format used to display column numbers in the mode line.
-;; See `mode-line-position-column-format'.
-(setq doom-modeline-position-column-format '("C%c"))
-
-;; Format used to display combined line/column numbers in the mode line. See `mode-line-position-column-line-format'.
-(setq doom-modeline-position-column-line-format '("%l:%c"))
-
-;; Whether display the minor modes in the mode-line.
-(setq doom-modeline-minor-modes nil)
-
-;; Whether display the selection information.
-(setq doom-modeline-selection-info t)
-
-;; If non-nil, a word count will be added to the selection-info modeline segment.
-(setq doom-modeline-enable-word-count nil)
-
-;; Major modes in which to display word count continuously.
-;; Also applies to any derived modes. Respects `doom-modeline-enable-word-count'.
-;; If it brings the sluggish issue, disable `doom-modeline-enable-word-count' or
-;; remove the modes from `doom-modeline-continuous-word-count-modes'.
-(setq doom-modeline-continuous-word-count-modes '(markdown-mode gfm-mode org-mode))
-
-;; Whether display the buffer encoding.
-(setq doom-modeline-buffer-encoding t)
-
-;; Whether display the indentation information.
-(setq doom-modeline-indent-info nil)
-
-;; Whether display the total line number。
-(setq doom-modeline-total-line-number nil)
-
-;; Whether display the icon of vcs segment. It respects option `doom-modeline-icon'."
-(setq doom-modeline-vcs-icon t)
-
-;; The maximum displayed length of the branch name of version control.
-(setq doom-modeline-vcs-max-length 15)
-
-;; The function to display the branch name.
-(setq doom-modeline-vcs-display-function #'doom-modeline-vcs-name)
-
-;; Alist mapping VCS states to their corresponding faces.
-;; See `vc-state' for possible values of the state.
-;; For states not explicitly listed, the `doom-modeline-vcs-default' face is used.
-(setq doom-modeline-vcs-state-faces-alist
-	  '((needs-update . (doom-modeline-warning bold))
-		(removed . (doom-modeline-urgent bold))
-		(conflict . (doom-modeline-urgent bold))
-		(unregistered . (doom-modeline-urgent bold))))
-
-;; Whether display the icon of check segment. It respects option `doom-modeline-icon'.
-(setq doom-modeline-check-icon t)
-
-;; If non-nil, only display one number for check information if applicable.
-(setq doom-modeline-check-simple-format nil)
-
-;; The maximum number displayed for notifications.
-(setq doom-modeline-number-limit 99)
-
-;; Whether display the project name. Non-nil to display in the mode-line.
-(setq doom-modeline-project-name t)
-
-;; Whether display the workspace name. Non-nil to display in the mode-line.
-(setq doom-modeline-workspace-name t)
-
-;; Whether display the perspective name. Non-nil to display in the mode-line.
-(setq doom-modeline-persp-name t)
-
-;; If non nil the default perspective name is displayed in the mode-line.
-(setq doom-modeline-display-default-persp-name nil)
-
-;; If non nil the perspective name is displayed alongside a folder icon.
-(setq doom-modeline-persp-icon t)
-
-;; Whether display the `lsp' state. Non-nil to display in the mode-line.
-(setq doom-modeline-lsp t)
-
-;; Whether display the GitHub notifications. It requires `ghub' package.
-(setq doom-modeline-github nil)
-
-;; The interval of checking GitHub.
-(setq doom-modeline-github-interval (* 30 60))
-
-;; Whether display the modal state.
-;; Including `evil', `overwrite', `god', `ryo' and `xah-fly-keys', etc.
-(setq doom-modeline-modal t)
-
-;; Whether display the modal state icon.
-;; Including `evil', `overwrite', `god', `ryo' and `xah-fly-keys', etc.
-(setq doom-modeline-modal-icon t)
-
-;; Whether display the modern icons for modals.
-(setq doom-modeline-modal-modern-icon t)
-
-;; When non-nil, always show the register name when recording an evil macro.
-(setq doom-modeline-always-show-macro-register nil)
-
-;; Whether display the mu4e notifications. It requires `mu4e-alert' package.
-(setq doom-modeline-mu4e nil)
-;; also enable the start of mu4e-alert
-;; (mu4e-alert-enable-mode-line-display)  ;; Disabled since mu4e is disabled
-
-;; Whether display the gnus notifications.
-(setq doom-modeline-gnus t)
-
-;; Whether gnus should automatically be updated and how often (set to 0 or smaller than 0 to disable)
-(setq doom-modeline-gnus-timer 2)
-
-;; Wheter groups should be excludede when gnus automatically being updated.
-(setq doom-modeline-gnus-excluded-groups '("dummy.group"))
-
-;; Whether display the IRC notifications. It requires `circe' or `erc' package.
-(setq doom-modeline-irc t)
-
-;; Function to stylize the irc buffer names.
-(setq doom-modeline-irc-stylize 'identity)
-
-;; Whether display the battery status. It respects `display-battery-mode'.
-(setq doom-modeline-battery t)
-
-;; Whether display the time. It respects `display-time-mode'.
-(setq doom-modeline-time t)
-
-;; Whether display the misc segment on all mode lines.
-;; If nil, display only if the mode line is active.
-(setq doom-modeline-display-misc-in-all-mode-lines t)
-
-;; Whether to display the remote host information.
-(setq doom-modeline-remote-host t)
-
-;; The function to handle `buffer-file-name'.
-(setq doom-modeline-buffer-file-name-function #'identity)
-
-;; The function to handle `buffer-file-truename'.
-(setq doom-modeline-buffer-file-truename-function #'identity)
-
-;; Whether display the environment version.
-(setq doom-modeline-env-version t)
-;; Or for individual languages
-(setq doom-modeline-env-enable-python t)
-(setq doom-modeline-env-enable-ruby t)
-(setq doom-modeline-env-enable-perl t)
-(setq doom-modeline-env-enable-go t)
-(setq doom-modeline-env-enable-elixir t)
-(setq doom-modeline-env-enable-rust t)
-
-;; Change the executables to use for the language version string
-(setq doom-modeline-env-python-executable "python") ; or `python-shell-interpreter'
-(setq doom-modeline-env-ruby-executable "ruby")
-(setq doom-modeline-env-perl-executable "perl")
-(setq doom-modeline-env-go-executable "go")
-(setq doom-modeline-env-elixir-executable "iex")
-(setq doom-modeline-env-rust-executable "rustc")
-
-;; What to display as the version while a new one is being loaded
-(setq doom-modeline-env-load-string "...")
-
-;; By default, almost all segments are displayed only in the active window. To
-;; display such segments in all windows, specify e.g.
-(setq doom-modeline-always-visible-segments '(mu4e irc))
-
-;; Hooks that run before/after the modeline version string is updated
-(setq doom-modeline-before-update-env-hook nil)
-(setq doom-modeline-after-update-env-hook nil)
+(use-package doom-modeline
+  :ensure t
+  :init (doom-modeline-mode 1)
+  :config
+  (setq doom-modeline-height 20
+		doom-modeline-bar-width 4
+		doom-modeline-window-width-limit 85
+		doom-modeline-spc-face-overrides (list :family (face-attribute 'fixed-pitch :family))
+		doom-modeline-project-detection 'auto
+		doom-modeline-buffer-file-name-style 'auto
+		doom-modeline-icon t
+		doom-modeline-major-mode-icon t
+		doom-modeline-major-mode-color-icon t
+		doom-modeline-buffer-state-icon t
+		doom-modeline-buffer-modification-icon t
+		doom-modeline-buffer-name t
+		doom-modeline-highlight-modified-buffer-name t
+		doom-modeline-position-column-line-format '("%l:%c")
+		doom-modeline-minor-modes nil
+		doom-modeline-selection-info t
+		doom-modeline-vcs-icon t
+		doom-modeline-vcs-max-length 15
+		doom-modeline-check-icon t
+		doom-modeline-project-name t
+		doom-modeline-modal t
+		doom-modeline-modal-icon t
+		doom-modeline-modal-modern-icon t
+		doom-modeline-github nil
+		doom-modeline-mu4e nil
+		doom-modeline-gnus nil
+		doom-modeline-irc nil
+		doom-modeline-battery nil
+		doom-modeline-time nil
+		doom-modeline-env-version nil
+		doom-modeline-lsp nil))
 
 ;; Prevent evil state icons from being bold in active modeline
-;; Only set evil state faces to normal, not the base doom-modeline face
 (with-eval-after-load 'doom-modeline
   (dolist (face '(doom-modeline-evil-emacs-state
 				  doom-modeline-evil-insert-state