From dd3193d7603f09944cc1fdc9d2e7c4e018a34578 Mon Sep 17 00:00:00 2001
From: Kevin Mok <kevin.mok@live.ca>
Date: Tue, 29 Jan 2019 01:09:16 -0500
Subject: [PATCH] Update (before using stow)

---
 aliases/key_aliases    |  1 +
 dotfiles/.vimrc        |  1 +
 dotfiles/.zshrc        | 15 +++++++++++----
 scripts/sync-shortcuts |  2 +-
 txt/key_dirs.txt       |  2 +-
 txt/key_files.txt      |  2 +-
 6 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/aliases/key_aliases b/aliases/key_aliases
index 99f78cb..adcb121 100644
--- a/aliases/key_aliases
+++ b/aliases/key_aliases
@@ -4,6 +4,7 @@
 cs "printf '\033c'"
 hst "history"
 nf "cs && neofetch | lolcat"
+fi "fish"
 # reload urxvt
 ru "xrdb ~/.Xresources"
 # list file sizes in megabytes with depth 1
diff --git a/dotfiles/.vimrc b/dotfiles/.vimrc
index f90b352..5e63c6e 100644
--- a/dotfiles/.vimrc
+++ b/dotfiles/.vimrc
@@ -160,6 +160,7 @@ Plug 'PotatoesMaster/i3-vim-syntax'
 Plug 'scrooloose/nerdtree', { 'on': 'NERDTreeToggle' }
 Plug 'terryma/vim-multiple-cursors'
 	" let g:multi_cursor_select_all_word_key='<C-a>'
+Plug 'dag/vim-fish'
 
 call plug#end()
 
diff --git a/dotfiles/.zshrc b/dotfiles/.zshrc
index cf52fd0..426b3d1 100644
--- a/dotfiles/.zshrc
+++ b/dotfiles/.zshrc
@@ -102,8 +102,10 @@ source ~/linux-config/aliases/zsh_aliases
 # ZSH_THEME="miloshadzic"
 # ZSH_THEME="agnoster"
 
+#  antigen {{{ # 
+
 source $ZSH/custom/antigen.zsh
-antigen bundle last-working-dir 
+# antigen bundle last-working-dir
 antigen bundle pass 
 
 antigen bundle hlissner/zsh-autopair
@@ -114,17 +116,22 @@ antigen bundle desyncr/auto-ls
 antigen theme molovo/filthy
 antigen apply
 
+#  }}} antigen # 
+
 if [[ ! $DISPLAY && $XDG_VTNR -eq 1 ]]; then
   exec startx
 fi
 
-# pywal
+#  pywal {{{ # 
+
 export PATH="${PATH}:${HOME}/.local/bin/:${HOME}/linux-config/scripts:/opt/pycharm-2018.3.1/bin:${HOME}/linux-config/scripts/colors"
 (cat ~/.cache/wal/sequences &)
 # export pywal colors
 source ~/.cache/wal/colors.sh
 export COLOR7=$color7
 
+#  }}} pywal # 
+
 xset r rate 200 60
 
 #  laptop specific {{{ # 
@@ -168,8 +175,8 @@ source /home/kevin/.shortcuts
 source /home/kevin/coding/spotify-lib-vis/src/api-keys.sh
 [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
-# add-zsh-hook -Uz chpwd (){ ls -a; }
-
 export GPG_TTY=$(tty)
 export PASSWORD_STORE_CLIP_TIME=120
 source /home/kevin/.key_aliases
+
+exec fish
diff --git a/scripts/sync-shortcuts b/scripts/sync-shortcuts
index 6304889..5290e56 100755
--- a/scripts/sync-shortcuts
+++ b/scripts/sync-shortcuts
@@ -42,7 +42,7 @@ printf "# vim: filetype=sh\\nalias " > "$aliases"
 # Format the key file in the correct syntax and sent it to all configs.
 sed "s/\s*#.*$//;/^\s*$/d" "$key_dirs" | tee \
 	>(awk '{print $1"=\"cd "$2" && ls -a\" \\"}' >> "$aliases") \
-	>(awk '{print "abbr", $1, "\"cd " $2 "; and ls -a\""}' >> "$fish_abbr") \
+	>(awk '{print "abbr", $1, "\"cd " $2 "\""}' >> "$fish_abbr") \
 	| awk '{print "map f"$1, "cd", $2;
 		print "map t"$1, "tab_new", $2;
 		print "map m"$1, "shell mv -v", $2;
diff --git a/txt/key_dirs.txt b/txt/key_dirs.txt
index 811addd..b5f01ad 100644
--- a/txt/key_dirs.txt
+++ b/txt/key_dirs.txt
@@ -5,7 +5,7 @@ cf /home/kevin/.config
 lc /home/kevin/linux-config/
 d  /home/kevin/Downloads
 D  /home/kevin/Documents
-fi /home/kevin/.config/fish
+fs /home/kevin/.config/fish
 k /home/kevin/
 lc /home/kevin/linux-config/
 me /run/media/kevin
diff --git a/txt/key_files.txt b/txt/key_files.txt
index e49acec..f96637f 100644
--- a/txt/key_files.txt
+++ b/txt/key_files.txt
@@ -11,7 +11,7 @@ sr /home/kevin/linux-config/configs/ranger/shortcuts.conf
 ss /home/kevin/.shortcuts
 u /home/kevin/.Xresources
 v /home/kevin/.vimrc
-y /home/kevin/.zshrc
+# y /home/kevin/.zshrc
 z /home/kevin/linux-config/aliases/zsh_aliases
 
 # }}} sys *