Remove private_ prefix from fish dir's

dot_config/private_fish/config.fish.tmpl → dot_config/fish/config.fish.tmpl

@@ -27,7 +27,7 @@ bind \cr forward-word
 chezmoi apply
 ~/scripts/sync-shortcuts
 # source ~/.config/fish/key_abbr.fish > /dev/null
-set -U fish_fxn_dir "{{ .chezmoi.homedir }}/linux-config/dot_config/private_fish/private_functions"
+set -U fish_fxn_dir "{{ .chezmoi.homedir }}/linux-config/dot_config/fish/functions"
 # set -U fish_fxn_dir "~/.config/fish/functions"
 abbr ff "cd $fish_fxn_dir"
 for fxn in (find $fish_fxn_dir -name '*.fish')

dot_config/private_fish/private_functions/grep-aliases.fish → dot_config/fish/functions/grep-aliases.fish

@@ -1,5 +1,5 @@
 function grep-aliases
-	set key_aliases /home/kevin/linux-config/aliases/key_aliases
+	set key_aliases ~/key_aliases
 	rg $argv[1] $key_aliases
 	# rg "^$argv[1]" $key_aliases
 end

key_aliases.tmpl

@@ -310,6 +310,8 @@ gchpc "git cherry-pick --continue"
 gst "git stash"
 gstl "git stash list"
 gstp "git stash pop"
+gsts "git stash show stash@\{0\} -p"
+gclear "git stash clear"
 
 gpl "git pull --rebase"
 grba "git rebase --abort"
@@ -331,7 +333,6 @@ gpsi "git config credential.helper store && git push"
 # gpsn "git push --set-upstream origin master"
 gpsn "eval (git push 2>&1 | tail -n 2)"
 gpsf "git push --force"
-gclear "git stash clear"
 
 # assume file unchanged
 gunc "git update-index --assume-unchanged"

key_files.tmpl

@@ -14,7 +14,7 @@ sr ~/linux-config/configs/ranger/shortcuts.conf
 ss ~/.shortcuts
 u ~/.Xresources
 v ~/linux-config/dot_vimrc.tmpl
-x ~/linux-config/dot_config/private_fish/config.fish.tmpl
+x ~/linux-config/dot_config/fish/config.fish.tmpl
 y ~/.zshrc
 z ~/linux-config/aliases/zsh_aliases