Browse Source

update fish settings

master
parent
commit
0a8a0d3880
2 changed files with 23 additions and 14 deletions
  1. +14
    -13
      files/shells/fish/global/fish_prompt.fish
  2. +9
    -1
      files/shells/fish/global/fish_title.fish

+ 14
- 13
files/shells/fish/global/fish_prompt.fish View File

@@ -1,27 +1,28 @@
# target format: user@host:~$
function fish_prompt --description 'prompt'

# Just calculate this once, to save a few cycles when displaying the prompt
if not set -q __fish_prompt_hostname
set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end

set -l color_prompt
set -g fish_prompt_pwd_dir_length 0

set -l prefix
set -l suffix

switch $USER
case root toor
if set -q fish_color_cwd_root
set color_prompt $fish_color_cwd_root
else
set color_prompt $fish_color_cwd
end
set suffix '#'
set prefix (set_color -o brred)"$__fish_prompt_hostname"(set_color normal)(set_color -d '#AAAAAA')":"
set suffix (set_color red)"#>"
case '*'
echo -n -s "$USER" @
set color_prompt $fish_color_cwd
set suffix '>'
set prefix (set_color green)"$USER"(set_color normal)(set_color -d '#AAAAAA')"@"(set_color normal)(set_color -o white)"$__fish_prompt_hostname"(set_color normal)(set_color '#AAAAAA')":"
set suffix (set_color green)">"
end

if [ "$XDG_SESSION_TYPE" != "x11" ]
echo -n -s "$prefix"
end

set -g fish_prompt_pwd_dir_length 0
echo -n -s (set_color normal)(set_color -o blue) (prompt_pwd) (set_color normal) " $suffix "

echo -n -s "$__fish_prompt_hostname" : (prompt_pwd) (set_color normal) " " (set_color $color_prompt) "$suffix "
end

+ 9
- 1
files/shells/fish/global/fish_title.fish View File

@@ -4,13 +4,21 @@ function fish_title
set -g __fish_prompt_hostname (hostname|cut -d . -f 1)
end

set -l prefix
set -l suffix

switch $USER
case root toor
set prefix "$__fish_prompt_hostname:"
set suffix '#'
case '*'
set prefix "$USER@$__fish_prompt_hostname:"
set suffix '>'
end

echo -n -s "$USER" @ "$__fish_prompt_hostname" : (prompt_pwd) " $suffix $_"
if [ "$XDG_SESSION_TYPE" != "x11" ]
echo -n -s "$prefix"
end

echo -n -s (prompt_pwd) " $suffix $_"
end