General minor refactor

modules/ui/doom-dashboard/config.el

@@ -73,8 +73,6 @@ whose dimensions may not be fully initialized by the time this is run."
 (add-hook 'window-setup-hook #'+doom-dashboard|init)
 (add-hook 'after-make-frame-functions #'+doom-dashboard|make-frame)
 (add-hook 'server-visit-hook #'+doom-dashboard|server-visit)
-(when (featurep! :ui vi-tilde-fringe)
-  (add-hook '+doom-dashboard-mode-hook #'+vi-tilde-fringe|disable))
 
 
 ;;

modules/ui/doom-modeline/config.el

@@ -20,8 +20,8 @@
              mode-line-in-non-selected-windows)
         (force-mode-line-update)
         (sit-for eldoc-show-in-mode-line-delay))))
-
   (setq eldoc-in-minibuffer-show-fn #'+doom-modeline--show-eldoc)
+
   (eldoc-in-minibuffer-mode +1))
 
 ;; anzu and evil-anzu expose current/total state that can be displayed in the
@@ -35,13 +35,11 @@
   (setq anzu-cons-mode-line-p nil
         anzu-minimum-input-length 1
         anzu-search-threshold 250)
-
   ;; Avoid anzu conflicts across buffers
   (mapc #'make-variable-buffer-local
         '(anzu--total-matched anzu--current-position anzu--state
           anzu--cached-count anzu--cached-positions anzu--last-command
           anzu--last-isearch-string anzu--overflow-p))
-
   ;; Ensure anzu state is cleared when searches & iedit are done
   (add-hook 'isearch-mode-end-hook #'anzu--reset-status t)
   (add-hook '+evil-esc-hook #'anzu--reset-status t)
@@ -52,7 +50,7 @@
 (defvar +doom-modeline-current-window (frame-selected-window))
 (defun +doom-modeline|set-selected-window (&rest _)
   "Sets `+doom-modeline-current-window' appropriately"
-  (let ((win (frame-selected-window)))
+  (when-let (win (frame-selected-window))
     (unless (minibuffer-window-active-p win)
       (setq +doom-modeline-current-window win))))
 
@@ -633,6 +631,6 @@ Returns \"\" to not break --no-window-system."
 (add-hook 'doom-scratch-buffer-hook #'+doom-modeline|set-special-modeline)
 (add-hook '+doom-dashboard-mode-hook #'+doom-modeline|set-project-modeline)
 
-(add-hook 'org-src-mode-hook #'+doom-modeline|set-special-modeline)
 (add-hook 'image-mode-hook   #'+doom-modeline|set-media-modeline)
+(add-hook 'org-src-mode-hook #'+doom-modeline|set-special-modeline)
 (add-hook 'circe-mode-hook   #'+doom-modeline|set-special-modeline)

modules/ui/doom/config.el

@@ -6,22 +6,22 @@
   (unless doom-theme (setq doom-theme 'doom-one))
 
   ;; Ensure `doom/reload-load-path' reloads common faces
-  (defun +doom|reload-theme ()
-    (load "doom-themes-common.el" nil t))
+  (defun +doom|reload-theme () (load "doom-themes-common.el" nil t))
   (add-hook 'doom-pre-reload-theme-hook #'+doom|reload-theme)
 
-  ;; improve integration with org-mode
+  ;; improve integration w/ org-mode
   (add-hook 'doom-init-ui-hook #'doom-themes-org-config)
 
-  ;; blink mode-line on errors
-  ;; (add-hook 'doom-init-ui-hook #'doom-themes-visual-bell-config)
-
-  ;; Add file icons to doom-neotree
+  ;; more Atom-esque file icons for neotree
   (add-hook 'doom-init-ui-hook #'doom-themes-neotree-config)
   (setq doom-neotree-enable-variable-pitch t
         doom-neotree-file-icons 'simple
         doom-neotree-line-spacing 2)
 
+  ;; blink mode-line on errors
+  ;; FIXME Breaks modeline
+  ;; (add-hook 'doom-init-ui-hook #'doom-themes-visual-bell-config)
+
   (after! neotree
     (defun +doom|neotree-fix-popup ()
       "Ensure the fringe settings are maintained on popup restore."

modules/ui/vi-tilde-fringe/config.el

@@ -2,10 +2,10 @@
 
 ;; indicators for empty lines past EOF
 (def-package! vi-tilde-fringe
-  :commands (global-vi-tilde-fringe-mode vi-tilde-fringe-mode)
+  :commands vi-tilde-fringe-mode
   :hook (doom-init-ui . global-vi-tilde-fringe-mode)
-  :init
   :config
-  (defun +vi-tilde-fringe|disable ()
-    (vi-tilde-fringe-mode -1)))
+  (add-hook! +doom-dashboard-mode
+    (when (bound-and-true-p vi-tilde-fringe-mode)
+      (vi-tilde-fringe-mode -1))))