From 5df7a59081ad66ee7b3eed344b3b9ebb36517b83 Mon Sep 17 00:00:00 2001 From: Wryn Wagner Date: Thu, 16 Sep 2021 12:13:05 -0600 Subject: [PATCH] Added external plugins as submodules --- .gitmodules | 6 ++++++ env/env.zsh | 33 +++++++++++++++++++++++-------- setup/os-dependencies/arch.txt | 2 ++ setup/os-dependencies/debian.txt | 2 ++ setup/os-dependencies/generic.txt | 2 ++ zsh/plugins/fzf-tab | 1 + zsh/plugins/z | 1 + 7 files changed, 39 insertions(+), 8 deletions(-) create mode 160000 zsh/plugins/fzf-tab create mode 160000 zsh/plugins/z diff --git a/.gitmodules b/.gitmodules index daf8ecd..04d513e 100644 --- a/.gitmodules +++ b/.gitmodules @@ -2,3 +2,9 @@ path = zsh/utils/color url = https://wryn.cloud/gizmos/color-zsh update = rebase +[submodule "z-navigator"] + path = zsh/plugins/z + url = https://github.com/rupa/z.git +[submodule "fzf-tab"] + path = zsh/plugins/fzf-tab + url = https://github.com/Aloxaf/fzf-tab diff --git a/env/env.zsh b/env/env.zsh index d5d4bb0..931b321 100644 --- a/env/env.zsh +++ b/env/env.zsh @@ -1,20 +1,37 @@ -# script path references +##################################################################### +### Path References ################################################# +##################################################################### DOTWRYN="$HOME/.wryn" -SCHOOL_PATH="$HOME/School" - SFX_PATH="$HOME/Media/sfx" WALLPAPER_PATH="$HOME/Pictures/bg" +##################################################################### +### Applications / Application Settings ############################# +##################################################################### + # ordered from least-preferred to most-preferred PREFERRED_EDITOR=(vi vim) -# plays audio files located throughout the system +# should play an audio file argument MEDIA_ENGINE='canberra-gtk-play -f' -# default applications WEBBROWSER='google-chrome-stable' - TMUX_DEFAULT_SESSION_NAME='main' -# external plugins -EXTERNAL_PLUGIN_LIST=() +##################################################################### +### External Plugins / Settings ##################################### +##################################################################### + +EXTERNAL_PLUGIN_LIST=( + "$DOTWRYN/zsh/plugins/z/z.sh" + '/usr/share/fzf/key-bindings.zsh' + '/usr/share/fzf/completion.zsh' + "$DOTWRYN/zsh/plugins/fzf-tab/fzf-tab.plugin.zsh" + ) + +FZF_DEFAULT_OPTS='--reverse' +FZF_DEFAULT_COMMAND='rg --files' + +zstyle ':fzf-tab:*' accept-line enter +zstyle ':fzf-tab:*' fzf-bindings 'space:accept' ';:toggle' +zstyle ':fzf-tab:*' continuous-trigger '/' diff --git a/setup/os-dependencies/arch.txt b/setup/os-dependencies/arch.txt index 8ac64ab..8175f09 100644 --- a/setup/os-dependencies/arch.txt +++ b/setup/os-dependencies/arch.txt @@ -1,5 +1,7 @@ cmake cowsay figlet +fzf lolcat python +ripgrep diff --git a/setup/os-dependencies/debian.txt b/setup/os-dependencies/debian.txt index f22323a..1c5d151 100644 --- a/setup/os-dependencies/debian.txt +++ b/setup/os-dependencies/debian.txt @@ -1,5 +1,7 @@ cmake cowsay figlet +fzf lolcat python3-dev +ripgrep diff --git a/setup/os-dependencies/generic.txt b/setup/os-dependencies/generic.txt index 5de4d63..c460108 100644 --- a/setup/os-dependencies/generic.txt +++ b/setup/os-dependencies/generic.txt @@ -1,5 +1,7 @@ cmake cowsay figlet +fzf lolcat python3 +rg diff --git a/zsh/plugins/fzf-tab b/zsh/plugins/fzf-tab new file mode 160000 index 0000000..220bee3 --- /dev/null +++ b/zsh/plugins/fzf-tab @@ -0,0 +1 @@ +Subproject commit 220bee396dd3c2024baa54015a928d5915e4f48f diff --git a/zsh/plugins/z b/zsh/plugins/z new file mode 160000 index 0000000..b82ac78 --- /dev/null +++ b/zsh/plugins/z @@ -0,0 +1 @@ +Subproject commit b82ac78a2d4457d2ca09973332638f123f065fd1