correct/add themes

12 files changed, 157 insertions, 6 deletions

diff --git a/bin/.local/bin/scripts/xmonad-themechange b/bin/.local/bin/scripts/xmonad-themechange
index ccd28b0..aed2d8d 100755
--- a/bin/.local/bin/scripts/xmonad-themechange
+++ b/bin/.local/bin/scripts/xmonad-themechange
@@ -1,8 +1,16 @@
 #!/usr/bin/bash
 
-themes=("Gruber Darker" "Modus Vivendi" "Ef Arbutus" "Ef Elea Dark" "Ef Autumn")
+themes=("Gruber Darker"
+        "Modus Vivendi"
+        "Modus Operandi"
+        "Modus Operandi Tinted"
+        "Ef Arbutus"
+        "Ef Eagle"
+        "Ef Elea Dark"
+        "Ef Autumn"
+        "Ef Melissa Dark")
 
-selected_theme=$(printf "%s\n" "${themes[@]}" | dmenu -p "Select a theme:")
+selected_theme=$(printf "%s\n" "${themes[@]}" | dmenu -i -p "Select a theme:")
 
 # Exit if no theme is selected
 if [ -z "$selected_theme" ]; then
@@ -29,6 +37,20 @@ apply_generic_theme() {
             apply_emacs_theme "modus-vivendi"
             xrdb -merge ~/.Xresources.d/Xresources.vivendi
             ;;
+        "Modus Operandi")
+            BG_COLOR="#fbf7f0"
+            FG_COLOR="#000000"
+            XMONAD_MODULE="Modus.Operandi"
+            apply_emacs_theme "modus-operandi"
+            xrdb -merge ~/.Xresources.d/Xresources.operandi 
+            ;;
+        "Modus Operandi Tinted")
+            BG_COLOR="#fbf7f0"
+            FG_COLOR="#000000"
+            XMONAD_MODULE="Modus.OperandiTinted"
+            apply_emacs_theme "modus-operandi-tinted"
+            xrdb -merge ~/.Xresources.d/Xresources.operandi-tinted
+            ;;
         "Ef Arbutus")
             BG_COLOR="#ffead8"
             FG_COLOR="#393330"
@@ -36,6 +58,13 @@ apply_generic_theme() {
             apply_emacs_theme "ef-arbutus"
             xrdb -merge ~/.Xresources.d/Xresources.arbutus
             ;;
+        "Ef Eagle")
+            BG_COLOR="#f1ecd0"
+            FG_COLOR="#231a1f"
+            XMONAD_MODULE="Ef.Eagle"
+            apply_emacs_theme "ef-eagle"
+            xrdb -merge ~/.Xresources.d/Xresources.eagle
+            ;;
         "Ef Elea Dark")
             BG_COLOR="#222524"
             FG_COLOR="#eaf2ef"
@@ -48,6 +77,14 @@ apply_generic_theme() {
             FG_COLOR="#cfbcba"
             XMONAD_MODULE="Ef.Autumn"
             apply_emacs_theme "ef-autumn"
+            xrdb -merge ~/.Xresources.d/Xresources.autumn
+            ;;
+        "Ef Melissa Dark")
+            BG_COLOR="#352718"
+            FG_COLOR="#e8e4b1"
+            XMONAD_MODULE="Ef.MelissaDark"
+            apply_emacs_theme "ef-melissa-dark"
+            xrdb -merge ~/.Xresources.d/Xresources.melissa-dark
             ;;
             *)
             BG_COLOR="#181818"
