From e27b8b0de3abaa62672d42d3bb7685a305f5a6d7 Mon Sep 17 00:00:00 2001
From: Fernando Schauenburg <dev@schauenburg.me>
Date: Mon, 16 Aug 2021 16:21:00 +0200
Subject: [PATCH] bash: bake in solarized definitions

---
 bash/bashrc   | 45 ++++++++++++++++++++++++++++++++++++++++++++-
 install.sh    |  1 -
 zsh/solarized | 45 ---------------------------------------------
 3 files changed, 44 insertions(+), 47 deletions(-)
 delete mode 100644 zsh/solarized

diff --git a/bash/bashrc b/bash/bashrc
index 9b4b71d..b6c744f 100644
--- a/bash/bashrc
+++ b/bash/bashrc
@@ -1,9 +1,52 @@
 #!/bin/bash
 # Set up bash for interactive use (options, prompt, aliases, etc.)
 
+# From: https://ethanschoonover.com/solarized/
+# SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
+# --------- ------- ---- -------  ----------- ---------- ----------- -----------
+# base03    #002b36  8/4 brblack  234 #1c1c1c 15 -12 -12   0  43  54 193 100  21
+# base02    #073642  0/4 black    235 #262626 20 -12 -12   7  54  66 192  90  26
+# base01    #586e75 10/7 brgreen  240 #585858 45 -07 -07  88 110 117 194  25  46
+# base00    #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195  23  51
+# base0     #839496 12/6 brblue   244 #808080 60 -06 -03 131 148 150 186  13  59
+# base1     #93a1a1 14/4 brcyan   245 #8a8a8a 65 -05 -02 147 161 161 180   9  63
+# base2     #eee8d5  7/7 white    254 #e4e4e4 92 -00  10 238 232 213  44  11  93
+# base3     #fdf6e3 15/7 brwhite  230 #ffffd7 97  00  10 253 246 227  44  10  99
+# yellow    #b58900  3/3 yellow   136 #af8700 60  10  65 181 137   0  45 100  71
+# orange    #cb4b16  9/3 brred    166 #d75f00 50  50  55 203  75  22  18  89  80
+# red       #dc322f  1/1 red      160 #d70000 50  65  45 220  50  47   1  79  86
+# magenta   #d33682  5/5 magenta  125 #af005f 50  65 -05 211  54 130 331  74  83
+# violet    #6c71c4 13/5 brmagenta 61 #5f5faf 50  15 -45 108 113 196 237  45  77
+# blue      #268bd2  4/4 blue      33 #0087ff 55 -10 -45  38 139 210 205  82  82
+# cyan      #2aa198  6/6 cyan      37 #00afaf 60 -35 -05  42 161 152 175  74  63
+# green     #859900  2/2 green     64 #5f8700 60 -20  65 133 153   0  68 100  60
+#                    ^
+#                    |
+#                    +--- set colors according to this column, assuming a
+#                         properly configured terminal.
+#
+# Don't export these into the environment -> the point is to have them
+# available within the shell only.
+Base03=8
+Base02=0
+Base01=10
+Base00=11
+Base0=12
+Base1=14
+Base2=7
+Base3=15
+Red=1
+Orange=9
+Yellow=3
+Green=2
+Cyan=6
+Blue=4
+Violet=13
+Magenta=5
+Reset=$(tput sgr0)
+
 while read -r f; do [ -f "$f" ] && source "$f"; done <<EOL
     $ZDOTDIR/aliases
-    $ZDOTDIR/solarized
 EOL
 unset f
 
diff --git a/install.sh b/install.sh
index 3b62009..1753867 100755
--- a/install.sh
+++ b/install.sh
@@ -259,7 +259,6 @@ deploy_zsh() {
     link "$DOTFILES/zsh/zshrc" "$ZDOTDIR/.zshrc"
     link "$DOTFILES/zsh/aliases" "$ZDOTDIR/aliases"
     link "$DOTFILES/zsh/prompt" "$ZDOTDIR/prompt"
-    link "$DOTFILES/zsh/solarized" "$ZDOTDIR/solarized"
     link "$DOTFILES/zsh/vi-mode" "$ZDOTDIR/vi-mode"
 }
 
diff --git a/zsh/solarized b/zsh/solarized
deleted file mode 100644
index ddc53a5..0000000
--- a/zsh/solarized
+++ /dev/null
@@ -1,45 +0,0 @@
-#!/bin/sh
-# From: https://ethanschoonover.com/solarized/
-# SOLARIZED HEX     16/8 TERMCOL  XTERM/HEX   L*A*B      RGB         HSB
-# --------- ------- ---- -------  ----------- ---------- ----------- -----------
-# base03    #002b36  8/4 brblack  234 #1c1c1c 15 -12 -12   0  43  54 193 100  21
-# base02    #073642  0/4 black    235 #262626 20 -12 -12   7  54  66 192  90  26
-# base01    #586e75 10/7 brgreen  240 #585858 45 -07 -07  88 110 117 194  25  46
-# base00    #657b83 11/7 bryellow 241 #626262 50 -07 -07 101 123 131 195  23  51
-# base0     #839496 12/6 brblue   244 #808080 60 -06 -03 131 148 150 186  13  59
-# base1     #93a1a1 14/4 brcyan   245 #8a8a8a 65 -05 -02 147 161 161 180   9  63
-# base2     #eee8d5  7/7 white    254 #e4e4e4 92 -00  10 238 232 213  44  11  93
-# base3     #fdf6e3 15/7 brwhite  230 #ffffd7 97  00  10 253 246 227  44  10  99
-# yellow    #b58900  3/3 yellow   136 #af8700 60  10  65 181 137   0  45 100  71
-# orange    #cb4b16  9/3 brred    166 #d75f00 50  50  55 203  75  22  18  89  80
-# red       #dc322f  1/1 red      160 #d70000 50  65  45 220  50  47   1  79  86
-# magenta   #d33682  5/5 magenta  125 #af005f 50  65 -05 211  54 130 331  74  83
-# violet    #6c71c4 13/5 brmagenta 61 #5f5faf 50  15 -45 108 113 196 237  45  77
-# blue      #268bd2  4/4 blue      33 #0087ff 55 -10 -45  38 139 210 205  82  82
-# cyan      #2aa198  6/6 cyan      37 #00afaf 60 -35 -05  42 161 152 175  74  63
-# green     #859900  2/2 green     64 #5f8700 60 -20  65 133 153   0  68 100  60
-#                    ^
-#                    |
-#                    +--- set colors according to this column, assuming a
-#                         properly configured terminal.
-#
-# Don't export these into the environment -> the point is to have them
-# available within the shell only.
-Base03=8
-Base02=0
-Base01=10
-Base00=11
-Base0=12
-Base1=14
-Base2=7
-Base3=15
-Red=1
-Orange=9
-Yellow=3
-Green=2
-Cyan=6
-Blue=4
-Violet=13
-Magenta=5
-Reset=$(tput sgr0)
-