diff options
Diffstat (limited to 'etc')
-rw-r--r-- | etc/config.fish.in (renamed from etc/fish.in) | 8 | ||||
-rw-r--r-- | etc/fish_interactive.fish.in | 103 |
2 files changed, 5 insertions, 106 deletions
diff --git a/etc/fish.in b/etc/config.fish.in index 1c85fb28..648fcac9 100644 --- a/etc/fish.in +++ b/etc/config.fish.in @@ -59,6 +59,8 @@ end # Load additional initialization files # -for i in fish.d/*.fish - . $i -end +if test -d include + for i in include/*.fish + . $i + end +end
\ No newline at end of file diff --git a/etc/fish_interactive.fish.in b/etc/fish_interactive.fish.in deleted file mode 100644 index 4e96daba..00000000 --- a/etc/fish_interactive.fish.in +++ /dev/null @@ -1,103 +0,0 @@ -# -# Initializations that should only be performed when in interactive mode -# -# @configure_input@ - -if not status --is-interactive - exit -end - -# -# Set exit message -# - -function fish_on_exit -d (_ "Commands to execute when fish exits") --on-process %self - printf (_ "Good bye\n") -end - -# -# Set INPUTRC to something nice -# -# We override INPUTRC if already set, since it may be set by a shell -# other than fish, which may use a different file. The new value should -# be exported, since the fish inputrc file plays nice with other files -# by including them when found. -# Give priority to the default file installed with fish in -# @sysconfdir@/fish_inputrc. -# - -for i in ~/.fish_inputrc @sysconfdir@/fish_inputrc ~/.inputrc /etc/inputrc - if test -f $i - set -xg INPUTRC $i - break - end -end - - -# -# Set various defaults using these throwaway functions -# - -function set_default -d "Set an universal variable, unless it has already been set" - if not set -q $argv[1] - set -U -- $argv - end - if not set -q $argv[1] - set -g -- $argv - end -end - -function set_exported_default -d "Set an exported universal variable, unless it has already been set" - if not set -q $argv[1] - set -Ux -- $argv - end - if not set -q $argv[1] - set -gx -- $argv - end -end - - -# Regular syntax highlighting colors -set_default fish_color_normal normal -set_default fish_color_command green -set_default fish_color_redirection normal -set_default fish_color_comment red -set_default fish_color_error red --bold -set_default fish_color_escape cyan -set_default fish_color_operator cyan -set_default fish_color_quote brown -set_default fish_color_valid_path --underline - -set_default fish_color_cwd green - -# Background color for matching quotes and parenthesis -set_default fish_color_match cyan - -# Background color for search matches -set_default fish_color_search_match purple - -# Pager colors -set_default fish_pager_color_prefix cyan -set_default fish_pager_color_completion normal -set_default fish_pager_color_description normal -set_default fish_pager_color_progress cyan - -# -# Directory history colors -# - -set_default fish_color_history_current cyan - - -# -# Setup the CDPATH variable -# - -set_default CDPATH . ~ - -# -# Remove temporary functions for setting default variable values -# - -functions -e set_exported_default -functions -e set_default |