diff --git a/ef-xresources/.Xresources.d/Xresources.deuteranopia-dark b/ef-xresources/.Xresources.d/Xresources.deuteranopia-dark
new file mode 100644
index 0000000..798cc05
--- /dev/null
+++ b/ef-xresources/.Xresources.d/Xresources.deuteranopia-dark
@@ -0,0 +1,45 @@
+!!!!! Ef deuteranopia dark Xresources theme
+*.foreground:      #ddddee
+*.background:      #000a1f
+URxvt.background:  [95]#000a1f
+*.cursorColor:     #ffff00
+! black
+*.color0:       #000a1f
+*.color8:       #243145
+! red
+*.color1:       #cf7a7a
+*.color9:       #e47360
+! green
+*.color2:       #3faa26
+*.color10:      #7aad0f
+! yellow
+*.color3:       #aa9f32
+*.color11:      #cfaf00
+! blue
+*.color4:       #6a9fff
+*.color12:      #009fff
+! magenta
+*.color5:       #b379bf
+*.color13:      #9f95ff
+! cyan
+*.color6:       #5faaef
+*.color14:      #0db0ff
+! white
+*.color7:       #7f8797
+*.color15:      #ddddee
+
+dmenu.background: #000a1f
+dmenu.foreground: #ddddee
+dmenu.selbackground: #003f8f
+dmenu.selforeground: #ffffff
+
+Nsxiv.window.background: #000a1f
+Nsxiv.window.foreground: #ddddee
+Nsxiv.mark.foreground: #003f8f
+Nsxiv.bar.background: #003f8f
+Nsxiv.bar.foreground: #ffffff
+
+dwm.background: #000a1f
+dwm.foreground: #ddddee
+dwm.selbackground: #003f8f
+dwm.selforeground: #ffffff
diff --git a/ef-xresources/.Xresources.d/Xresources.eagle b/ef-xresources/.Xresources.d/Xresources.eagle
index 1a70c36..55c568d 100644
--- a/ef-xresources/.Xresources.d/Xresources.eagle
+++ b/ef-xresources/.Xresources.d/Xresources.eagle
@@ -1,7 +1,7 @@
 !!!!!! Ef Eagle Xresources theme
 *.foreground:      #231a1f
 *.background:      #f1ecd0
-*.cursorColor:     #231a1f
+*.cursorColor:     #774400
 ! black
 *.color0:       #231a1f
 *.color8:       #685f53
diff --git a/ef-xresources/.Xresources.d/Xresources.tritanopia-dark b/ef-xresources/.Xresources.d/Xresources.tritanopia-dark
index 1dc00de..a832121 100644
--- a/ef-xresources/.Xresources.d/Xresources.tritanopia-dark
+++ b/ef-xresources/.Xresources.d/Xresources.tritanopia-dark
@@ -1,4 +1,4 @@
-yy!!!!! Ef Rosa Dark Xresources theme
+!!!!! Ef Rosa Dark Xresources theme
 *.foreground:      #dfd0d5
 *.background:      #15050f
 URxvt.background:  [95]#15050f
diff --git a/xmonad/.config/xmonad/lib/Colors/Ef/Arbutus.hs b/xmonad/.config/xmonad/lib/Colors/Ef/Arbutus.hs
index f11a9ba..d361952 100644
--- a/xmonad/.config/xmonad/lib/Colors/Ef/Arbutus.hs
+++ b/xmonad/.config/xmonad/lib/Colors/Ef/Arbutus.hs
@@ -5,6 +5,7 @@ import XMonad
 fg              = "#393330"
 bg              = "#ffead8"
 bg_active       = "#e9a0a0"
+bg_inactive     = "#f7e2d2"
 bg_alt          = "#c7b2ab"
 red             = "#b20f00"
 green           = "#007000"
diff --git a/xmonad/.config/xmonad/lib/Colors/Ef/Autumn.hs b/xmonad/.config/xmonad/lib/Colors/Ef/Autumn.hs
index 2df3390..00b375f 100644
--- a/xmonad/.config/xmonad/lib/Colors/Ef/Autumn.hs
+++ b/xmonad/.config/xmonad/lib/Colors/Ef/Autumn.hs
@@ -1,10 +1,9 @@
 module Colors.Ef.Autumn where
 
-import XMonad
-
 fg              = "#cfbcba"
 bg              = "#0f0e06"
 bg_active       = "#692a12"
+bg_inactive     = "#15140d"
 bg_alt          = "#36322f"
 red             = "#ef656a"
 green           = "#2fa526"
diff --git a/xmonad/.config/xmonad/lib/Colors/Ef/Eagle.hs b/xmonad/.config/xmonad/lib/Colors/Ef/Eagle.hs
new file mode 100644
index 0000000..9068c06
--- /dev/null
+++ b/xmonad/.config/xmonad/lib/Colors/Ef/Eagle.hs
@@ -0,0 +1,16 @@
+module Colors.Ef.Eagle where
+
+fg              = "#231a1f"
+bg              = "#f1ecd0"
+bg_active       = "#cfab80"
+bg_inactive     = "#e7e0ca"
+bg_alt          = "#cec8ae"
+red             = "#882000"
+green           = "#226022"
+yellow          = "#6b4500"
+active_fg       = "#524874"
+active_border   = "#cfab80"
+tab_fg          = "#40231f"
+inactive_border = "#cec8ae"
+purple          = "#960f4f"
+inactive_fg     = "#685f53"
diff --git a/xmonad/.config/xmonad/lib/Colors/Ef/EleaDark.hs b/xmonad/.config/xmonad/lib/Colors/Ef/EleaDark.hs
index 3546cde..e18f029 100644
--- a/xmonad/.config/xmonad/lib/Colors/Ef/EleaDark.hs
+++ b/xmonad/.config/xmonad/lib/Colors/Ef/EleaDark.hs
@@ -5,6 +5,7 @@ import XMonad
 fg              = "#eaf2ef"
 bg              = "#222524"
 bg_active       = "#35605d"
