From 722a8d3c7aeb47825f0cc21b37e2c82dc56cb1b6 Mon Sep 17 00:00:00 2001
From: Henrik Lissner <git@henrik.io>
Date: Thu, 25 Sep 2025 19:03:43 -0400
Subject: [PATCH] refactor(default): move whitespace & tramp config

- tramp-default-method is already set in :emacs tramp.
- Moves the whitespace config to the new whitespace module.

Amend: fbdde6b5f4ef
Amend: 71eae252acaa
---
 modules/config/default/config.el    | 30 -----------------------------
 modules/editor/whitespace/config.el | 24 +++++++++++++++++++++++
 2 files changed, 24 insertions(+), 30 deletions(-)

diff --git a/modules/config/default/config.el b/modules/config/default/config.el
index cf2128e67..d45512bae 100644
--- a/modules/config/default/config.el
+++ b/modules/config/default/config.el
@@ -78,36 +78,6 @@
     (setq woman-manpath path)))
 
 
-;;;###package tramp
-(unless (featurep :system 'windows)
-  (setq tramp-default-method "ssh")) ; faster than the default scp
-
-
-;;;###package whitespace
-(add-hook! 'after-change-major-mode-hook :append
-  (defun +emacs-highlight-non-default-indentation-h ()
-    "Highlight whitespace at odds with `indent-tabs-mode'.
-That is, highlight tabs if `indent-tabs-mode' is `nil', and highlight spaces at
-the beginnings of lines if `indent-tabs-mode' is `t'. The purpose is to make
-incorrect indentation in the current buffer obvious to you.
-
-Does nothing if `whitespace-mode' or `global-whitespace-mode' is already active
-or if the current buffer is read-only or not file-visiting."
-    (unless (or (eq major-mode 'fundamental-mode)
-                (bound-and-true-p global-whitespace-mode)
-                (null buffer-file-name)
-                buffer-read-only)
-      (require 'whitespace)
-      (set (make-local-variable 'whitespace-style)
-           (cl-union (if indent-tabs-mode
-                         '(indentation)
-                       '(tabs tab-mark))
-                     (when whitespace-mode
-                       (remq 'face whitespace-active-style))))
-      (cl-pushnew 'face whitespace-style) ; must be first
-      (whitespace-mode +1))))
-
-
 ;;
 ;;; Smartparens config
 
diff --git a/modules/editor/whitespace/config.el b/modules/editor/whitespace/config.el
index 9390ddc52..fed91af2f 100644
--- a/modules/editor/whitespace/config.el
+++ b/modules/editor/whitespace/config.el
@@ -34,6 +34,30 @@ successfully sets indent_style/indent_size.")
 
 (use-package! whitespace
   :defer t
+  :init
+  (add-hook! 'after-change-major-mode-hook :append
+    (defun +emacs-highlight-non-default-indentation-h ()
+      "Highlight whitespace at odds with `indent-tabs-mode'.
+That is, highlight tabs if `indent-tabs-mode' is `nil', and highlight spaces at
+the beginnings of lines if `indent-tabs-mode' is `t'. The purpose is to make
+incorrect indentation in the current buffer obvious to you.
+
+Does nothing if `whitespace-mode' or `global-whitespace-mode' is already active
+or if the current buffer is read-only or not file-visiting."
+      (unless (or (eq major-mode 'fundamental-mode)
+                  (bound-and-true-p global-whitespace-mode)
+                  (null buffer-file-name)
+                  buffer-read-only)
+        (require 'whitespace)
+        (set (make-local-variable 'whitespace-style)
+             (cl-union (if indent-tabs-mode
+                           '(indentation)
+                         '(tabs tab-mark))
+                       (when whitespace-mode
+                         (remq 'face whitespace-active-style))))
+        (cl-pushnew 'face whitespace-style) ; must be first
+        (whitespace-mode +1))))
+
   :config
   (setq whitespace-line-column nil
         whitespace-style