diff options
| -rw-r--r-- | fish/.config/fish/config.fish | 6 | ||||
| -rw-r--r-- | fish/.config/fish/functions/fish_prompt.fish | 40 |
2 files changed, 46 insertions, 0 deletions
diff --git a/fish/.config/fish/config.fish b/fish/.config/fish/config.fish index 10fa81d..c5afd75 100644 --- a/fish/.config/fish/config.fish +++ b/fish/.config/fish/config.fish @@ -8,3 +8,9 @@ if status is-interactive # Commands to run in interactive sessions can go here end abbr -a --position anywhere --set-cursor='%' -- drun '2> /dev/null > /dev/null & disown' +set SSH_AUTH_SOCK $XDG_RUNTIME_DIR/hissh-agent +export SSH_AUTH_SOCK + +#if test "$TERM" = "xterm-kitty" +# tput cup $COLUMNS 0 +#end diff --git a/fish/.config/fish/functions/fish_prompt.fish b/fish/.config/fish/functions/fish_prompt.fish new file mode 100644 index 0000000..f47ca66 --- /dev/null +++ b/fish/.config/fish/functions/fish_prompt.fish @@ -0,0 +1,40 @@ +function fish_prompt + if test "$TERM" = "xterm-kitty" + tput cup $COLUMNS 0 + echo -n "] " + else + orig_fish_prompt + end +end + +function orig_fish_prompt --description 'Write out the prompt' + set -l last_pipestatus $pipestatus + set -lx __fish_last_status $status # Export for __fish_print_pipestatus. + set -l normal (set_color normal) + set -q fish_color_status + or set -g fish_color_status red + + # Color the prompt differently when we're root + set -l color_cwd $fish_color_cwd + set -l suffix '>' + if functions -q fish_is_root_user; and fish_is_root_user + if set -q fish_color_cwd_root + set color_cwd $fish_color_cwd_root + end + set suffix '#' + end + + # Write pipestatus + # If the status was carried over (if no command is issued or if `set` leaves the status untouched), don't bold it. + set -l bold_flag --bold + set -q __fish_prompt_status_generation; or set -g __fish_prompt_status_generation $status_generation + if test $__fish_prompt_status_generation = $status_generation + set bold_flag + end + set __fish_prompt_status_generation $status_generation + set -l status_color (set_color $fish_color_status) + set -l statusb_color (set_color $bold_flag $fish_color_status) + set -l prompt_status (__fish_print_pipestatus "[" "]" "|" "$status_color" "$statusb_color" $last_pipestatus) + + echo -n -s (prompt_login)' ' (set_color $color_cwd) (prompt_pwd) $normal (fish_vcs_prompt) $normal " "$prompt_status $suffix " " +end |