Merge branch 'master' of gitlab.com:chriscochrun/dotfiles

fish/config.fish

@@ -2,7 +2,7 @@
 
 set -U fish_user_paths $HOME/.local/bin $HOME/scripts $HOME/.doom-emacs/bin $HOME/.emacs.d/bin
 set TERM "xterm-256color"
-set EDITOR "emacsclient -t -a"
+set EDITOR "emacsclient -c -a"
 set VISUAL "emacsclient -c -a emacs"
 
 ### PROMPT ###
@@ -16,10 +16,10 @@ set VISUAL "emacsclient -c -a emacs"
 
 
 function fish_greeting -d "what's up, fish?"
-    set_color $fish_color_autosuggestion[1]
-    uname -npsr
-    uptime
-    set_color normal
+    # set_color $fish_color_autosuggestion[1]
+    # uname -npsr
+    # uptime
+    # set_color normal
 end
 
 function fish_title
@@ -93,9 +93,9 @@ end
 
 function _prompt_status_arrows -a exit_code
     if test $exit_code -ne 0
-        set arrow_colors 600 900 c00 f00
+        set arrow_colors green
     else
-        set arrow_colors 060 090 0c0 0f0
+        set arrow_colors green
     end
 
     for arrow_color in $arrow_colors
@@ -165,6 +165,18 @@ function fish_right_prompt
     set_color normal
 end
 
+### VI MODES
+# Emulates vim's cursor shape behavior
+# Set the normal and visual mode cursors to a block
+set fish_cursor_default block
+# Set the insert mode cursor to a line
+set fish_cursor_insert line
+# Set the replace mode cursor to an underscore
+set fish_cursor_replace_one underscore
+# The following variable can be used to configure cursor shape in
+# visual mode, but due to fish_cursor_default, is redundant here
+set fish_cursor_visual block
+
 ### BANG BANG FUNCTIONS
 function __history_previous_command
     switch (commandline -t)
@@ -197,4 +209,4 @@ end
 
 ### ALIASES
 alias pac "paru"
-alias yeet "paru -Rcs"
+alias yeet "paru -Rcs"