mirror of
https://github.com/ViViDboarder/shoestrap.git
synced 2024-11-21 22:56:33 +00:00
Add new way of installing and setting fish themes
Now defining a theme directory and adding files to that directory
This commit is contained in:
ViViDboarder
parent
8521963c2d
commit
b81e79976e
@ -1,95 +0,0 @@
|
|||||||
function _set_colorscheme --description "Sets the fish colorscheme"
|
|
||||||
set -l theme "$argv[1]"
|
|
||||||
switch "$theme"
|
|
||||||
case "solarized light"
|
|
||||||
__theme_solarized_light
|
|
||||||
case "solarized dark"
|
|
||||||
__theme_solarized_dark
|
|
||||||
case "wombat"
|
|
||||||
__theme_wombat
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
function __theme_solarized_light --description "Set fish theme to solarized light"
|
|
||||||
set -g fish_color_autosuggestion 93a1a1
|
|
||||||
set -g fish_color_cancel -r
|
|
||||||
set -g fish_color_command 586e75
|
|
||||||
set -g fish_color_comment 93a1a1
|
|
||||||
set -g fish_color_cwd green
|
|
||||||
set -g fish_color_cwd_root red
|
|
||||||
set -g fish_color_end 268bd2
|
|
||||||
set -g fish_color_error dc322f
|
|
||||||
set -g fish_color_escape 00a6b2
|
|
||||||
set -g fish_color_history_current --bold
|
|
||||||
set -g fish_color_host normal
|
|
||||||
set -g fish_color_match --background=brblue
|
|
||||||
set -g fish_color_normal normal
|
|
||||||
set -g fish_color_operator 00a6b2
|
|
||||||
set -g fish_color_param 657b83
|
|
||||||
set -g fish_color_quote 839496
|
|
||||||
set -g fish_color_redirection 6c71c4
|
|
||||||
set -g fish_color_search_match bryellow --background=white
|
|
||||||
set -g fish_color_selection white --bold --background=brblack
|
|
||||||
set -g fish_color_user brgreen
|
|
||||||
set -g fish_color_valid_path --underline
|
|
||||||
set -g fish_pager_color_completion green
|
|
||||||
set -g fish_pager_color_description B3A06D
|
|
||||||
set -g fish_pager_color_prefix cyan --underline
|
|
||||||
set -g fish_pager_color_progress brwhite --background=cyan
|
|
||||||
end
|
|
||||||
|
|
||||||
function __theme_solarized_dark --description "Set fish theme to solarized dark"
|
|
||||||
set -g fish_color_autosuggestion 586e75
|
|
||||||
set -g fish_color_cancel -r
|
|
||||||
set -g fish_color_command 93a1a1
|
|
||||||
set -g fish_color_comment 586e75
|
|
||||||
set -g fish_color_cwd green
|
|
||||||
set -g fish_color_cwd_root red
|
|
||||||
set -g fish_color_end 268bd2
|
|
||||||
set -g fish_color_error dc322f
|
|
||||||
set -g fish_color_escape 00a6b2
|
|
||||||
set -g fish_color_history_current --bold
|
|
||||||
set -g fish_color_host normal
|
|
||||||
set -g fish_color_match --background=brblue
|
|
||||||
set -g fish_color_normal normal
|
|
||||||
set -g fish_color_operator 00a6b2
|
|
||||||
set -g fish_color_param 839496
|
|
||||||
set -g fish_color_quote 657b83
|
|
||||||
set -g fish_color_redirection 6c71c4
|
|
||||||
set -g fish_color_search_match bryellow --background=black
|
|
||||||
set -g fish_color_selection white --bold --background=brblack
|
|
||||||
set -g fish_color_user brgreen
|
|
||||||
set -g fish_color_valid_path --underline
|
|
||||||
set -g fish_pager_color_completion B3A06D
|
|
||||||
set -g fish_pager_color_description B3A06D
|
|
||||||
set -g fish_pager_color_prefix cyan --underline
|
|
||||||
set -g fish_pager_color_progress brwhite --background=cyan
|
|
||||||
end
|
|
||||||
|
|
||||||
function __theme_wombat --description "Set fish theme to wombat"
|
|
||||||
set -g fish_color_autosuggestion black
|
|
||||||
set -g fish_color_cancel -r
|
|
||||||
set -g fish_color_command yellow
|
|
||||||
set -g fish_color_comment normal
|
|
||||||
set -g fish_color_cwd green
|
|
||||||
set -g fish_color_cwd_root red
|
|
||||||
set -g fish_color_end blue
|
|
||||||
set -g fish_color_error red
|
|
||||||
set -g fish_color_escape magenta
|
|
||||||
set -g fish_color_history_current --bold
|
|
||||||
set -g fish_color_host normal
|
|
||||||
set -g fish_color_match --background=brblue
|
|
||||||
set -g fish_color_normal normal
|
|
||||||
set -g fish_color_operator cyan
|
|
||||||
set -g fish_color_param green
|
|
||||||
set -g fish_color_quote brgreen --italics
|
|
||||||
set -g fish_color_redirection magenta
|
|
||||||
set -g fish_color_search_match bryellow --background=green
|
|
||||||
set -g fish_color_selection white --bold --background=green
|
|
||||||
set -g fish_color_user brgreen
|
|
||||||
set -g fish_color_valid_path --underline
|
|
||||||
set -g fish_pager_color_completion blue
|
|
||||||
set -g fish_pager_color_description blue
|
|
||||||
set -g fish_pager_color_prefix cyan --underline
|
|
||||||
set -g fish_pager_color_progress brwhite --background=cyan
|
|
||||||
end
|
|
||||||
24
assets/default/fish/functions/fish_theme.fish
Normal file
24
assets/default/fish/functions/fish_theme.fish
Normal file
@ -0,0 +1,24 @@
|
|||||||
|
function fish_theme --description "Sets fish theme"
|
||||||
|
set -l theme_name $argv[1]
|
||||||
|
for p in $fish_themes_path
|
||||||
|
set -l theme_file "$p/$theme_name.fish"
|
||||||
|
if test -f "$theme_file"
|
||||||
|
source "$theme_file"
|
||||||
|
return
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
echo "Unknown theme $theme_name not in fish_themes_path"
|
||||||
|
return 1
|
||||||
|
end
|
||||||
|
|
||||||
|
function __fish_theme_list --description "List all fish themes found in path"
|
||||||
|
for p in $fish_themes_path
|
||||||
|
for theme in $p/*.fish
|
||||||
|
echo (basename "$theme" | string split -r -m1 .)[1]
|
||||||
|
end
|
||||||
|
end
|
||||||
|
end
|
||||||
|
|
||||||
|
# Add a completion for themes
|
||||||
|
complete --command fish_theme --arguments '(__fish_theme_list)' --no-files --description "Fish theme"
|
||||||
@ -1,8 +1,11 @@
|
|||||||
if not contains -- "$fish_synced_dir/functions" $fish_function_path
|
if not contains -- "$fish_synced_dir/functions" $fish_function_path
|
||||||
set -p fish_function_path "$fish_synced_dir/functions"
|
set --prepend fish_function_path "$fish_synced_dir/functions"
|
||||||
end
|
end
|
||||||
if not contains -- "$fish_synced_dir/completions" $fish_complete_path
|
if not contains -- "$fish_synced_dir/completions" $fish_complete_path
|
||||||
set -p fish_complete_path "$fish_synced_dir/completions"
|
set --prepend fish_complete_path "$fish_synced_dir/completions"
|
||||||
|
end
|
||||||
|
if not contains -- "$fish_synced_dir/themes" $fish_themes_path
|
||||||
|
set --path --prepend fish_themes_path "$fish_synced_dir/themes"
|
||||||
end
|
end
|
||||||
|
|
||||||
function _source_synced --description "Sources file from synced dir as well as optional local file"
|
function _source_synced --description "Sources file from synced dir as well as optional local file"
|
||||||
|
|||||||
@ -32,6 +32,6 @@ if status --is-interactive
|
|||||||
eval ($HOME/bin/derive_colors.py --export --fish)
|
eval ($HOME/bin/derive_colors.py --export --fish)
|
||||||
# Set fish theme based on newly exported colors
|
# Set fish theme based on newly exported colors
|
||||||
if set -q FISH_THEME
|
if set -q FISH_THEME
|
||||||
_set_colorscheme "$FISH_THEME"
|
fish_theme "$FISH_THEME"
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|||||||
25
assets/default/fish/themes/solarized_dark.fish
Normal file
25
assets/default/fish/themes/solarized_dark.fish
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
set -g fish_color_autosuggestion 586e75
|
||||||
|
set -g fish_color_cancel -r
|
||||||
|
set -g fish_color_command 93a1a1
|
||||||
|
set -g fish_color_comment 586e75
|
||||||
|
set -g fish_color_cwd green
|
||||||
|
set -g fish_color_cwd_root red
|
||||||
|
set -g fish_color_end 268bd2
|
||||||
|
set -g fish_color_error dc322f
|
||||||
|
set -g fish_color_escape 00a6b2
|
||||||
|
set -g fish_color_history_current --bold
|
||||||
|
set -g fish_color_host normal
|
||||||
|
set -g fish_color_match --background=brblue
|
||||||
|
set -g fish_color_normal normal
|
||||||
|
set -g fish_color_operator 00a6b2
|
||||||
|
set -g fish_color_param 839496
|
||||||
|
set -g fish_color_quote 657b83
|
||||||
|
set -g fish_color_redirection 6c71c4
|
||||||
|
set -g fish_color_search_match bryellow --background=black
|
||||||
|
set -g fish_color_selection white --bold --background=brblack
|
||||||
|
set -g fish_color_user brgreen
|
||||||
|
set -g fish_color_valid_path --underline
|
||||||
|
set -g fish_pager_color_completion B3A06D
|
||||||
|
set -g fish_pager_color_description B3A06D
|
||||||
|
set -g fish_pager_color_prefix cyan --underline
|
||||||
|
set -g fish_pager_color_progress brwhite --background=cyan
|
||||||
25
assets/default/fish/themes/solarized_light.fish
Normal file
25
assets/default/fish/themes/solarized_light.fish
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
set -g fish_color_autosuggestion 93a1a1
|
||||||
|
set -g fish_color_cancel -r
|
||||||
|
set -g fish_color_command 586e75
|
||||||
|
set -g fish_color_comment 93a1a1
|
||||||
|
set -g fish_color_cwd green
|
||||||
|
set -g fish_color_cwd_root red
|
||||||
|
set -g fish_color_end 268bd2
|
||||||
|
set -g fish_color_error dc322f
|
||||||
|
set -g fish_color_escape 00a6b2
|
||||||
|
set -g fish_color_history_current --bold
|
||||||
|
set -g fish_color_host normal
|
||||||
|
set -g fish_color_match --background=brblue
|
||||||
|
set -g fish_color_normal normal
|
||||||
|
set -g fish_color_operator 00a6b2
|
||||||
|
set -g fish_color_param 657b83
|
||||||
|
set -g fish_color_quote 839496
|
||||||
|
set -g fish_color_redirection 6c71c4
|
||||||
|
set -g fish_color_search_match bryellow --background=white
|
||||||
|
set -g fish_color_selection white --bold --background=brblack
|
||||||
|
set -g fish_color_user brgreen
|
||||||
|
set -g fish_color_valid_path --underline
|
||||||
|
set -g fish_pager_color_completion green
|
||||||
|
set -g fish_pager_color_description B3A06D
|
||||||
|
set -g fish_pager_color_prefix cyan --underline
|
||||||
|
set -g fish_pager_color_progress brwhite --background=cyan
|
||||||
25
assets/default/fish/themes/wombat.fish
Normal file
25
assets/default/fish/themes/wombat.fish
Normal file
@ -0,0 +1,25 @@
|
|||||||
|
set -g fish_color_autosuggestion black
|
||||||
|
set -g fish_color_cancel -r
|
||||||
|
set -g fish_color_command yellow
|
||||||
|
set -g fish_color_comment normal
|
||||||
|
set -g fish_color_cwd green
|
||||||
|
set -g fish_color_cwd_root red
|
||||||
|
set -g fish_color_end blue
|
||||||
|
set -g fish_color_error red
|
||||||
|
set -g fish_color_escape magenta
|
||||||
|
set -g fish_color_history_current --bold
|
||||||
|
set -g fish_color_host normal
|
||||||
|
set -g fish_color_match --background=brblue
|
||||||
|
set -g fish_color_normal normal
|
||||||
|
set -g fish_color_operator cyan
|
||||||
|
set -g fish_color_param green
|
||||||
|
set -g fish_color_quote brgreen --italics
|
||||||
|
set -g fish_color_redirection magenta
|
||||||
|
set -g fish_color_search_match bryellow --background=green
|
||||||
|
set -g fish_color_selection white --bold --background=green
|
||||||
|
set -g fish_color_user brgreen
|
||||||
|
set -g fish_color_valid_path --underline
|
||||||
|
set -g fish_pager_color_completion blue
|
||||||
|
set -g fish_pager_color_description blue
|
||||||
|
set -g fish_pager_color_prefix cyan --underline
|
||||||
|
set -g fish_pager_color_progress brwhite --background=cyan
|
||||||
Loading…
Reference in New Issue
Block a user