From b2268b5c88d717a05f21dde262ce26a4a7a06797 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=C5=81ukasz=20Pankowski?= <lukpank@o2.pl>
Date: Fri, 24 Jul 2020 11:49:34 +0200
Subject: [PATCH] add dark-gray theme, adjust terminal colors for dark,
 dark-blue and light

---
 alacritty/.config/alacritty/alacritty.yml | 52 ++++++++++++++---------
 bspwm/.config/bspwm/commands.sh           | 19 +++++++--
 2 files changed, 49 insertions(+), 22 deletions(-)

diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml
index ee98174..e401337 100644
--- a/alacritty/.config/alacritty/alacritty.yml
+++ b/alacritty/.config/alacritty/alacritty.yml
@@ -10,21 +10,21 @@ schemas:
       foreground: '#f2f6e1'
     normal: &dark-normal-colors
       black:   '#000000'
-      red:     '#e6436d'
-      green:   '#59c19f'
-      yellow:  '#f6bc25'
-      blue:    '#55b3fd'
-      magenta: '#dc88e9'
-      cyan:    '#77adc4'
+      red:     '#d19494'
+      green:   '#95d194'
+      yellow:  '#d0d194'
+      blue:    '#94b4d1'
+      magenta: '#d094d1'
+      cyan:    '#94d1d1'
       white:   '#f2f6e1'
     bright: &bright-colors
-      black:   '#888888'
-      red:     '#e694a9'
-      green:   '#94e6a9'
-      yellow:  '#fbda62'
-      blue:    '#1081ff'
-      magenta: '#b056b5'
-      cyan:    '#169191'
+      black:   '#a0a0a0'
+      red:     '#e5b2b2'
+      green:   '#b4e5b2'
+      yellow:  '#e4e5b2'
+      blue:    '#b2cde5'
+      magenta: '#e4b2e5'
+      cyan:    '#b2e5e5'
       white:   '#ffffff'
   lupan_dark_blue: &dark-blue
     primary:
@@ -32,6 +32,20 @@ schemas:
       foreground: '#c0c0c0'
     normal: *dark-normal-colors
     bright: *bright-colors
+  lupan_dark_gray: &dark-gray
+    primary:
+      background: '#474d52'
+      foreground: '#e3e6e8'
+    normal: &dark-normal-colors
+      black:   '#000000'
+      red:     '#c69f9f'
+      green:   '#a0c69f'
+      yellow:  '#c5c69f'
+      blue:    '#9fb3c6'
+      magenta: '#c59fc6'
+      cyan:    '#9fc6c6'
+      white:   '#e3e6e8'
+    bright: *bright-colors
   lupan_material_dark: &material-dark
     primary:
       background: '#424242'
@@ -52,12 +66,12 @@ schemas:
       foreground: '#1a3a34'
     normal:
       black:   '#000000'
-      red:     '#e6436d'
-      green:   '#1ebf33'
-      yellow:  '#d6a708'
-      blue:    '#1155e8'
-      magenta: '#a708d6'
-      cyan:    '#2081a0'
+      red:     '#a65959'
+      green:   '#5ba659'
+      yellow:  '#a4a659'
+      blue:    '#5981a6'
+      magenta: '#a459a6'
+      cyan:    '#59a6a6'
       white:   '#f2f6e1'
     bright: *material-dark-normal
   lupan_material_light: &material-light
diff --git a/bspwm/.config/bspwm/commands.sh b/bspwm/.config/bspwm/commands.sh
index 299318a..6151ef5 100644
--- a/bspwm/.config/bspwm/commands.sh
+++ b/bspwm/.config/bspwm/commands.sh
@@ -6,16 +6,18 @@ shift
 if [ "$CMD" = theme -a "$1" = next ]; then
     case $(bspc config focused_border_color) in
 	'#23aba4') THEME=dark-blue ;;
-	'#3585ce') THEME=light ;;
+	'#3585ce') THEME=dark-gray ;;
+	'#a59fc6') THEME=light ;;
 	'#068c70') THEME=material-dark ;;
 	'#78909c') THEME=material-light ;;
 	*) THEME=dark ;;
     esac
-elif [ "$CMD" = theme ] && [ "$1" = dark -o "$1" = dark-blue -o "$1" = light -o "$1" = material-light -o "$1" = material-dark ]; then
+elif [ "$CMD" = theme ] && [ "$1" = dark -o "$1" = dark-blue -o "$1" = dark-gray -o "$1" = light -o "$1" = material-dark -o "$1" = material-light ]; then
     THEME="$1"
 else
     case $(bspc config focused_border_color) in
 	'#3585ce') THEME=dark-blue ;;
+	'#a59fc6') THEME=dark-gray ;;
 	'#068c70') THEME=light ;;
 	'#78909c') THEME=material-dark ;;
 	'#827717') THEME=material-light ;;
@@ -60,6 +62,17 @@ elif [ "$THEME" = dark-blue ]; then
     FOCUS_BORDER=#3585ce
     EMACS_THEME=lupan-dark-blue
     GTK_THEME=Materia-dark
+elif [ "$THEME" = dark-gray ]; then
+    ROOT_BG=#404040
+    BAR_BG=#494752
+    BAR_FG=#e3e6e8
+    BAR_ACTIVE=#736e91
+    BAR_URGENT=#9b0640
+    BAR_EMPTY=#808080
+    NORMAL_BORDER=#808080
+    FOCUS_BORDER=#a59fc6
+    EMACS_THEME=lupan-dark-gray
+    GTK_THEME=Materia-dark
 elif [ "$THEME" = material-dark ]; then
     ROOT_BG=#37474f
     BAR_BG=#263238
@@ -118,6 +131,6 @@ case "$CMD" in
 			   | dmenu ${DMENU_ARGS} "$@" -l 20 -i -p Window: | cut -f 1 -d ' ')
 	;;
     dmenu_theme)
-	sh "$0" theme $(echo -n 'dark\ndark-blue\nlight\nmaterial-light\nmaterial-dark\n' \
+	sh "$0" theme $(echo -n 'dark\ndark-blue\ndark-gray\nlight\nmaterial-dark\nmaterial-light\n' \
 	     	    |dmenu ${DMENU_ARGS} "$@" -l 20 -p Theme:)
 esac