From b2b712c67ba05793fb3836ed413410acda462ae0 Mon Sep 17 00:00:00 2001 From: Fernando Schauenburg Date: Sun, 8 Aug 2021 23:43:52 +0200 Subject: [PATCH] profile: move color definitions into profile --- bootstrap | 1 - files/bashrc | 1 - files/profile.sh | 44 ++++++++++++++++++++++++++++++++++++++++++++ files/solarized.sh | 43 ------------------------------------------- files/zshrc | 1 - 5 files changed, 44 insertions(+), 46 deletions(-) delete mode 100644 files/solarized.sh diff --git a/bootstrap b/bootstrap index f7af921..086fe10 100755 --- a/bootstrap +++ b/bootstrap @@ -71,7 +71,6 @@ files/tmux.conf ${XDG_CONFIG_HOME}/tmux/tmux.conf files/init.vim ${XDG_CONFIG_HOME}/nvim/init.vim files/aliases.sh ${XDG_CONFIG_HOME}/shell/aliases.sh files/profile.sh ${XDG_CONFIG_HOME}/shell/profile.sh -files/solarized.sh ${XDG_CONFIG_HOME}/shell/solarized.sh files/zshrc ${XDG_CONFIG_HOME}/zsh/.zshrc EOF ) diff --git a/files/bashrc b/files/bashrc index 3d5dcb1..f2a6a89 100644 --- a/files/bashrc +++ b/files/bashrc @@ -14,7 +14,6 @@ HISTTIMEFORMAT="[%F %T] " HISTFILE="$XDG_DATA_HOME/bash/history" [ -f "${XDG_CONFIG_HOME}/shell/aliases.sh" ] && source "${XDG_CONFIG_HOME}/shell/aliases.sh" -[ -f "${XDG_CONFIG_HOME}/shell/solarized.sh" ] && source "${XDG_CONFIG_HOME}/shell/solarized.sh" Reset="\[$(tput sgr0)\]" PS1_EXIT="\[$(tput setaf "$Red" )\]" # color for last exit code if non-zero diff --git a/files/profile.sh b/files/profile.sh index 3b2ced9..42b7487 100644 --- a/files/profile.sh +++ b/files/profile.sh @@ -1,6 +1,50 @@ #!/bin/sh # Environment variables are set here for login shells. +# 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) + export XDG_CACHE_HOME="${XDG_CACHE_HOME:-$HOME/.cache}" export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}" export XDG_DATA_HOME="${XDG_DATA_HOME:-$HOME/.local/share}" diff --git a/files/solarized.sh b/files/solarized.sh deleted file mode 100644 index 83152b7..0000000 --- a/files/solarized.sh +++ /dev/null @@ -1,43 +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. -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 - diff --git a/files/zshrc b/files/zshrc index 32c9350..f4495a8 100644 --- a/files/zshrc +++ b/files/zshrc @@ -4,5 +4,4 @@ stty -ixon # disable ctrl-s and ctrl-q [ -f "${XDG_CONFIG_HOME}/shell/aliases.sh" ] && source "${XDG_CONFIG_HOME}/shell/aliases.sh" -[ -f "${XDG_CONFIG_HOME}/shell/solarized.sh" ] && source "${XDG_CONFIG_HOME}/shell/solarized.sh"