Browse Source

One more theme change #fishshell

Colin Powell 6 years ago
parent
commit
89e29a501c

+ 1 - 1
fish/.config/fish/fishfile

@@ -2,4 +2,4 @@ edc/bass
 jethrokuan/fzf
 2m/fish-gpg-tty
 oh-my-fish/plugin-direnv
-oh-my-fish/theme-idan
+oh-my-fish/theme-syl20bnr

+ 0 - 13
fish/.config/fish/functions/fish_greeting.fish

@@ -1,13 +0,0 @@
-# Set global color styles, for example:
-#
-# function cyan_error
-#   set_color -o red
-# end
-#
-# function cyan_normal
-#   set_color normal
-#
-
-function fish_greeting -d "what's up, fish?"
-        bash (dirname (status -f))/archey.sh
-end

+ 192 - 34
fish/.config/fish/functions/fish_prompt.fish

@@ -1,54 +1,212 @@
-# name: idan
-# Display the following bits on the left:
-# * Virtualenv name (if applicable, see https://github.com/adambrenecki/virtualfish)
-# * Current directory name
-# * Git branch and dirty state (if inside a git repo)
+# name: syl20bnr
 
-function _git_branch_name
+# ----------------------------------------------------------------------------
+# Utils
+# ----------------------------------------------------------------------------
+
+set -g __syl20bnr_display_rprompt 1
+
+function toggle_right_prompt -d "Toggle the right prompt of the syl20bnr theme"
+  if test $__syl20bnr_display_rprompt -eq 0
+    echo "enable right prompt"
+    set __syl20bnr_display_rprompt 1
+  else
+    echo "disable right prompt"
+    set __syl20bnr_display_rprompt 0
+  end
+end
+
+function __syl20bnr_git_branch_name -d "Return the current branch name"
   echo (command git symbolic-ref HEAD 2> /dev/null | sed -e 's|^refs/heads/||')
 end
 
-function _is_git_dirty
-  echo (command git status -s --ignore-submodules=dirty 2> /dev/null)
+function __syl20bnr_git_repo_name -d "Return the current repository name"
+  echo (command basename (git rev-parse --show-toplevel 2> /dev/null))
+end
+
+function __syl20bnr_git_repo_base -d "Return the current repository name"
+  echo (command git rev-parse --show-toplevel 2> /dev/null)
+end
+
+function __syl20bnr_git_status -d "git status command"
+  git status -b -s --ignore-submodules=dirty
 end
 
-function fish_prompt
-  set -l cyan (set_color -o cyan)
-  set -l yellow (set_color -o yellow)
-  set -l red (set_color -o red)
-  set -l blue (set_color -o blue)
-  set -l green (set_color -o green)
-  set -l normal (set_color normal)
+function __syl20bnr_unpushed_commit_count -d "Return the number of unpushed commits"
+  echo $argv[1] | grep -E -o "ahead\ [0-9]+" | awk '{print $2}'
+end
 
-  set -l cwd $cyan(basename (prompt_pwd))
+function __syl20bnr_unmerged_commit_count -d "Return the number of unmerged commits"
+  echo $argv[1] | grep -E -o "behind\ [0-9]+" | awk '{print $2}'
+end
 
-  # output the prompt, left to right
+# ----------------------------------------------------------------------------
+# Aliases
+# ----------------------------------------------------------------------------
 
-  # Add a newline before prompts
-  echo -e ""
+alias trp toggle_right_prompt
 
-  # Display [venvname] if in a virtualenv
-  if set -q VIRTUAL_ENV
-      echo -n -s (set_color -b cyan black) '[' (basename "$VIRTUAL_ENV") ']' $normal ' '
-  end
+# ----------------------------------------------------------------------------
+# Prompts
+# ----------------------------------------------------------------------------
 
-  # Display the current directory name
-  echo -n -s $cwd $normal
+function fish_prompt -d "Write out the left prompt of the syl20bnr theme"
+  set -l last_status $status
+  set -l basedir_name (basename (prompt_pwd))
 
+  # Init colors
 
-  # Show git branch and dirty state
-  if [ (_git_branch_name) ]
-    set -l git_branch '(' (_git_branch_name) ')'
+  set -l colcyan   (set_color cyan)
+  set -l colbcyan  (set_color -o cyan)
+  set -l colgreen  (set_color green)
+  set -l colbgreen (set_color -o green)
+  set -l colnormal (set_color normal)
+  set -l colred    (set_color red)
+  set -l colbred   (set_color -o red)
+  set -l colwhite  (set_color white)
+  set -l colbwhite  (set_color -o white)
+  
+  # Segments
+  
+  # git
+  # If inside a git repo then the pwd segment is replaced by the git
+  # segment.
+  # The git segment format is X:YI@Z:P(N) where:
+  #   X is git
+  #   Y is the current branch
+  #   I is the information about the current repo state
+  #   Z is the name of the repo
+  #   P is the current working path basename (name of the current directory)
+  #   C is the depth of the path starting from base directory of the repo
+  # The displayed information is:
+  #   Unpushed commits are indicated with up arrows
+  #   The number of unpushed commits is indicated right after the up arrows
+  # Note: 
+  #   Dirtiness is indicated by the color of the branch name, red is dirty,
+  #   green is up-to-date.
+  # If P = Z then P(C) is not displayed
+  set -l ps_git ""
+  set -l git_branch_name (__syl20bnr_git_branch_name)
+  if test -n "$git_branch_name"
+    set -l git_repo_name (__syl20bnr_git_repo_name)
+    set -l git_info ""
+    set -l git_status (__syl20bnr_git_status)
+    if echo $git_status | grep ahead > /dev/null
+      set git_info "["$colbgreen"↑"(__syl20bnr_unpushed_commit_count $git_status)$colnormal"]"
+    end
+    if echo $git_status | grep behind > /dev/null
+      set git_info "$git_info""["$colbred"↓"(__syl20bnr_unmerged_commit_count $git_status)$colnormal"]"
+    end
+    set -l colbranch $colbgreen
+    if echo $git_status | grep -E "\s\?\?\s|\sM\s|\sD\s" > /dev/null
+      set colbranch $colbred
+    end
+    set ps_git $colbwhite"git:"$colbcyan$git_branch_name$git_info$colnormal"@"$colbranch$git_repo_name
+    if test "$basedir_name" != "$git_repo_name"
+        set -l basedir_depth (echo (__syl20bnr_git_repo_base) | sed "s/\// /g" | wc -w)
+        set -l depth (echo (pwd) | sed "s/\// /g" | wc -w)
+        set depth (math $depth - $basedir_depth)
+        set ps_git $ps_git$colnormal":"$colbwhite$basedir_name$colnormal"("$depth")"
+    end
+  end
 
