Fix fish prompt and misc bugs.

config/fish/config.fish

@@ -1,33 +1,31 @@
-function fish_greeting
-    echo "Hello World"
-end
 # Fish git prompt
 set __fish_git_prompt_showdirtystate 'yes'
-set __fish_git_prompt_showstashstate 'yes'
-set __fish_git_prompt_showuntrackedfiles 'yes'
-set __fish_git_prompt_showupstream 'yes'
 set __fish_git_prompt_color_branch yellow
-set __fish_git_prompt_color_upstream_ahead green
-set __fish_git_prompt_color_upstream_behind red
-
 # Status Chars
 set __fish_git_prompt_char_dirtystate '✗'
-set __fish_git_prompt_char_stagedstate '→'
-set __fish_git_prompt_char_untrackedfiles '☡'
-set __fish_git_prompt_char_stashstate '↩'
-set __fish_git_prompt_char_upstream_ahead '+'
-set __fish_git_prompt_char_upstream_behind '-'
-
 
 function fish_prompt
     set last_status $status
 
-  set_color $fish_color_cwd
+    set_color blue
-  printf '%s' (prompt_pwd)
+    printf '%s ' (date "+%H:%M:%S")
-  set_color normal
 
+    set_color cyan
+    printf '%s' (prompt_pwd)
+
+    set_color normal
     printf '%s ' (__fish_git_prompt)
 
+    if test $last_status -eq 0
+        set_color green
+    else
+        set_color red
+    end
+    printf '➤ '
+
     set_color normal
 end
 
+# no startup message
+function fish_greeting
+end

tmux.conf

@@ -67,16 +67,6 @@ set-option -g status-right '%l:%M%p'
 set-window-option -g window-status-current-fg magenta
 set-option -g status-fg default
 
-# Status Bar solarized-dark (default)
-set-option -g status-bg black
-set-option -g pane-active-border-fg black
-set-option -g pane-border-fg black
-
-# Status Bar solarized-light
-if-shell "[ \"$COLORFGBG\" = \"11;15\" ]" "set-option -g status-bg white"
-if-shell "[ \"$COLORFGBG\" = \"11;15\" ]" "set-option -g pane-active-border-fg white"
-if-shell "[ \"$COLORFGBG\" = \"11;15\" ]" "set-option -g pane-border-fg white"
-
 # Set window notifications
 setw -g monitor-activity on
 set -g visual-activity on
@@ -95,5 +85,3 @@ bind-key -T root WheelDownPane if-shell -F -t = "#{alternate_on}" "send-keys -M"
 # with tmux 2.1. This is backwards-compatible with earlier versions of tmux,
 # AFAICT.
 set-option -g assume-paste-time 0
-
-source-file ~/.tmux.conf.local

vimrc

@@ -103,7 +103,7 @@ autocmd BufRead,BufNewFile *.md set spell
 """ FIXES
 " automatically rebalance windows on vim resize
 autocmd VimResized * :wincmd =
-if exists('$TMUX')  " Support resizing in tmux
+if exists('$TMUX') && !has('nvim') " Support resizing in tmux
   set ttymouse=xterm2
 endif
 " Fix Cursor in TMUX