.

2 files changed, 75 insertions, 71 deletions

diff --git a/doom/.config/doom/config.el b/doom/.config/doom/config.el
index 3514782..635096f 100644
--- a/doom/.config/doom/config.el
+++ b/doom/.config/doom/config.el
@@ -1,5 +1,3 @@
-
-
 ;; Place your private configuration here! Remember, you do not need to run 'doom
 ;; sync' after modifying this file!
 
@@ -42,7 +40,6 @@
 ;; If you use `org' and don't want your org files in the default location below,
 ;; change `org-directory'. It must be set before org loads!
 (setq org-directory "~/org/")
-(pixel-scroll-precision-mode 1)
 
 ;; Whenever you reconfigure a package, make sure to wrap your config in an
 ;; `with-eval-after-load' block, otherwise Doom's defaults may override your
@@ -80,19 +77,26 @@
       org-gcal-client-secret "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"
       org-gcal-fetch-file-alist '(("maksimkokh6@gmail.com" . "~/org/gcal.org")))
 (setq org-agenda-files '("~/org/gcal.org"))
-(pixel-scroll-precision-mode -1)
+
 ;; Scroll fixing, 'cause it's broken a little bit.
 (setq inhibit-compacting-font-caches t)
 (setq scroll-conservatively 101 ;
       scroll-margin 0
       auto-window-vscroll nil)
+
+;; Prevent PGTK 100% CPU core spinning on Wayland
+;; Changed from nil to 0.001 to stop the event loop from going crazy
 (when (boundp 'pgtk-wait-for-event-timeout)
-  (setq pgtk-wait-for-event-timeout nil))
-;; Smooth scrolling without CPU spikes
+  (setq pgtk-wait-for-event-timeout 0.01))
+
+;; Scroll settings (Consolidated)
+;; Smooth scrolling is currently disabled to save CPU on your 180Hz monitor. 
+;; If you want smooth scrolling back, change -1 to 1 and change nil to t below.
+(pixel-scroll-precision-mode -1)
 (setq pixel-scroll-precision-mode nil)
 
 ;; Reduce redraw frequency
 (setq redisplay-dont-pause t
       fast-but-imprecise-scrolling t)
-(setq gc-cons-threshold 100000000)
+;; (setq gc-cons-threshold 100000000)
 (setq read-process-output-max (* 1024 1024)) ; 1MB
diff --git a/doom/.config/doom/themes/noctalia-theme.el b/doom/.config/doom/themes/noctalia-theme.el
index 8a7cbf8..99e6d3e 100644
--- a/doom/.config/doom/themes/noctalia-theme.el
+++ b/doom/.config/doom/themes/noctalia-theme.el
@@ -21,75 +21,75 @@
 (deftheme noctalia "Theme using Template variables with quality of life improvements.")
 
 ;; Define all the color variables (replaced by template processor)
-(let* ((bg "#fbfaf1")
-      (err "#ba1a1a")
-      (err-container "#ffdad6")
-      (on-background "#1b1c17")
-      (on-err "#ffffff")
-      (on-err-container "#93000a")
-      (on-primary "#ffffff")
-      (on-primary-container "#fffff4")
-      (on-secondary "#ffffff")
-      (on-secondary-container "#5e684d")
-      (on-surface "#1b1c17")
-      (on-surface-variant "#45483d")
-      (on-tertiary "#ffffff")
-      (on-tertiary-container "#ffffff")
-      (outline-color "#75786b")
-      (outline-variant "#c5c8b9")
-      (primary "#4f642c")
-      (primary-container "#677d42")
-      (secondary "#586247")
-      (secondary-container "#dde7c5")
+(let* ((bg "#16130c")
+      (err "#ffb4ab")
+      (err-container "#93000a")
+      (on-background "#e9e2d5")
+      (on-err "#690005")
+      (on-err-container "#ffdad6")
+      (on-primary "#3c2f00")
+      (on-primary-container "#2a2000")
+      (on-secondary "#3b2f07")
+      (on-secondary-container "#c6b47f")
+      (on-surface "#e9e2d5")
+      (on-surface-variant "#cfc6b0")
+      (on-tertiary "#213600")
+      (on-tertiary-container "#162600")
+      (outline-color "#98907c")
+      (outline-variant "#4d4636")
+      (primary "#e6c34f")
+      (primary-container "#ac8e1b")
+      (secondary "#d8c58f")
+      (secondary-container "#53461b")
       (shadow "#000000")
-      (surface "#fbfaf1")
-      (surface-container "#efeee6")
-      (surface-container-high "#e9e8e0")
-      (surface-container-highest "#e4e3db")
-      (surface-container-low "#f5f4ec")
-      (surface-container-lowest "#ffffff")
-      (surface-variant "#e1e4d4")
-      (tertiary "#26694f")
-      (tertiary-container "#418267")
+      (surface "#16130c")
+      (surface-container "#221f17")
+      (surface-container-high "#2d2a21")
+      (surface-container-highest "#38342c")
+      (surface-container-low "#1e1b13")
+      (surface-container-lowest "#110e07")
+      (surface-variant "#4d4636")
+      (tertiary "#add374")
+      (tertiary-container "#789c44")
       ;; Map success colors to tertiary (as used in other templates)
-      (success "#26694f")
-      (on-success "#ffffff")
-      (success-container "#418267")
-      (on-success-container "#ffffff")
+      (success "#add374")
+      (on-success "#213600")
+      (success-container "#789c44")
+      (on-success-container "#162600")
       ;; Map fixed colors to regular colors
-      (primary-fixed "#4f642c")
-      (primary-fixed-dim "#677d42")
-      (secondary-fixed "#586247")
-      (secondary-fixed-dim "#dde7c5")
-      (tertiary-fixed "#26694f")
-      (tertiary-fixed-dim "#418267")
-      (on-primary-fixed "#ffffff")
-      (on-primary-fixed-variant "#fffff4")
-      (on-secondary-fixed "#ffffff")
-      (on-secondary-fixed-variant "#5e684d")
-      (on-tertiary-fixed "#ffffff")
-      (on-tertiary-fixed-variant "#ffffff")
+      (primary-fixed "#e6c34f")
+      (primary-fixed-dim "#ac8e1b")
+      (secondary-fixed "#d8c58f")
+      (secondary-fixed-dim "#53461b")
+      (tertiary-fixed "#add374")
+      (tertiary-fixed-dim "#789c44")
+      (on-primary-fixed "#3c2f00")
+      (on-primary-fixed-variant "#2a2000")
+      (on-secondary-fixed "#3b2f07")
+      (on-secondary-fixed-variant "#c6b47f")
+      (on-tertiary-fixed "#213600")
+      (on-tertiary-fixed-variant "#162600")
       ;; Map inverse colors to surface variants
-      (inverse-on-surface "#1b1c17")
-      (inverse-primary "#4f642c")
-      (inverse-surface "#fbfaf1")
+      (inverse-on-surface "#e9e2d5")
+      (inverse-primary "#e6c34f")
+      (inverse-surface "#16130c")
       ;; ANSI terminal colors
-      (term0 "#e1e4d4")
-      (term1 "#ba1a1a")
-      (term2 "#4f642c")
-      (term3 "#586247")
-      (term4 "#26694f")
-      (term5 "#b7cf8b")
-      (term6 "#c1cbaa")
-      (term7 "#1b1c17")
-      (term8 "#75786b")
-      (term9 "#ba1a1a")
-      (term10 "#4f642c")
-      (term11 "#586247")
-      (term12 "#26694f")
-      (term13 "#b7cf8b")
-      (term14 "#c1cbaa")
-      (term15 "#1b1c17"))
+      (term0 "#4d4636")
+      (term1 "#ffb4ab")
+      (term2 "#e6c34f")
+      (term3 "#d8c58f")
+      (term4 "#add374")
+      (term5 "#e6c34f")
+      (term6 "#d8c58f")
+      (term7 "#e9e2d5")
+      (term8 "#98907c")
+      (term9 "#ffb4ab")
+      (term10 "#e6c34f")
+      (term11 "#d8c58f")
+      (term12 "#add374")
+      (term13 "#e6c34f")
+      (term14 "#d8c58f")
+      (term15 "#e9e2d5"))
 
   (custom-theme-set-faces
    'noctalia