From e6eb1bedd0a217dd95f2c6257ac65710982b5c4b Mon Sep 17 00:00:00 2001 From: Kevin Mok Date: Fri, 26 Apr 2019 06:41:04 -0400 Subject: [PATCH] Remove private_ prefix from fish dir's --- dot_config/{private_fish => fish}/completions/watson.fish | 0 dot_config/{private_fish => fish}/config.fish.tmpl | 2 +- .../private_functions => fish/functions}/369/a2/carsim.fish | 0 .../private_functions => fish/functions}/369/a2/gdb-a2.fish | 0 .../functions}/369/a3/gdb-a3-break.fish | 0 .../private_functions => fish/functions}/369/a3/run-a3.fish | 0 .../functions}/369/a4/block-to-line.fish | 0 .../functions}/369/a4/executable_revert-image.fish | 0 .../private_functions => fish/functions}/369/a4/hex.fish | 0 .../functions}/369/a4/mount-image.fish | 0 .../private_functions => fish/functions}/369/a4/run-a4.fish | 0 .../private_functions => fish/functions}/369/grep-c.fish | 0 .../private_functions => fish/functions}/369/grep-headers.fish | 0 .../private_functions => fish/functions}/369/rg-headers.fish | 0 .../private_functions => fish/functions}/369/rgc.fish | 0 .../private_functions => fish/functions}/benq-brightness.fish | 0 .../{private_fish/private_functions => fish/functions}/cd.fish | 0 .../private_functions => fish/functions}/certbot-ssl.fish | 0 .../private_functions => fish/functions}/copy.fish | 0 .../functions}/create-fish-function.fish | 0 .../private_functions => fish/functions}/evince-silent.fish | 0 .../functions}/find-vim-filetype.fish | 0 .../functions}/git/git-amend-push.fish | 0 .../functions}/git/git-delete-branch.fish | 0 .../functions}/git/git-diff-files.fish | 0 .../functions}/git/git-mult-remotes.fish | 0 .../functions}/git/git-push-multiple.fish | 0 .../private_functions => fish/functions}/grep-aliases.fish | 2 +- .../private_functions => fish/functions}/grep-pdf-file.fish | 0 .../private_functions => fish/functions}/grep-pdf.fish | 0 .../private_functions => fish/functions}/pastebin.fish | 0 .../private_functions => fish/functions}/redshift-set.fish | 0 .../private_functions => fish/functions}/scan-history.fish | 0 .../private_functions => fish/functions}/shred-rm.fish | 0 .../private_functions => fish/functions}/ssh-bandit.fish | 0 .../private_functions => fish/functions}/unix-timestamp.fish | 0 .../private_functions => fish/functions}/unzip-rm.fish | 0 .../private_functions => fish/functions}/vsnp.fish | 0 .../private_functions => fish/functions}/wc-pdf.fish | 0 key_aliases.tmpl | 3 ++- key_files.tmpl | 2 +- 41 files changed, 5 insertions(+), 4 deletions(-) rename dot_config/{private_fish => fish}/completions/watson.fish (100%) rename dot_config/{private_fish => fish}/config.fish.tmpl (98%) rename dot_config/{private_fish/private_functions => fish/functions}/369/a2/carsim.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/a2/gdb-a2.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/a3/gdb-a3-break.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/a3/run-a3.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/a4/block-to-line.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/a4/executable_revert-image.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/a4/hex.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/a4/mount-image.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/a4/run-a4.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/grep-c.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/grep-headers.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/rg-headers.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/369/rgc.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/benq-brightness.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/cd.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/certbot-ssl.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/copy.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/create-fish-function.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/evince-silent.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/find-vim-filetype.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/git/git-amend-push.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/git/git-delete-branch.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/git/git-diff-files.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/git/git-mult-remotes.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/git/git-push-multiple.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/grep-aliases.fish (57%) rename dot_config/{private_fish/private_functions => fish/functions}/grep-pdf-file.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/grep-pdf.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/pastebin.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/redshift-set.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/scan-history.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/shred-rm.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/ssh-bandit.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/unix-timestamp.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/unzip-rm.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/vsnp.fish (100%) rename dot_config/{private_fish/private_functions => fish/functions}/wc-pdf.fish (100%) diff --git a/dot_config/private_fish/completions/watson.fish b/dot_config/fish/completions/watson.fish similarity index 100% rename from dot_config/private_fish/completions/watson.fish rename to dot_config/fish/completions/watson.fish diff --git a/dot_config/private_fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl similarity index 98% rename from dot_config/private_fish/config.fish.tmpl rename to dot_config/fish/config.fish.tmpl index 7a02ac0..2600107 100755 --- a/dot_config/private_fish/config.fish.tmpl +++ b/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') diff --git a/dot_config/private_fish/private_functions/369/a2/carsim.fish b/dot_config/fish/functions/369/a2/carsim.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/a2/carsim.fish rename to dot_config/fish/functions/369/a2/carsim.fish diff --git a/dot_config/private_fish/private_functions/369/a2/gdb-a2.fish b/dot_config/fish/functions/369/a2/gdb-a2.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/a2/gdb-a2.fish rename to dot_config/fish/functions/369/a2/gdb-a2.fish diff --git a/dot_config/private_fish/private_functions/369/a3/gdb-a3-break.fish b/dot_config/fish/functions/369/a3/gdb-a3-break.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/a3/gdb-a3-break.fish rename to dot_config/fish/functions/369/a3/gdb-a3-break.fish diff --git a/dot_config/private_fish/private_functions/369/a3/run-a3.fish b/dot_config/fish/functions/369/a3/run-a3.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/a3/run-a3.fish rename to dot_config/fish/functions/369/a3/run-a3.fish diff --git a/dot_config/private_fish/private_functions/369/a4/block-to-line.fish b/dot_config/fish/functions/369/a4/block-to-line.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/a4/block-to-line.fish rename to dot_config/fish/functions/369/a4/block-to-line.fish diff --git a/dot_config/private_fish/private_functions/369/a4/executable_revert-image.fish b/dot_config/fish/functions/369/a4/executable_revert-image.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/a4/executable_revert-image.fish rename to dot_config/fish/functions/369/a4/executable_revert-image.fish diff --git a/dot_config/private_fish/private_functions/369/a4/hex.fish b/dot_config/fish/functions/369/a4/hex.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/a4/hex.fish rename to dot_config/fish/functions/369/a4/hex.fish diff --git a/dot_config/private_fish/private_functions/369/a4/mount-image.fish b/dot_config/fish/functions/369/a4/mount-image.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/a4/mount-image.fish rename to dot_config/fish/functions/369/a4/mount-image.fish diff --git a/dot_config/private_fish/private_functions/369/a4/run-a4.fish b/dot_config/fish/functions/369/a4/run-a4.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/a4/run-a4.fish rename to dot_config/fish/functions/369/a4/run-a4.fish diff --git a/dot_config/private_fish/private_functions/369/grep-c.fish b/dot_config/fish/functions/369/grep-c.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/grep-c.fish rename to dot_config/fish/functions/369/grep-c.fish diff --git a/dot_config/private_fish/private_functions/369/grep-headers.fish b/dot_config/fish/functions/369/grep-headers.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/grep-headers.fish rename to dot_config/fish/functions/369/grep-headers.fish diff --git a/dot_config/private_fish/private_functions/369/rg-headers.fish b/dot_config/fish/functions/369/rg-headers.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/rg-headers.fish rename to dot_config/fish/functions/369/rg-headers.fish diff --git a/dot_config/private_fish/private_functions/369/rgc.fish b/dot_config/fish/functions/369/rgc.fish similarity index 100% rename from dot_config/private_fish/private_functions/369/rgc.fish rename to dot_config/fish/functions/369/rgc.fish diff --git a/dot_config/private_fish/private_functions/benq-brightness.fish b/dot_config/fish/functions/benq-brightness.fish similarity index 100% rename from dot_config/private_fish/private_functions/benq-brightness.fish rename to dot_config/fish/functions/benq-brightness.fish diff --git a/dot_config/private_fish/private_functions/cd.fish b/dot_config/fish/functions/cd.fish similarity index 100% rename from dot_config/private_fish/private_functions/cd.fish rename to dot_config/fish/functions/cd.fish diff --git a/dot_config/private_fish/private_functions/certbot-ssl.fish b/dot_config/fish/functions/certbot-ssl.fish similarity index 100% rename from dot_config/private_fish/private_functions/certbot-ssl.fish rename to dot_config/fish/functions/certbot-ssl.fish diff --git a/dot_config/private_fish/private_functions/copy.fish b/dot_config/fish/functions/copy.fish similarity index 100% rename from dot_config/private_fish/private_functions/copy.fish rename to dot_config/fish/functions/copy.fish diff --git a/dot_config/private_fish/private_functions/create-fish-function.fish b/dot_config/fish/functions/create-fish-function.fish similarity index 100% rename from dot_config/private_fish/private_functions/create-fish-function.fish rename to dot_config/fish/functions/create-fish-function.fish diff --git a/dot_config/private_fish/private_functions/evince-silent.fish b/dot_config/fish/functions/evince-silent.fish similarity index 100% rename from dot_config/private_fish/private_functions/evince-silent.fish rename to dot_config/fish/functions/evince-silent.fish diff --git a/dot_config/private_fish/private_functions/find-vim-filetype.fish b/dot_config/fish/functions/find-vim-filetype.fish similarity index 100% rename from dot_config/private_fish/private_functions/find-vim-filetype.fish rename to dot_config/fish/functions/find-vim-filetype.fish diff --git a/dot_config/private_fish/private_functions/git/git-amend-push.fish b/dot_config/fish/functions/git/git-amend-push.fish similarity index 100% rename from dot_config/private_fish/private_functions/git/git-amend-push.fish rename to dot_config/fish/functions/git/git-amend-push.fish diff --git a/dot_config/private_fish/private_functions/git/git-delete-branch.fish b/dot_config/fish/functions/git/git-delete-branch.fish similarity index 100% rename from dot_config/private_fish/private_functions/git/git-delete-branch.fish rename to dot_config/fish/functions/git/git-delete-branch.fish diff --git a/dot_config/private_fish/private_functions/git/git-diff-files.fish b/dot_config/fish/functions/git/git-diff-files.fish similarity index 100% rename from dot_config/private_fish/private_functions/git/git-diff-files.fish rename to dot_config/fish/functions/git/git-diff-files.fish diff --git a/dot_config/private_fish/private_functions/git/git-mult-remotes.fish b/dot_config/fish/functions/git/git-mult-remotes.fish similarity index 100% rename from dot_config/private_fish/private_functions/git/git-mult-remotes.fish rename to dot_config/fish/functions/git/git-mult-remotes.fish diff --git a/dot_config/private_fish/private_functions/git/git-push-multiple.fish b/dot_config/fish/functions/git/git-push-multiple.fish similarity index 100% rename from dot_config/private_fish/private_functions/git/git-push-multiple.fish rename to dot_config/fish/functions/git/git-push-multiple.fish diff --git a/dot_config/private_fish/private_functions/grep-aliases.fish b/dot_config/fish/functions/grep-aliases.fish similarity index 57% rename from dot_config/private_fish/private_functions/grep-aliases.fish rename to dot_config/fish/functions/grep-aliases.fish index 094a3a9..055c737 100755 --- a/dot_config/private_fish/private_functions/grep-aliases.fish +++ b/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 diff --git a/dot_config/private_fish/private_functions/grep-pdf-file.fish b/dot_config/fish/functions/grep-pdf-file.fish similarity index 100% rename from dot_config/private_fish/private_functions/grep-pdf-file.fish rename to dot_config/fish/functions/grep-pdf-file.fish diff --git a/dot_config/private_fish/private_functions/grep-pdf.fish b/dot_config/fish/functions/grep-pdf.fish similarity index 100% rename from dot_config/private_fish/private_functions/grep-pdf.fish rename to dot_config/fish/functions/grep-pdf.fish diff --git a/dot_config/private_fish/private_functions/pastebin.fish b/dot_config/fish/functions/pastebin.fish similarity index 100% rename from dot_config/private_fish/private_functions/pastebin.fish rename to dot_config/fish/functions/pastebin.fish diff --git a/dot_config/private_fish/private_functions/redshift-set.fish b/dot_config/fish/functions/redshift-set.fish similarity index 100% rename from dot_config/private_fish/private_functions/redshift-set.fish rename to dot_config/fish/functions/redshift-set.fish diff --git a/dot_config/private_fish/private_functions/scan-history.fish b/dot_config/fish/functions/scan-history.fish similarity index 100% rename from dot_config/private_fish/private_functions/scan-history.fish rename to dot_config/fish/functions/scan-history.fish diff --git a/dot_config/private_fish/private_functions/shred-rm.fish b/dot_config/fish/functions/shred-rm.fish similarity index 100% rename from dot_config/private_fish/private_functions/shred-rm.fish rename to dot_config/fish/functions/shred-rm.fish diff --git a/dot_config/private_fish/private_functions/ssh-bandit.fish b/dot_config/fish/functions/ssh-bandit.fish similarity index 100% rename from dot_config/private_fish/private_functions/ssh-bandit.fish rename to dot_config/fish/functions/ssh-bandit.fish diff --git a/dot_config/private_fish/private_functions/unix-timestamp.fish b/dot_config/fish/functions/unix-timestamp.fish similarity index 100% rename from dot_config/private_fish/private_functions/unix-timestamp.fish rename to dot_config/fish/functions/unix-timestamp.fish diff --git a/dot_config/private_fish/private_functions/unzip-rm.fish b/dot_config/fish/functions/unzip-rm.fish similarity index 100% rename from dot_config/private_fish/private_functions/unzip-rm.fish rename to dot_config/fish/functions/unzip-rm.fish diff --git a/dot_config/private_fish/private_functions/vsnp.fish b/dot_config/fish/functions/vsnp.fish similarity index 100% rename from dot_config/private_fish/private_functions/vsnp.fish rename to dot_config/fish/functions/vsnp.fish diff --git a/dot_config/private_fish/private_functions/wc-pdf.fish b/dot_config/fish/functions/wc-pdf.fish similarity index 100% rename from dot_config/private_fish/private_functions/wc-pdf.fish rename to dot_config/fish/functions/wc-pdf.fish diff --git a/key_aliases.tmpl b/key_aliases.tmpl index e047cef..3b5d0da 100755 --- a/key_aliases.tmpl +++ b/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" diff --git a/key_files.tmpl b/key_files.tmpl index c52e057..b8e1da6 100755 --- a/key_files.tmpl +++ b/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