misc

fish/.config/fish/config.fish

@@ -6,7 +6,7 @@ set -x VIRTUAL_ENV_DISABLE_PROMPT true
 
 ## SSH init
 set -x SSH_AUTH_SOCK $XDG_RUNTIME_DIR/ssh-agent.socket
-for f in (ls .ssh/*.pub);
+for f in (ls $HOME/.ssh/*.pub);
   set -l priv (string replace '.pub' '' $f);
   if not contains $priv (ssh-add -l | awk '{ print $3 }')
     ssh-add $priv
@@ -53,3 +53,5 @@ function __autovenv --on-variable PWD
   end
 end
 
+set fish_command_timer_time_format ''
+source ~/.config/fish/command_timer.sh

fish/.config/fish/functions/fish_prompt.fish

@@ -24,7 +24,7 @@ function __bcarlin_prompt_git
     return
   end
 
-  set -l git_branch (echo $git_infos | grep '##' | sed -e 's|## \([^\.]\+\).*|\1|')
+  set -l git_branch (echo $git_infos | grep '##' | sed -e 's/## \([a-zA-Z0-9\/-]\+\)\( \|\.\.\.\|$\).*/\1/')
   set -l has_untracked false
   set -l staged_count 0
   set -l changed_count 0