From f3190978218482c5986bdd1c71a843f46aec14ee Mon Sep 17 00:00:00 2001
From: Jim Myhrberg <contact@jimeh.me>
Date: Mon, 20 Jun 2022 20:22:35 +0100
Subject: [PATCH] feat(whitespace): re-enable whitespace mode without
 newline-mark

Turns out the conflicts with both copilot and highlight-indent-guide was
due to the newline-mark. Hence disable newline-mark and re-enable
whitespace mode.
---
 modules/editor/siren-whitespace.el          | 10 ++++++----
 modules/major-modes/siren-prog-mode.el      |  3 ++-
 themes/siren-doom-themes-overrides-theme.el |  2 ++
 3 files changed, 10 insertions(+), 5 deletions(-)

diff --git a/modules/editor/siren-whitespace.el b/modules/editor/siren-whitespace.el
index be279c3..afae26a 100644
--- a/modules/editor/siren-whitespace.el
+++ b/modules/editor/siren-whitespace.el
@@ -26,10 +26,12 @@
 
   :config
   (setq whitespace-line-column 80
-        whitespace-style '(face tabs trailing space-before-tab newline
-                                indentation space-after-tab tab-mark
-                                newline-mark empty)
-        whitespace-display-mappings '((newline-mark ?\n
+        whitespace-style '(face tabs spaces trailing space-before-tab newline
+                                indentation space-after-tab tab-mark empty)
+        whitespace-display-mappings '((space-mark ?\s
+                                                  [?\u00B7] ;; \u00B7 = ·
+                                                  [46]) ;; 46 = .
+                                      (newline-mark ?\n
                                                     [?\u00AC ?\n] ;; \u00AC = ¬
                                                     [?$ ?\n])
                                       (tab-mark ?\t
diff --git a/modules/major-modes/siren-prog-mode.el b/modules/major-modes/siren-prog-mode.el
index eb301b9..e0da661 100644
--- a/modules/major-modes/siren-prog-mode.el
+++ b/modules/major-modes/siren-prog-mode.el
@@ -23,7 +23,8 @@
     (if (< (buffer-size) (* 100 1024))
         (siren-display-indentation 1))
 
-    (hl-line-mode t))
+    (hl-line-mode t)
+    (whitespace-mode t))
 
   :init
   (add-to-list 'safe-local-variable-values '(fill-column . 120)))
diff --git a/themes/siren-doom-themes-overrides-theme.el b/themes/siren-doom-themes-overrides-theme.el
index 963c9ea..f3ade69 100644
--- a/themes/siren-doom-themes-overrides-theme.el
+++ b/themes/siren-doom-themes-overrides-theme.el
@@ -26,6 +26,8 @@
  ;; whitespace-mode
  `(whitespace-tab ((t ( :foreground ,(doom-color 'base4)
                         :background ,(doom-color 'bg) ))))
+ `(trailing-whitespace  ((t ( :foregroup ,(doom-color 'base4)
+                              :background ,(doom-color 'red) ))))
 
  ;; fill-column-indicator
  `(fill-column-indicator ((t ( :foreground ,(doom-lighten 'base3 0.10) ))))