diff --git a/fish/fish_variables b/fish/fish_variables index fa8bff9..96d6d40 100644 --- a/fish/fish_variables +++ b/fish/fish_variables @@ -1,14 +1,14 @@ # This file contains fish universal variable definitions. # VERSION: 3.0 SETUVAR __fish_initialized:3100 -SETUVAR fish_color_autosuggestion:555\x1ebrblack +SETUVAR fish_color_autosuggestion:BD93F9 SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:005fd7 -SETUVAR fish_color_comment:990000 +SETUVAR fish_color_command:F8F8F2 +SETUVAR fish_color_comment:6272A4 SETUVAR fish_color_cwd:green SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:009900 -SETUVAR fish_color_error:ff0000 +SETUVAR fish_color_end:50FA7B +SETUVAR fish_color_error:FFB86C SETUVAR fish_color_escape:00a6b2 SETUVAR fish_color_history_current:\x2d\x2dbold SETUVAR fish_color_host:normal @@ -16,17 +16,17 @@ SETUVAR fish_color_host_remote:yellow SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue SETUVAR fish_color_normal:normal SETUVAR fish_color_operator:00a6b2 -SETUVAR fish_color_param:00afff -SETUVAR fish_color_quote:999900 -SETUVAR fish_color_redirection:00afff +SETUVAR fish_color_param:FF79C6 +SETUVAR fish_color_quote:F1FA8C +SETUVAR fish_color_redirection:8BE9FD SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack SETUVAR fish_color_status:red SETUVAR fish_color_user:brgreen SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x60help\x60\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish +SETUVAR fish_greeting:\x1d SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:\x1d +SETUVAR fish_pager_color_completion:normal SETUVAR fish_pager_color_description:B3A06D\x1eyellow SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan diff --git a/fish/functions/fish_prompt.fish b/fish/functions/fish_prompt.fish new file mode 100644 index 0000000..a947d88 --- /dev/null +++ b/fish/functions/fish_prompt.fish @@ -0,0 +1,33 @@ +function fish_prompt --description 'Write out the prompt' + set -l last_status $status + + # User + set_color $fish_color_user + echo -n $USER + set_color normal + + echo -n '@' + + # Host + set_color $fish_color_host + echo -n (prompt_hostname) + set_color normal + + echo -n ':' + + # PWD + set_color $fish_color_cwd + echo -n (prompt_pwd) + set_color normal + + __terlar_git_prompt + fish_hg_prompt + echo + + if not test $last_status -eq 0 + set_color $fish_color_error + end + + echo -n '➤ ' + set_color normal +end