mirror of
https://github.com/fish-shell/fish-shell
synced 2025-01-13 13:39:02 +00:00
__fish_config_interactive: remove Linux exception
And update colors.
This commit is contained in:
Aaron Gyes
parent
5afd939f3e
commit
82b298dcc5
1 changed files with 18 additions and 61 deletions
|
|
@ -37,7 +37,7 @@ function __fish_config_interactive -d "Initializations that should be performed
|
|||
set -q fish_color_normal
|
||||
or set -U fish_color_normal normal
|
||||
set -q fish_color_command
|
||||
or set -U fish_color_command brblue
|
||||
or set -U fish_color_command --bold
|
||||
set -q fish_color_param
|
||||
or set -U fish_color_param cyan
|
||||
set -q fish_color_redirection
|
||||
|
|
@ -45,19 +45,19 @@ function __fish_config_interactive -d "Initializations that should be performed
|
|||
set -q fish_color_comment
|
||||
or set -U fish_color_comment red
|
||||
set -q fish_color_error
|
||||
or set -U fish_color_error red --bold
|
||||
or set -U fish_color_error brred
|
||||
set -q fish_color_escape
|
||||
or set -U fish_color_escape cyan
|
||||
or set -U fish_color_escape bryellow
|
||||
set -q fish_color_operator
|
||||
or set -U fish_color_operator cyan
|
||||
set -q fish_color_end
|
||||
or set -U fish_color_end green
|
||||
set -q fish_color_quote
|
||||
or set -U fish_color_quote brown
|
||||
or set -U fish_color_quote yellow
|
||||
set -q fish_color_autosuggestion
|
||||
or set -U fish_color_autosuggestion brgrey
|
||||
or set -U fish_color_autosuggestion 222 brblack
|
||||
set -q fish_color_user
|
||||
or set -U fish_color_user green
|
||||
or set -U fish_color_user brgreen
|
||||
|
||||
set -q fish_color_host
|
||||
or set -U fish_color_host normal
|
||||
|
|
@ -71,23 +71,23 @@ function __fish_config_interactive -d "Initializations that should be performed
|
|||
|
||||
# Background color for matching quotes and parenthesis
|
||||
set -q fish_color_match
|
||||
or set -U fish_color_match cyan
|
||||
or set -U fish_color_match brwhite
|
||||
|
||||
# Background color for search matches
|
||||
set -q fish_color_search_match
|
||||
or set -U fish_color_search_match --background=purple
|
||||
or set -U fish_color_search_match --background=magenta
|
||||
|
||||
# Background color for selections
|
||||
set -q fish_color_selection
|
||||
or set -U fish_color_selection --background=purple
|
||||
or set -U fish_color_selection --background=magenta
|
||||
|
||||
# Pager colors
|
||||
set -q fish_pager_color_prefix
|
||||
or set -U fish_pager_color_prefix cyan
|
||||
or set -U fish_pager_color_prefix brcyan
|
||||
set -q fish_pager_color_completion
|
||||
or set -U fish_pager_color_completion normal
|
||||
set -q fish_pager_color_description
|
||||
or set -U fish_pager_color_description brgrey
|
||||
or set -U fish_pager_color_description brblack
|
||||
set -q fish_pager_color_progress
|
||||
or set -U fish_pager_color_progress cyan
|
||||
|
||||
|
|
@ -146,11 +146,13 @@ function __fish_config_interactive -d "Initializations that should be performed
|
|||
# Completions for SysV startup scripts. These aren't bound to any
|
||||
# specific command, so they can't be autoloaded.
|
||||
#
|
||||
complete -x -p "/etc/init.d/*" -a start --description 'Start service'
|
||||
complete -x -p "/etc/init.d/*" -a stop --description 'Stop service'
|
||||
complete -x -p "/etc/init.d/*" -a status --description 'Print service status'
|
||||
complete -x -p "/etc/init.d/*" -a restart --description 'Stop and then start service'
|
||||
complete -x -p "/etc/init.d/*" -a reload --description 'Reload service configuration'
|
||||
if test -d /etc/init.d
|
||||
complete -x -p "/etc/init.d/*" -a start --description 'Start service'
|
||||
complete -x -p "/etc/init.d/*" -a stop --description 'Stop service'
|
||||
complete -x -p "/etc/init.d/*" -a status --description 'Print service status'
|
||||
complete -x -p "/etc/init.d/*" -a restart --description 'Stop and then start service'
|
||||
complete -x -p "/etc/init.d/*" -a reload --description 'Reload service configuration'
|
||||
end
|
||||
|
||||
# Make sure some key bindings are set
|
||||
if not set -q fish_key_bindings
|
||||
|
|
@ -264,49 +266,4 @@ function __fish_config_interactive -d "Initializations that should be performed
|
|||
end
|
||||
end
|
||||
end
|
||||
|
||||
if test $TERM = "linux" # A linux in-kernel VT with 8 colors and 256/512 glyphs
|
||||
# In a VT we have
|
||||
# black (invisible)
|
||||
# red
|
||||
# green
|
||||
# yellow
|
||||
# blue
|
||||
# magenta
|
||||
# cyan
|
||||
# white
|
||||
|
||||
# Pretty much just set at random
|
||||
set -g fish_color_normal normal
|
||||
set -g fish_color_command yellow
|
||||
set -g fish_color_param cyan
|
||||
set -g fish_color_redirection normal
|
||||
set -g fish_color_comment red
|
||||
set -g fish_color_error red
|
||||
set -g fish_color_escape cyan
|
||||
set -g fish_color_operator cyan
|
||||
set -g fish_color_quote blue
|
||||
set -g fish_color_autosuggestion yellow
|
||||
set -g fish_color_valid_path
|
||||
set -g fish_color_cwd green
|
||||
set -g fish_color_cwd_root red
|
||||
set -g fish_color_match cyan
|
||||
set -g fish_color_history_current cyan
|
||||
set -g fish_color_search_match cyan
|
||||
set -g fish_color_selection blue
|
||||
set -g fish_color_end yellow
|
||||
set -g fish_color_host normal
|
||||
set -g fish_color_status red
|
||||
set -g fish_color_user green
|
||||
set -g fish_pager_color_prefix cyan
|
||||
set -g fish_pager_color_completion normal
|
||||
set -g fish_pager_color_description yellow
|
||||
set -g fish_pager_color_progress cyan
|
||||
|
||||
# Set fish_prompt to a VT-friendly version
|
||||
# without color or unicode
|
||||
function fish_prompt
|
||||
fish_fallback_prompt
|
||||
end
|
||||
end
|
||||
end
|
||||
|
|
|
|||
Loading…
Reference in a new issue