From 38b4a6bd2c4a0a999c65f86f97ae4590892f16c8 Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@acscott.dev>
Date: Mon, 6 Jun 2022 14:31:52 -0400
Subject: [PATCH] Update everforest colors

---
 Xresources                        | 88 +++++++++++++++++++++----------
 config/kitty/everforest-dark.conf | 21 +++-----
 config/rofi/config.rasi           |  7 ---
 3 files changed, 68 insertions(+), 48 deletions(-)
 delete mode 100644 config/rofi/config.rasi

diff --git a/Xresources b/Xresources
index 695777b..934a92a 100644
--- a/Xresources
+++ b/Xresources
@@ -1,6 +1,7 @@
 ! -----------------------------------------------------------------------------
-! Based on: gruvbox-dark and zenburn 
+! Colors: gruvbox-dark, forest night, zenburn  
 ! Source: https://github.com/morhetz/gruvbox-generalized
+!         https://github.com/jef/forest-night-xresources
 !         https://github.com/jnurmine/Zenburn
 ! -----------------------------------------------------------------------------
 
@@ -45,36 +46,69 @@ Xft.rgba: rgb
 ! *color7:  #a89984
 ! *color15: #ebdbb2
 
+!------------!
+! Everforest !
+!------------!
+
+! special
+*.foreground:   #d8caac
+*.background:   #323d43
+*.cursorColor:  #7fbbb3
+! black
+*.color0:       #4a555b
+*.color8:       #525c62
+! red
+*.color1:       #e26c6e
+*.color9:       #e68183
+! green
+*.color2:       #9bb86f
+*.color10:      #a7c080
+! yellow
+*.color3:       #d5b26b
+*.color11:      #dbbc7f
+! blue
+*.color4:       #6eb2a9
+*.color12:      #7fbbb3
+! magenta
+*.color5:       #cf87a9
+*.color13:      #d699b6
+! cyan
+*.color6:       #72b783
+*.color14:      #83c092
+! white
+*.color7:       #d0bf9b
+*.color15:      #d8caac
+
 !---------!
 ! Zenburn !
 !---------!
 
-*background: #3f3f3f
-*foreground: #dcdccc
-! Black + DarkGrey
-*color0:  #282828
-*color8:  #709080
-! DarkRed + Red
-*color1:  #705050
-*color9:  #dca3a3
-! DarkGreen + Green
-*color2:  #60b48a
-*color10: #c3bf9f
-! DarkYellow + Yellow
-*color3:  #f0deae
-*color11: #dfcf9f
-! DarkBlue + Blue
-*color4:  #506070
-*color12: #94bff3
-! DarkMagenta + Magenta
-*color5:  #dc8cc3
-*color13: #ec93d3
-! DarkCyan + Cyan
-*color6:  #8cd0d3
-*color14: #93e0e3
-! LightGrey + White
-*color7:  #dcdccc
-*color15: #ffffff
+! *background: #3f3f3f
+! *foreground: #dcdccc
+! ! Black + DarkGrey
+! *color0:  #282828
+! *color8:  #709080
+! ! DarkRed + Red
+! *color1:  #705050
+! *color9:  #dca3a3
+! ! DarkGreen + Green
+! *color2:  #60b48a
+! *color10: #c3bf9f
+! ! DarkYellow + Yellow
+! *color3:  #f0deae
+! *color11: #dfcf9f
+! ! DarkBlue + Blue
+! *color4:  #506070
+! *color12: #94bff3
+! ! DarkMagenta + Magenta
+! *color5:  #dc8cc3
+! *color13: #ec93d3
+! ! DarkCyan + Cyan
+! *color6:  #8cd0d3
+! *color14: #93e0e3
+! ! LightGrey + White
+! *color7:  #dcdccc
+! *color15: #ffffff
 
 !!! urxvt
 URxvt.perl-ext-common: default,matcher
diff --git a/config/kitty/everforest-dark.conf b/config/kitty/everforest-dark.conf
index b3d1ec3..151b87a 100644
--- a/config/kitty/everforest-dark.conf
+++ b/config/kitty/everforest-dark.conf
@@ -11,31 +11,24 @@ cursor                #7fbbb3
 # black
 color0   #4a555b
 color8   #525c62
-
 # red
-color1   #e68183
+color1   #e26c6e
 color9   #e68183
-
 # green
-color2   #a7c080
+color2   #9bb86f
 color10  #a7c080
-
 # yellow
-color3   #dbbc7f
+color3   #d5b26b
 color11  #dbbc7f
-
 # blue
-color4  #7fbbb3
+color4  #6eb2a9
 color12 #7fbbb3
-
 # magenta
-color5   #d699b6
+color5   #cf87a9
 color13  #d699b6
-
 # cyan
-color6   #83c092
+color6   #72b783
 color14  #83c092
-
 # white
-color7   #d8caac
+color7   #d0bf9b
 color15  #d8caac
diff --git a/config/rofi/config.rasi b/config/rofi/config.rasi
deleted file mode 100644
index 0cc3812..0000000
--- a/config/rofi/config.rasi
+++ /dev/null
@@ -1,7 +0,0 @@
-/** Basic config file **/
-
-configuration {
-  show-icons:         true;
-  icon-theme:         "Papirus";
-}
-@import "/usr/share/rofi/themes/gruvbox-dark-hard.rasi"