From 9701151655d33ccf59c6a99337a022470236796e Mon Sep 17 00:00:00 2001
From: Shawn Anderson <shawn@longtailfinancial.com>
Date: Fri, 28 Oct 2022 11:45:50 -0700
Subject: [PATCH] Update fish config.

---
 dotfiles/.config/fish/config.fish          |  2 ++
 dotfiles/.config/fish/config/abbr.fish     | 17 +++++++++++++++--
 dotfiles/.config/fish/config/programs.fish | 12 +++---------
 3 files changed, 20 insertions(+), 11 deletions(-)

diff --git a/dotfiles/.config/fish/config.fish b/dotfiles/.config/fish/config.fish
index 9ec9d34..8615be7 100644
--- a/dotfiles/.config/fish/config.fish
+++ b/dotfiles/.config/fish/config.fish
@@ -10,3 +10,5 @@ source ~/.config/fish/config/abbr.fish
 source ~/.config/fish/config/keys.fish
 source ~/.config/fish/config/plugins.fish
 source ~/.config/fish/config/programs.fish
+
+set -gx GOPATH $HOME/go; set -gx GOROOT $HOME/.go; set -gx PATH $GOPATH/bin $PATH; # g-install: do NOT edit, see https://github.com/stefanmaric/g
diff --git a/dotfiles/.config/fish/config/abbr.fish b/dotfiles/.config/fish/config/abbr.fish
index 0adc565..752d6d3 100644
--- a/dotfiles/.config/fish/config/abbr.fish
+++ b/dotfiles/.config/fish/config/abbr.fish
@@ -9,5 +9,18 @@ abbr gs git status
 abbr pd prevd
 
 # Programs
-#abbr vim nvim
-#abbr cat bat
+
+# Neovim
+if type nvim &> /dev/null                     
+    abbr vim nvim
+end
+
+# Batcat
+if type batcat &> /dev/null                     
+    abbr cat batcat
+end
+
+# Ripgrep
+if type rg &> /dev/null                     
+    abbr grep rg
+end
diff --git a/dotfiles/.config/fish/config/programs.fish b/dotfiles/.config/fish/config/programs.fish
index bfd7dda..74c2c53 100644
--- a/dotfiles/.config/fish/config/programs.fish
+++ b/dotfiles/.config/fish/config/programs.fish
@@ -29,9 +29,9 @@ if type d &> /dev/null
 end
 
 # Ctrl-o for preview file using bat
-if type bat &> /dev/null                     
-  set FZF_PREVIEW_FILE_CMD "bat"
-  set FZF_CTRL_O_COMMAND "bat ~/.local/share/autojump/autojump.txt | sort -nr | fzf-tmux +s | awk -F '\t' '{printf \$2}'"
+if type batcat &> /dev/null                     
+  set FZF_PREVIEW_FILE_CMD "batcat"
+  set FZF_CTRL_O_COMMAND "batcat ~/.local/share/autojump/autojump.txt | sort -nr | fzf-tmux +s | awk -F '\t' '{printf \$2}'"
   bind \co eval $FZF_CTRL_O_COMMAND
 end
 
@@ -42,9 +42,3 @@ end
 
 # Alt-c for directory history using blsd
 command -v blsd > /dev/null && export FZF_ALT_C_COMMAND='blsd'
-
-
-#-------------------------------------------------------------------------------
-# GO
-set -gx GOPATH $HOME/go; set -gx GOROOT $HOME/.go; set -gx PATH $GOPATH/bin $PATH; # g-install: do NOT edit, see https://github.com/stefanmaric/g
-