From 4468c8f7afaf750e0c0f7b37443c64bddb7a58d9 Mon Sep 17 00:00:00 2001
From: Andrew Scott <git@acscott.dev>
Date: Mon, 6 Jun 2022 14:21:15 -0400
Subject: [PATCH] Update everforest colors

---
 Xresources                        | 39 ++++++++++++++++---------------
 config/kitty/everforest-dark.conf | 14 +++++------
 config/rofi/config.rasi           |  7 ------
 3 files changed, 27 insertions(+), 33 deletions(-)
 delete mode 100644 config/rofi/config.rasi

diff --git a/Xresources b/Xresources
index 78219af..34225ea 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,37 +46,37 @@ Xft.rgba: rgb
 ! *color7:  #a89984
 ! *color15: #ebdbb2
 
+!------------!
+! Everforest !
+!------------!
 
-!--------------!
-! Forest Night !
-!--------------!
 ! special
 *.foreground:   #d8caac
 *.background:   #323d43
-*.cursorColor:  #d8caac
+*.cursorColor:  #7fbbb3
 ! black
-*.color0:       #868d80
-*.color8:       #868d80
+*.color0:       #4a555b
+*.color8:       #525c62
 ! red
-*.color1:       #e68183
+*.color1:       #e26c6e
 *.color9:       #e68183
 ! green
-*.color2:       #a7c080
+*.color2:       #9bb86f
 *.color10:      #a7c080
 ! yellow
-*.color3:       #d9bb80
-*.color11:      #d9bb80
+*.color3:       #d5b26b
+*.color11:      #dbbc7f
 ! blue
-*.color4:       #89beba
-*.color12:      #89beba
+*.color4:       #6eb2a9
+*.color12:      #7fbbb3
 ! magenta
-*.color5:       #d3a0bc
-*.color13:      #d3a0bc
+*.color5:       #cf87a9
+*.color13:      #d699b6
 ! cyan
-*.color6:       #87c095
-*.color14:      #87c095
+*.color6:       #72b783
+*.color14:      #83c092
 ! white
-*.color7:       #d8caac
+*.color7:       #d0bf9b
 *.color15:      #d8caac
 
 !---------!
@@ -97,7 +98,7 @@ Xft.rgba: rgb
 ! *color3:  #f0deae
 ! *color11: #dfcf9f
 ! ! DarkBlue + Blue
-! *color4:  #506f8f
+! *color4:  #506070
 ! *color12: #94bff3
 ! ! DarkMagenta + Magenta
 ! *color5:  #dc8cc3
diff --git a/config/kitty/everforest-dark.conf b/config/kitty/everforest-dark.conf
index b3d1ec3..e725d6b 100644
--- a/config/kitty/everforest-dark.conf
+++ b/config/kitty/everforest-dark.conf
@@ -13,29 +13,29 @@ 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"