vividboarder/shoestrap
1
0
Fork 0
mirror of https://github.com/ViViDboarder/shoestrap.git synced 2024-11-22 01:46:32 +00:00
Code Issues Releases Wiki Activity

Use new color detection in bash/zsh/fish

Browse Source
This commit is contained in:
ViViDboarder 2020-10-06 13:17:45 -07:00
parent 6703812918
commit 25f73bef63
4 changed files with 17 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
assets/default/bin/derive_colors.py
View File

@ -59,7 +59,7 @@ def get_terminal_profile(force=False):
raise ValueError(f"Unknown terminal {term_program}") raise ValueError(f"Unknown terminal {term_program}")
def get_vim_colorscheme(terminal_profile: str, is_dark=False, force=False): def get_vim_colorscheme(terminal_profile: str, force_dark=False, force=False):
"""Returns the best colorscheme for a given terminal profile""" """Returns the best colorscheme for a given terminal profile"""
if not force and VIM_VAR in os.environ: if not force and VIM_VAR in os.environ:
return os.environ[VIM_VAR] return os.environ[VIM_VAR]
@ -77,10 +77,13 @@ def get_vim_colorscheme(terminal_profile: str, is_dark=False, force=False):
return "wombat256mod" return "wombat256mod"
def get_bat_theme(terminal_profile: str, is_dark=False, force=False): def get_bat_theme(terminal_profile: str, force_dark=False, force=False):
if not force and BAT_VAR in os.environ: if not force and BAT_VAR in os.environ:
return os.environ[BAT_VAR] return os.environ[BAT_VAR]
# Determine if this is a dark theme
is_dark = force_dark or "dark" in terminal_profile.lower()
if "Wombat" in terminal_profile: if "Wombat" in terminal_profile:
return "DarkNeon" return "DarkNeon"
elif "Solarized" in terminal_profile: elif "Solarized" in terminal_profile:
@ -165,18 +168,18 @@ def parse_args(**args) -> argparse.Namespace:
return parser.parse_args(**args) return parser.parse_args(**args)
def print_all_env(force=False, is_dark=False, export=False, fish=False): def print_all_env(force=False, force_dark=False, export=False, fish=False):
term_profile = get_terminal_profile(force=force) term_profile = get_terminal_profile(force=force)
print_env(TERM_VAR, term_profile, export=export, fish=fish) print_env(TERM_VAR, term_profile, export=export, fish=fish)
vim_colors = get_vim_colorscheme( vim_colors = get_vim_colorscheme(
term_profile, term_profile,
is_dark=is_dark, force_dark=force_dark,
force=force, force=force,
) )
print_env(VIM_VAR, vim_colors, export=export, fish=fish) print_env(VIM_VAR, vim_colors, export=export, fish=fish)
bat_theme = get_bat_theme(term_profile, is_dark=is_dark, force=force) bat_theme = get_bat_theme(term_profile, force_dark=force_dark, force=force)
print_env(BAT_VAR, bat_theme, export=export, fish=fish) print_env(BAT_VAR, bat_theme, export=export, fish=fish)
@ -202,7 +205,7 @@ if __name__ == "__main__":
term_profile = get_terminal_profile(force=args.force) term_profile = get_terminal_profile(force=args.force)
vim_colors = get_vim_colorscheme( vim_colors = get_vim_colorscheme(
term_profile, term_profile,
is_dark=args.dark, force_dark=args.dark,
force=args.force, force=args.force,
) )
print(vim_colors) print(vim_colors)
@ -210,14 +213,14 @@ if __name__ == "__main__":
term_profile = get_terminal_profile(force=args.force) term_profile = get_terminal_profile(force=args.force)
bat_theme = get_bat_theme( bat_theme = get_bat_theme(
term_profile, term_profile,
is_dark=args.dark, force_dark=args.dark,
force=args.force, force=args.force,
) )
print(bat_theme) print(bat_theme)
else: else:
print_all_env( print_all_env(
force=args.force, force=args.force,
is_dark=args.dark, force_dark=args.dark,
fish=args.fish, fish=args.fish,
export=args.export, export=args.export,
) )

4
assets/default/dotfiles/bash_profile
View File

@ -80,8 +80,8 @@ export PROMPT_COMMAND='echo -ne "\033]0;${PWD/#$HOME/~}\007"'
export CLICOLOR=1 export CLICOLOR=1
export LSCOLORS=ExFxCxDxBxegedabagacad export LSCOLORS=ExFxCxDxBxegedabagacad
# Vim colors # Export colors
[ -n "$VIM_COLOR" ] || export VIM_COLOR="$(eval "$HOME/bin/get_vim_colorscheme.sh")" || export VIM_COLOR='wombat256mod' eval $($HOME/bin/derive_colors.py --export)
if type rg &> /dev/null; then if type rg &> /dev/null; then
export FZF_DEFAULT_COMMAND='rg --files' export FZF_DEFAULT_COMMAND='rg --files'

4
assets/default/dotfiles/zshrc
View File

@ -132,8 +132,8 @@ export PROMPT_COMMAND='echo -ne "\033]0;${PWD/#$HOME/~}\007"'
export CLICOLOR=1 export CLICOLOR=1
export LSCOLORS=ExFxCxDxBxegedabagacad export LSCOLORS=ExFxCxDxBxegedabagacad
# Vim colors # Export colors
[ -n "$VIM_COLOR" ] || export VIM_COLOR="$(eval "$HOME/bin/get_vim_colorscheme.sh")" || export VIM_COLOR='wombat256mod' eval $($HOME/bin/derive_colors.py --export)
# FZF # FZF
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh

4
assets/default/fish/init/env.fish
View File

@ -22,5 +22,5 @@ set -gx FZF_DEFAULT_OPTS "
--bind '?:toggle-preview' --bind '?:toggle-preview'
" "
# Vim Colors so that they can be set by env # Export colors
set -q VIM_COLOR; set -gx VIM_COLOR (eval $HOME/bin/get_vim_colorscheme.sh); or set -gx VIM_COLOR wombat256mod eval ($HOME/bin/derive_colors.py --export --fish)