Compare commits

...

3 Commits

Author SHA1 Message Date
3120e46e77 use new scwrypts --root flag 2024-04-16 09:48:24 -06:00
33b2c6d615 scwrypts v4.3.0 2024-04-16 09:41:28 -06:00
99ec6e9f5a dont symlink scwrypts anymore; lets use the package manager instead 2024-04-15 16:38:03 -06:00
3 changed files with 11 additions and 14 deletions

View File

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

View File

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

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