From bd2691e2a32de690d29fae0b7a1f84b38cde6ef2 Mon Sep 17 00:00:00 2001
From: Jacob McDonnell <jacob@jacobmcdonnell.com>
Date: Mon, 23 Mar 2026 21:00:42 -0400
Subject: feat: Remove trailing whitespace on save

Remove trailing whitespace on save. As well, fix to evil-want-C-u-scroll
by loading loading evil-collection after evil-mode.
---
 .emacs.d/init.el | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)

diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index e6b21b2..35513fa 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -24,6 +24,13 @@
 (display-line-numbers-mode)
 (setq-default display-line-numbers 'relative)
 
+(defun remove-trailing-whitespace-before-save-hook ()
+  (progn
+    (if (not (string-match ".*makefile.*" (message "%s" major-mode)))
+        (untabify (point-min) (point-max)))
+    (delete-trailing-whitespace)))
+(add-hook 'before-save-hook 'remove-trailing-whitespace-before-save-hook)
+
 ;; Set up package.el to work with MELPA
 (require 'package)
 (add-to-list 'package-archives
@@ -54,8 +61,6 @@
 
 (setq evil-want-keybinding nil)
 
-(evil-collection-init)
-
 ;; Enable Evil
 (use-package evil
     :init      ;; tweak evil's configuration before loading it
@@ -65,6 +70,12 @@
           evil-split-window-below t)
     (evil-mode))
 
+(use-package evil-collection
+  :after evil
+  :ensure t
+  :config
+  (evil-collection-init))
+
 (evil-set-leader 'normal (kbd "SPC"))
 (define-key evil-normal-state-map (kbd "<leader>w") 'save-buffer)
 (define-key evil-normal-state-map (kbd "<leader>%") 'split-window-right)
-- 
cgit v1.2.3