From eacbd4342f90834c3986eefe4380aface89b00d9 Mon Sep 17 00:00:00 2001 From: yage Date: Tue, 16 Aug 2022 23:44:28 -0600 Subject: [PATCH] Stop doing the silly local thing --- bin/local/scwrypts | 3 +++ bin/local/vim | 2 ++ config/scwrypts.dotfile.conf | 2 ++ setup/config.zsh | 18 ------------------ 4 files changed, 7 insertions(+), 18 deletions(-) create mode 100755 bin/local/scwrypts create mode 100755 bin/local/vim diff --git a/bin/local/scwrypts b/bin/local/scwrypts new file mode 100755 index 0000000..0f35520 --- /dev/null +++ b/bin/local/scwrypts @@ -0,0 +1,3 @@ +#!/bin/zsh +source $HOME/.config/wryn/env.zsh +"$DOTWRYN/zsh/plugins/scwrypts/scwrypts" $@ diff --git a/bin/local/vim b/bin/local/vim new file mode 100755 index 0000000..e360aef --- /dev/null +++ b/bin/local/vim @@ -0,0 +1,2 @@ +#!/bin/sh +exec /usr/bin/vim -p $@ diff --git a/config/scwrypts.dotfile.conf b/config/scwrypts.dotfile.conf index 1d07d11..3c1d5e8 100644 --- a/config/scwrypts.dotfile.conf +++ b/config/scwrypts.dotfile.conf @@ -31,4 +31,6 @@ $DOTWRYN/config/tmux.conf tmux/tmux.conf $DOTWRYN/config/xcompose.conf X11/xcompose $DOTWRYN/config/xconfig.conf X11/xconfig $DOTWRYN/config/xinitrc X11/xinitrc +$DOTWRYN/bin/local/scwrypts ../.local/bin/scwrypts +$DOTWRYN/bin/local/vim ../.local/bin/vim " diff --git a/setup/config.zsh b/setup/config.zsh index 626b8ad..3ba077e 100644 --- a/setup/config.zsh +++ b/setup/config.zsh @@ -40,27 +40,9 @@ CONFIG__VIM() { || __FAIL 1 'error detected in vim setup (see above)' \ ; - CONFIG__VIM_OPEN_IN_PANES_BY_DEFAULT || return 3 - SCWRYPTS zsh/vim/vundle/install || return 4 } -CONFIG__VIM_OPEN_IN_PANES_BY_DEFAULT() { - which vim | grep "$HOME/.local/bin/vim" && return 0 - - __STATUS 'updating vim to open in panes by default' - - touch "$HOME/.local/bin/vim" \ - && chmod +x "$HOME/.local/bin/vim" \ - || __FAIL 1 "unable to create '$HOME/.local/bin/vim' executable; does it already exist?" \ - ; - - { echo '#!/bin/sh'; echo "exec $(which vim) -p "'"$@"'; } > "$HOME/.local/bin/vim" \ - || __FAIL 2 "unable to set panes-by-default option" \ - - __SUCCESS 'successfully set vim to open in panes by default' -} - ##################################################################### CONFIG__ENV() {