From d7efb4f22f45aaea4b49691a09ac5c378506d17a Mon Sep 17 00:00:00 2001
From: Derek Taylor <derek@distrotube.com>
Date: Sun, 5 Dec 2021 12:55:12 -0600
Subject: [PATCH] Adding modular colorschemes to Xmonad.

---
 .config/doom/config.el               | 4 ++--
 .config/doom/config.org              | 4 ++--
 .xmonad/README.org                   | 2 +-
 .xmonad/lib/Colors/DoomOne.hs        | 3 +++
 .xmonad/lib/Colors/Dracula.hs        | 7 +++++++
 .xmonad/lib/Colors/GruvboxDark.hs    | 7 +++++++
 .xmonad/lib/Colors/MonokaiPro.hs     | 3 +++
 .xmonad/lib/Colors/Nord.hs           | 3 +++
 .xmonad/lib/Colors/OceanicNext.hs    | 3 +++
 .xmonad/lib/Colors/SolarizedDark.hs  | 3 +++
 .xmonad/lib/Colors/SolarizedLight.hs | 3 +++
 .xmonad/lib/Colors/TomorrowNight.hs  | 3 +++
 .xmonad/xmonad.hs                    | 2 +-
 13 files changed, 41 insertions(+), 6 deletions(-)

diff --git a/.config/doom/config.el b/.config/doom/config.el
index f73f52c..70551af 100644
--- a/.config/doom/config.el
+++ b/.config/doom/config.el
@@ -374,9 +374,9 @@ List of keybindings (SPC h b b)")
 (setq org-export-with-broken-links t)
 (setq org-publish-project-alist
       '(("distro.tube"
-         :base-directory "~/gitlab-repos/distro.tube/"
+         :base-directory "~/nc/gitlab-repos/distro.tube/"
          :base-extension "org"
-         :publishing-directory "~/gitlab-repos/distro.tube/html/"
+         :publishing-directory "~/nc/gitlab-repos/distro.tube/html/"
          :recursive t
          :exclude "org-html-themes/.*"
          :publishing-function org-html-publish-to-html
diff --git a/.config/doom/config.org b/.config/doom/config.org
index 4f6a4d7..5e94896 100644
--- a/.config/doom/config.org
+++ b/.config/doom/config.org
@@ -728,9 +728,9 @@ We need ox-man for "Org eXporting" to manpage format and ox-gemini for exporting
 (setq org-export-with-broken-links t)
 (setq org-publish-project-alist
       '(("distro.tube"
-         :base-directory "~/gitlab-repos/distro.tube/"
+         :base-directory "~/nc/gitlab-repos/distro.tube/"
          :base-extension "org"
-         :publishing-directory "~/gitlab-repos/distro.tube/html/"
+         :publishing-directory "~/nc/gitlab-repos/distro.tube/html/"
          :recursive t
          :exclude "org-html-themes/.*"
          :publishing-function org-html-publish-to-html
diff --git a/.xmonad/README.org b/.xmonad/README.org
index 61af44c..1f6e338 100644
--- a/.xmonad/README.org
+++ b/.xmonad/README.org
@@ -167,7 +167,7 @@ myStartupHook = do
     spawnOnce "nm-applet &"
     spawnOnce "volumeicon &"
     spawnOnce "conky -c $HOME/.config/conky/xmonad/doom-one-01.conkyrc"
-    spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x282c34  --height 22 &"
+    spawnOnce ("trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 " ++ colorTrayer ++ " --height 22 &")
     spawnOnce "/usr/bin/emacs --daemon &" -- emacs daemon for the emacsclient
     spawnOnce "xargs xwallpaper --stretch < ~/.cache/wall"
 #+END_SRC
diff --git a/.xmonad/lib/Colors/DoomOne.hs b/.xmonad/lib/Colors/DoomOne.hs
index 0c17402..a4fdb0f 100644
--- a/.xmonad/lib/Colors/DoomOne.hs
+++ b/.xmonad/lib/Colors/DoomOne.hs
@@ -23,3 +23,6 @@ color13 = "#3071db"
 color14 = "#a9a1e1"
 color15 = "#46d9ff"
 color16 = "#dfdfdf"
+
+colorTrayer :: String
+colorTrayer = "--tint 0x282c34"
diff --git a/.xmonad/lib/Colors/Dracula.hs b/.xmonad/lib/Colors/Dracula.hs
index 98aafe1..b7da3f1 100644
--- a/.xmonad/lib/Colors/Dracula.hs
+++ b/.xmonad/lib/Colors/Dracula.hs
@@ -3,6 +3,10 @@ module Colors.Dracula where
 import XMonad
 
 colorScheme = "dracula"
+
+colorBack = "#282a36"
+colorFore = "#f8f8f2"
+
 color01="#000000"
 color02="#ff5555"
 color03="#50fa7b"
@@ -19,3 +23,6 @@ color13="#caa9fa"
 color14="#ff92d0"
 color15="#9aedfe"
 color16="#e6e6e6"
+
+colorTrayer :: String
+colorTrayer = "--tint 0x282a36"
diff --git a/.xmonad/lib/Colors/GruvboxDark.hs b/.xmonad/lib/Colors/GruvboxDark.hs
index 64d4f6e..ae472eb 100644
--- a/.xmonad/lib/Colors/GruvboxDark.hs
+++ b/.xmonad/lib/Colors/GruvboxDark.hs
@@ -3,6 +3,10 @@ module Colors.GruvboxDark where
 import XMonad
 
 colorScheme = "gruvbox-dark"
+
+colorBack = "#282828"
+colorFore = "#ebdbb2"
+
 color01 = "#282828"
 color02 = "#cc241d"
 color03 = "#98971a"
@@ -19,3 +23,6 @@ color13 = "#83a598"
 color14 = "#d3869b"
 color15 = "#8ec07c"
 color16 = "#ebdbb2"
+
+colorTrayer :: String
+colorTrayer = "--tint 0x282828"
diff --git a/.xmonad/lib/Colors/MonokaiPro.hs b/.xmonad/lib/Colors/MonokaiPro.hs
index 131cdad..c61f0ca 100644
--- a/.xmonad/lib/Colors/MonokaiPro.hs
+++ b/.xmonad/lib/Colors/MonokaiPro.hs
@@ -23,3 +23,6 @@ color13 = "#FC9867"
 color14 = "#AB9DF2"
 color15 = "#78DCE8"
 color16 = "#FCFCFA"
+
+colorTrayer :: String
+colorTrayer = "--tint 0x2D2A2E"
diff --git a/.xmonad/lib/Colors/Nord.hs b/.xmonad/lib/Colors/Nord.hs
index 909f54a..13c6183 100644
--- a/.xmonad/lib/Colors/Nord.hs
+++ b/.xmonad/lib/Colors/Nord.hs
@@ -23,3 +23,6 @@ color13 = "#6699cc"
 color14 = "#c594c5"
 color15 = "#5fb3b3"
 color16 = "#d8dee9"
+
+colorTrayer :: String
+colorTrayer = "--tint 0x2E3440"
diff --git a/.xmonad/lib/Colors/OceanicNext.hs b/.xmonad/lib/Colors/OceanicNext.hs
index 40f6cc5..54a45fe 100644
--- a/.xmonad/lib/Colors/OceanicNext.hs
+++ b/.xmonad/lib/Colors/OceanicNext.hs
@@ -23,3 +23,6 @@ color13 = "#6699cc"
 color14 = "#c594c5"
 color15 = "#5fb3b3"
 color16 = "#d8dee9"
+
+colorTrayer :: String
+colorTrayer = "--tint 0x1b2b34"
diff --git a/.xmonad/lib/Colors/SolarizedDark.hs b/.xmonad/lib/Colors/SolarizedDark.hs
index e074c91..e6455d6 100644
--- a/.xmonad/lib/Colors/SolarizedDark.hs
+++ b/.xmonad/lib/Colors/SolarizedDark.hs
@@ -23,3 +23,6 @@ color13 = "#839496"
 color14 = "#6c71c4"
 color15 = "#93a1a1"
 color16 = "#fdf6e3"
+
+colorTrayer :: String
+colorTrayer = "--tint 0x002b36"
diff --git a/.xmonad/lib/Colors/SolarizedLight.hs b/.xmonad/lib/Colors/SolarizedLight.hs
index 50dd4db..3049a7a 100644
--- a/.xmonad/lib/Colors/SolarizedLight.hs
+++ b/.xmonad/lib/Colors/SolarizedLight.hs
@@ -23,3 +23,6 @@ color13 = "#839496"
 color14 = "#fdf6e3"  -- Was color16 but too light for use in panel.
 color15 = "#93a1a1"
 color16 = "#6c71c4"  -- Was color14 but needed a dark color in this spot.
+
+colorTrayer :: String
+colorTrayer = "--tint 0xfdf6e3"
diff --git a/.xmonad/lib/Colors/TomorrowNight.hs b/.xmonad/lib/Colors/TomorrowNight.hs
index 69b9549..a2dbc98 100644
--- a/.xmonad/lib/Colors/TomorrowNight.hs
+++ b/.xmonad/lib/Colors/TomorrowNight.hs
@@ -23,3 +23,6 @@ color13 = "#81a2be"
 color14 = "#b77ee0"
 color15 = "#54ced6"
 color16 = "#282a2e"
+
+colorTrayer :: String
+colorTrayer = "--tint 0x1d1f21"
diff --git a/.xmonad/xmonad.hs b/.xmonad/xmonad.hs
index 0fbc2e4..2219bf0 100644
--- a/.xmonad/xmonad.hs
+++ b/.xmonad/xmonad.hs
@@ -118,7 +118,7 @@ myStartupHook = do
     spawnOnce "nm-applet &"
     spawnOnce "volumeicon &"
     spawnOnce "conky -c $HOME/.config/conky/xmonad/doom-one-01.conkyrc"
-    spawnOnce "trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 --tint 0x282c34  --height 22 &"
+    spawnOnce ("trayer --edge top --align right --widthtype request --padding 6 --SetDockType true --SetPartialStrut true --expand true --monitor 1 --transparent true --alpha 0 " ++ colorTrayer ++ " --height 22 &")
     spawnOnce "/usr/bin/emacs --daemon &" -- emacs daemon for the emacsclient
     spawnOnce "xargs xwallpaper --stretch < ~/.cache/wall"