config/dotwryn.env.zsh

@@ -3,17 +3,13 @@
 #####################################################################
 
 export DOTWRYN="$HOME/.wryn"
+
 export SOURCE_PACKAGES="$HOME/.local/share/source-packages"
 
-LOAD_ZSH_UTILS() {
+export DOTWRYN_UTILS="$DOTWRYN/zsh/plugins/scwrypts/zsh/lib/utils/utils.module.zsh"
-	local SCWRYPTS_ROOT="$(scwrypts --root 2>/dev/null)"
+
-	: \
+RELOAD_ZSH_UTILS() { source $DOTWRYN_UTILS; }
-		&& [ $SCWRYPTS_ROOT ] \
+[ ! $DOTWRYN_UTILS_LOADED ] && RELOAD_ZSH_UTILS && export DOTWRYN_UTILS_LOADED=1
-		&& [ -d "$SCWRYPTS_ROOT" ] \
-		&& source "$(scwrypts --root)/zsh/lib/utils/utils.module.zsh" \
-		&& export DOTWRYN_UTILS_LOADED=1
-}
-[ $DOTWRYN_UTILS_LOADED ] || RELOAD_ZSH_UTILS
 
 #####################################################################
 ### Application Settings ############################################
@@ -22,6 +18,7 @@ LOAD_ZSH_UTILS() {
 export PREFERRED_EDITOR=(vim vi)
 
 RIPGREP_CONFIG_PATH="$HOME/.config/ripgrep/config"
+TMUX_DEFAULT_SESSION_NAME='wryn'
 
 PS1_BRANCH_SYMBOL=''
 PS1_INDICATOR_SYMBOL='☕'
@@ -45,6 +42,7 @@ EXTERNAL_PLUGINS+=(
 export FZF_DEFAULT_OPTS='--reverse --ansi --height 50% --bind=ctrl-c:cancel'
 export FZF_DEFAULT_COMMAND='rg --files'
 
+
 # fzf-tab
 EXTERNAL_PLUGINS+=("$DOTWRYN/zsh/plugins/fzf-tab/fzf-tab.plugin.zsh")
 
@@ -52,8 +50,9 @@ zstyle ':fzf-tab:*' accept-line enter
 zstyle ':fzf-tab:*' fzf-bindings 'space:accept' ';:toggle'
 zstyle ':fzf-tab:*' continuous-trigger '/'
 
+
 # scwrypts
-EXTERNAL_PLUGINS+=("$(scwrypts --root 2>/dev/null)/scwrypts.plugin.zsh")
+EXTERNAL_PLUGINS+=("$DOTWRYN/zsh/plugins/scwrypts/scwrypts.plugin.zsh")
 
 for e in \
 	"local.$(hostnamectl --static).secret" \
@@ -61,11 +60,14 @@ for e in \
 	"local"
 do export SCWRYPTS_ENV="$e"; [ -f "$HOME/.config/scwrypts/environments/scwrypts/$e" ] && break; done
 
+
 # z
 EXTERNAL_PLUGINS+=("$DOTWRYN/zsh/plugins/z/z.sh")
 
+
 # code-activator
 EXTERNAL_PLUGINS+=("$DOTWRYN/zsh/plugins/code-activator/activator.plugin.zsh")
 
+
 # ssh
 EXTERNAL_PLUGINS+=("$DOTWRYN/zsh/plugins/ssh/ssh.plugin.zsh")

config/scwrypts/dotfiles.zsh

@@ -37,6 +37,7 @@ $DOTWRYN/config/xcompose.conf                     X11/xcompose
 $DOTWRYN/config/xconfig.conf                      X11/xconfig
 $DOTWRYN/config/xinitrc.i3                        ../.xinitrc
 $DOTWRYN/config/xinitrc.i3                        X11/xinitrc
+$DOTWRYN/bin/scwrypts                             ../.local/bin/scwrypts
 $DOTWRYN/bin/vim                                  ../.local/bin/vim
 $DOTWRYN/bin/$(hostnamectl --static)              ../.$(hostnamectl --static)
 

zsh/plugins/scwrypts

@@ -1 +1 @@
-Subproject commit 8f3e86208686de45f06bbfbdd77d3424eb44f607
+Subproject commit 6fe5b8e26a594a9e1a6ad1ac25a7e164a8190c7a