From 8cc81cc8de6734257e9e9951af4fd0296c320ac3 Mon Sep 17 00:00:00 2001
From: Noah Masur <noah.masur@take2games.com>
Date: Sun, 26 Jul 2020 17:31:54 -0400
Subject: [PATCH] more aliases

---
 fish.configlink/fish_variables         | 4 ++++
 fish.configlink/functions/aliases.fish | 4 +++-
 2 files changed, 7 insertions(+), 1 deletion(-)

diff --git a/fish.configlink/fish_variables b/fish.configlink/fish_variables
index d760212..adeb965 100644
--- a/fish.configlink/fish_variables
+++ b/fish.configlink/fish_variables
@@ -3,6 +3,7 @@
 SETUVAR __fish_initialized:3100
 SETUVAR _fish_abbr__01_t:cat
 SETUVAR _fish_abbr_boot:\x24DOTS/scripts/bootstrap
+SETUVAR _fish_abbr_c:cd
 SETUVAR _fish_abbr_ca:cargo
 SETUVAR _fish_abbr_cat:bat
 SETUVAR _fish_abbr_d:deactivate
@@ -13,11 +14,13 @@ SETUVAR _fish_abbr_falias:vim\x20\x24HOME/\x2econfig/fish/functions/aliases\x2ef
 SETUVAR _fish_abbr_fishal:vim\x20\x24HOME/\x2econfig/fish/functions/aliases\x2efish
 SETUVAR _fish_abbr_fishrc:vim\x20\x24HOME/\x2econfig/fish/config\x2efish
 SETUVAR _fish_abbr_frc:vim\x20\x24HOME/\x2econfig/fish/config\x2efish
+SETUVAR _fish_abbr_g:git
 SETUVAR _fish_abbr_ga:git\x20add\x20\x2dA
 SETUVAR _fish_abbr_gc:git\x20commit\x20\x2dm
 SETUVAR _fish_abbr_gd:git\x20diff
 SETUVAR _fish_abbr_gp:git\x20push
 SETUVAR _fish_abbr_gs:git\x20status
+SETUVAR _fish_abbr_gu:git\x20pull
 SETUVAR _fish_abbr_h:http\x20\x2dFh\x20\x2d\x2dall
 SETUVAR _fish_abbr_hosts:sudo\x20vim\x20/etc/hosts
 SETUVAR _fish_abbr_l:ls
@@ -32,6 +35,7 @@ SETUVAR _fish_abbr_runbootstrap:\x24DOTS/scripts/bootstrap
 SETUVAR _fish_abbr_sshc:vim\x20\x7e/\x2essh/config
 SETUVAR _fish_abbr_ssl:openssl\x20req\x20\x2dnew\x20\x2dnewkey\x20rsa\x3a2048\x20\x2dnodes\x20\x2dkeyout\x20server\x2ekey\x20\x2dout\x20server\x2ecsr
 SETUVAR _fish_abbr_te:terraform
+SETUVAR _fish_abbr_v:vim
 SETUVAR _fish_abbr_vimrc:vim\x20\x24HOME/\x2econfig/nvim/init\x2evim
 SETUVAR fish_color_autosuggestion:686868
 SETUVAR fish_color_cancel:\x2dr
diff --git a/fish.configlink/functions/aliases.fish b/fish.configlink/functions/aliases.fish
index 45b8129..1f1608f 100644
--- a/fish.configlink/functions/aliases.fish
+++ b/fish.configlink/functions/aliases.fish
@@ -7,15 +7,18 @@ function aliases --description 'All aliases'
     abbr -a l 'ls'                              # Quicker shortcut for ls
     abbr -a lh 'ls -lh'                         # Pretty vertical list
     abbr -a ll 'ls -alhF'                       # Include hidden files
+    abbr -a c 'cd'
 
     # Git
     abbr -a gs 'git status'
     abbr -a gd 'git diff'
     abbr -a ga 'git add -A'
     abbr -a gc 'git commit -m'
+    abbr -a gu 'git pull'
     abbr -a gp 'git push'
 
     # Vim
+    abbr -a v 'vim'
     if command -v nvim > /dev/null
         alias vim='nvim'                                    # Use neovim if installed
         abbr -a vimrc 'vim $HOME/.config/nvim/init.vim'     # Edit ".vimrc" file
@@ -24,7 +27,6 @@ function aliases --description 'All aliases'
     # Improved CLI Tools
     alias ping='prettyping --nolegend'
     abbr -a cat 'bat'                           # Swap cat with bat
-    abbr -a oldcat 'cat'                        # If we need to use cat
     abbr -a h 'http -Fh --all'                  # Curl site for headers
 
     # Fun CLI Tools