-    if [ (_is_git_dirty) ]
-      set git_info $red $git_branch " ★ "
+  # pwd
+  # The pwd segment format is X:P(C) where:
+  #   X is either home or /
+  #   P is the current working path basename (name of the current directory)
+  #   C is the depth of the path starting from X
+  # If the pwd is home or / then the prompt format is simplified to 'home' or
+  # '/' without the current directory and depth.
+  set -l ps_pwd ""
+  if test -z "$ps_git"
+    set -l depth (echo (pwd) | sed "s/\// /g" | wc -w)
+    set -l in_home (echo (pwd) | grep ~)
+    if test -n "$in_home"
+      set ps_pwd $colbwhite"home"
     else
-      set git_info $green $git_branch
+      set ps_pwd $colbwhite"/"
+    end
+    if test (echo (pwd)) != ~ -a (echo (pwd)) != /
+      set ps_pwd $ps_pwd":"$colgreen$basedir_name
+      if test -n "$in_home"
+        set depth (math $depth - 2)
+      end
+      set ps_pwd $ps_pwd$colnormal"("$depth")"
     end
-    echo -n -s ' · ' $git_info $normal
+  end
+      
+  # vi mode
+  # If vi_mode plugin or native vi mode is activated then print the vi mode
+  # in the prompt.
+  set -l ps_vi ""
+  if test -n "$vi_mode"
+    set ps_vi $colnormal"["$vi_mode$colnormal"]"
+  end
+  if test "$fish_key_bindings" = "fish_vi_key_bindings" -o "$fish_key_bindings" = "my_fish_key_bindings" 
+    switch $fish_bind_mode
+      case default
+        set ps_vi $colnormal"("$colred"N"$colnormal")"
+      case insert
+        set ps_vi $colnormal"("$colgreen"I"$colnormal")"
+      case visual
+        set ps_vi $colnormal"("$colwhite"V"$colnormal")"
+    end
+  end
+
+  # end of prompt
+  # The color of the end of the prompt depends on the $status value of the
+  # last executed command. It is green or red depending on the last command
+  # success or failure respectively.
+  # Since I often use ranger and use its 'shift+s' key binding to bring a shell
+  # session, there is discreet indicator when the parent process of the current
+  # shell pid is a ranger process. In this case the end of the prompt is written
+  # twice.
+  # With this indicator I can quickly remember that I can "ctrl+d" to end the
+  # the current shell process and get back to the ranger process.
+  set -l ps_end ">"
+  # indicator for ranger parent process
+  set -l ranger ""
+  set -l os (uname)
+  if test "$os" = "Darwin"
+    if pstree -s ranger | grep (echo %self) | grep -v grep > /dev/null
+      set ranger 1
+    end
+  end
+  if test "$os" = "Linux"
+    if pstree -p -l | grep "fish("(echo %self)")" | grep 'ranger([0-9]*)' > /dev/null
+      set ranger 1
+    end
+  end
+  if test -n "$ranger"
+    set ps_end $ps_end$ps_end
+  end
+  # last status give the color of the right arrows at the end of the prompt
+  if test $last_status -ne 0 
+    set ps_end $colnormal$colbred$ps_end
+  else
+    set ps_end $colnormal$colgreen$ps_end
   end
 
-  # Terminate with a nice prompt char
-  echo -n -s ' ⟩ ' $normal
+  # Left Prompt
 
+  echo -n -s $ps_git $ps_pwd $ps_vi $ps_git_dirty $ps_end ' '
 end
+
+
+function fish_right_prompt -d "Write out the right prompt of the syl20bnr theme"
+  set -l colnormal (set_color normal)
+
+  # Segments
+
+  # The where segment format is X@Y where:
+  #   X is the username
+  #   Y is the hostname
+  set -l ps_where $colnormal(whoami)@(hostname|cut -d . -f 1)
+  
+  # Right Prompt
+
+  if test $__syl20bnr_display_rprompt -eq 1
+    echo -n -s $ps_where
+  end
+end
+

+ 0 - 3
fish/.config/fish/functions/fish_title.fish

@@ -1,3 +0,0 @@
-function fish_title
-# Customize the title bar of the terminal window.
-end