+bg_inactive     = "#2b2e2d"
 bg_alt          = "#3e4140"
 red             = "#ff656a"
 green           = "#7fca5a"
diff --git a/xmonad/.config/xmonad/lib/Colors/Ef/MelissaDark.hs b/xmonad/.config/xmonad/lib/Colors/Ef/MelissaDark.hs
new file mode 100644
index 0000000..3fc41de
--- /dev/null
+++ b/xmonad/.config/xmonad/lib/Colors/Ef/MelissaDark.hs
@@ -0,0 +1,16 @@
+module Colors.Ef.MelissaDark where
+
+fg              = "#e8e4b1"
+bg              = "#352718"
+bg_active       = "#704f00"
+bg_inactive     = "#483426"
+bg_alt          = "#59463f"
+red             = "#ff7f7f"
+green           = "#6fd560"
+yellow          = "#e4b53f"
+active_fg       = "#57aff6"
+active_border   = "#704f00"
+tab_fg          = "#f8efd8"
+inactive_border = "#6f5f58" -- subject to change to fg/bg-dim
+purple          = "#f0aac5"
+inactive_fg     = "#90918a"
diff --git a/xmonad/.config/xmonad/lib/Colors/Modus/Operandi.hs b/xmonad/.config/xmonad/lib/Colors/Modus/Operandi.hs
new file mode 100644
index 0000000..103a1ca
--- /dev/null
+++ b/xmonad/.config/xmonad/lib/Colors/Modus/Operandi.hs
@@ -0,0 +1,17 @@
+module Colors.Modus.Operandi where
+
+import XMonad
+
+fg              = "#000000"
+bg              = "#ffffff"
+bg_active       = "#c4c4c4"
+bg_inactive     = "#e0e0e0"
+red             = "#a60000"
+green           = "#006800"
+yellow          = "#6f5000"
+active_fg       = "#005f5f"
+active_border   = "#193668"
+tab_fg          = "#c8c8c8"
+inactive_border = "#595959"
+purple          = "#721045"
+inactive_fg     = "#595959"
diff --git a/xmonad/.config/xmonad/lib/Colors/Modus/OperandiTinted.hs b/xmonad/.config/xmonad/lib/Colors/Modus/OperandiTinted.hs
new file mode 100644
index 0000000..0b377c8
--- /dev/null
+++ b/xmonad/.config/xmonad/lib/Colors/Modus/OperandiTinted.hs
@@ -0,0 +1,18 @@
+module Colors.Modus.OperandiTinted where
+
+import XMonad
+
+fg              = "#000000"
+bg              = "#fbf7f0"
+bg_active       = "#c9b9b0"
+bg_inactive     = "#dfd5cf"
+bg_alt          = "#ffff00"
+red             = "#a60000"
+green           = "#006300"
+yellow          = "#6d5000"
+active_fg       = "#193668"
+active_border   = "#602938"
+tab_fg          = "#000000"
+inactive_border = "#9f9690"
+purple          = "#721045"
+inactive_fg     = "#595959"
diff --git a/xmonad/.config/xmonad/lib/Colors/Modus/Vivendi.hs b/xmonad/.config/xmonad/lib/Colors/Modus/Vivendi.hs
index 4cac7da..0d58007 100644
--- a/xmonad/.config/xmonad/lib/Colors/Modus/Vivendi.hs
+++ b/xmonad/.config/xmonad/lib/Colors/Modus/Vivendi.hs
@@ -5,6 +5,7 @@ import XMonad
 fg              = "#ffffff"
 bg              = "#000000"
 bg_active       = "#606060"
+bg_inactive     = "#303030"
 bg_alt          = "#303030"
 red             = "#ff5f59"
 green           = "#70b900"