lupan/dotfiles
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add dark-gray theme, adjust terminal colors for dark, dark-blue and light

Browse Source
This commit is contained in:
Łukasz Pankowski 2020-07-24 11:49:34 +02:00
parent 4ca746b086
commit b2268b5c88
2 changed files with 49 additions and 22 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

52
alacritty/.config/alacritty/alacritty.yml
View File

@ -10,21 +10,21 @@ schemas:
foreground: '#f2f6e1' foreground: '#f2f6e1'
normal: &dark-normal-colors normal: &dark-normal-colors
black: '#000000' black: '#000000'
red: '#e6436d' red: '#d19494'
green: '#59c19f' green: '#95d194'
yellow: '#f6bc25' yellow: '#d0d194'
blue: '#55b3fd' blue: '#94b4d1'
magenta: '#dc88e9' magenta: '#d094d1'
cyan: '#77adc4' cyan: '#94d1d1'
white: '#f2f6e1' white: '#f2f6e1'
bright: &bright-colors bright: &bright-colors
black: '#888888' black: '#a0a0a0'
red: '#e694a9' red: '#e5b2b2'
green: '#94e6a9' green: '#b4e5b2'
yellow: '#fbda62' yellow: '#e4e5b2'
blue: '#1081ff' blue: '#b2cde5'
magenta: '#b056b5' magenta: '#e4b2e5'
cyan: '#169191' cyan: '#b2e5e5'
white: '#ffffff' white: '#ffffff'
lupan_dark_blue: &dark-blue lupan_dark_blue: &dark-blue
primary: primary:
@ -32,6 +32,20 @@ schemas:
foreground: '#c0c0c0' foreground: '#c0c0c0'
normal: *dark-normal-colors normal: *dark-normal-colors
bright: *bright-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 lupan_material_dark: &material-dark
primary: primary:
background: '#424242' background: '#424242'
@ -52,12 +66,12 @@ schemas:
foreground: '#1a3a34' foreground: '#1a3a34'
normal: normal:
black: '#000000' black: '#000000'
red: '#e6436d' red: '#a65959'
green: '#1ebf33' green: '#5ba659'
yellow: '#d6a708' yellow: '#a4a659'
blue: '#1155e8' blue: '#5981a6'
magenta: '#a708d6' magenta: '#a459a6'
cyan: '#2081a0' cyan: '#59a6a6'
white: '#f2f6e1' white: '#f2f6e1'
bright: *material-dark-normal bright: *material-dark-normal
lupan_material_light: &material-light lupan_material_light: &material-light

19
bspwm/.config/bspwm/commands.sh
View File

@ -6,16 +6,18 @@ shift
if [ "$CMD" = theme -a "$1" = next ]; then if [ "$CMD" = theme -a "$1" = next ]; then
case $(bspc config focused_border_color) in case $(bspc config focused_border_color) in
'#23aba4') THEME=dark-blue ;; '#23aba4') THEME=dark-blue ;;
'#3585ce') THEME=light ;; '#3585ce') THEME=dark-gray ;;
'#a59fc6') THEME=light ;;
'#068c70') THEME=material-dark ;; '#068c70') THEME=material-dark ;;
'#78909c') THEME=material-light ;; '#78909c') THEME=material-light ;;
*) THEME=dark ;; *) THEME=dark ;;
esac 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" THEME="$1"
else else
case $(bspc config focused_border_color) in case $(bspc config focused_border_color) in
'#3585ce') THEME=dark-blue ;; '#3585ce') THEME=dark-blue ;;
'#a59fc6') THEME=dark-gray ;;
'#068c70') THEME=light ;; '#068c70') THEME=light ;;
'#78909c') THEME=material-dark ;; '#78909c') THEME=material-dark ;;
'#827717') THEME=material-light ;; '#827717') THEME=material-light ;;
@ -60,6 +62,17 @@ elif [ "$THEME" = dark-blue ]; then
FOCUS_BORDER=#3585ce FOCUS_BORDER=#3585ce
EMACS_THEME=lupan-dark-blue EMACS_THEME=lupan-dark-blue
GTK_THEME=Materia-dark 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 elif [ "$THEME" = material-dark ]; then
ROOT_BG=#37474f ROOT_BG=#37474f
BAR_BG=#263238 BAR_BG=#263238
@ -118,6 +131,6 @@ case "$CMD" in
| dmenu ${DMENU_ARGS} "$@" -l 20 -i -p Window: | cut -f 1 -d ' ') | dmenu ${DMENU_ARGS} "$@" -l 20 -i -p Window: | cut -f 1 -d ' ')
;; ;;
dmenu_theme) 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:) |dmenu ${DMENU_ARGS} "$@" -l 20 -p Theme:)
esac esac