diff --git a/copy_configs b/copy_configs index 5336e8e..63bd424 100755 --- a/copy_configs +++ b/copy_configs @@ -29,7 +29,6 @@ copy_dir src_files/.config $XDG_CONFIG_HOME copy_dir src_files/.local $DIR_LOCAL copy_file src_files/.config/zsh/.zshenv $HOME # duplicate, copy anyway, ensures $ZDOTDIR -# copy_file src_files/.config/vim/.vimrc $HOME # copy to $HOME if need to use vim # on macos, handle sim-linking to gimp config since gimp defaults to app-support if [[ "$BOX_SETUP_OS" = "macos" ]]; then diff --git a/src_files/.config/tmux/tmux.conf b/src_files/.config/tmux/tmux.conf index bd36364..fc5aab3 100644 --- a/src_files/.config/tmux/tmux.conf +++ b/src_files/.config/tmux/tmux.conf @@ -26,9 +26,9 @@ bind-key W kill-session # TODO: if i can combine this into the above when only 1 # custom find and switching for sessions using tmux-sessionizer unbind-key f -bind-key f run-shell "tmux neww ~/.local/bin/tmux-sessionizer" -bind-key F run-shell "tmux neww ~/.local/bin/tmux-sessionizer existing" -bind-key H run-shell "tmux neww ~/.local/bin/tmux-sessionizer hub" +bind-key f run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer" +bind-key F run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer existing" +bind-key H run-shell "tmux neww $DIR_SCRIPTS/tmux-sessionizer hub" # bind -r D neww -c "#{pane_current_path}" "[[ -e TODO.md ]] && $EDITOR TODO.md || $EDITOR ~/personal/dev/todo.md" diff --git a/src_files/.config/vim/pack/plugins/start/.git-repo-placeholder b/src_files/.config/vim/pack/plugins/start/.git-repo-placeholder new file mode 100644 index 0000000..9ca0caa --- /dev/null +++ b/src_files/.config/vim/pack/plugins/start/.git-repo-placeholder @@ -0,0 +1,3 @@ +plugins, git repos for ref, clone in this dir if needed +git clone https://github.com/ghifarit53/tokyonight-vim.git +git clone https://github.com/leafgarland/typescript-vim.git diff --git a/src_files/.config/vim/.vimrc b/src_files/.config/vim/vimrc similarity index 80% rename from src_files/.config/vim/.vimrc rename to src_files/.config/vim/vimrc index c8522c5..c1b6394 100644 --- a/src_files/.config/vim/.vimrc +++ b/src_files/.config/vim/vimrc @@ -1,29 +1,13 @@ " base settings set nocompatible let mapleader="," - -" plugin manager and plugin list -filetype off -set rtp+=$XDG_CONFIG_HOME/vim/plugins/Vundle.vim -call vundle#begin('$XDG_CONFIG_HOME/vim/plugins') -Plugin 'VundleVim/Vundle.vim' - -" language-specific -Plugin 'leafgarland/typescript-vim' - -" themes -Plugin 'rose-pine/vim' -Plugin 'ghifarit53/tokyonight-vim' -call vundle#end() -filetype plugin on " or plugin indent on ? +set runtimepath+=$XDG_CONFIG_HOME/vim " plugin config let g:netrw_banner=0 " hide banner let g:netrw_browse_split=0 " opens in same window let g:netrw_liststyle=3 " listing style: tree let g:netrw_list_hide= '.*\.swp$' - " let g:netrw_list_hide.=netrw_gitignore#Hide() - " TODO add toggle to exaand/collapse whole tree let g:typescript_indent_disable = 1 @@ -37,9 +21,6 @@ func! ToggleTabMode() endif endfunc -" TODO add function (or something) similar to gf, but clear the buffer in -" which it is run (idea is to use this with results of grep in blank pane) - " copy & paste: registers, clipboard set clipboard+=unnamed " TODO or maybe unamedplus? @@ -47,7 +28,6 @@ set clipboard+=unnamed " TODO or maybe unamedplus? "set background=light let g:tokyonight_style = 'night' " available: night, storm colorscheme tokyonight -" colorscheme rosepine_moon " measurements, numbers, visual/audible cues set cursorline diff --git a/src_files/.config/zsh/.zshrc b/src_files/.config/zsh/.zshrc index a6cc9af..59c15dd 100644 --- a/src_files/.config/zsh/.zshrc +++ b/src_files/.config/zsh/.zshrc @@ -29,8 +29,8 @@ alias shrug='echo "¯\\_(ツ)_/¯"' # source extensions and system-specific files [[ -e "$HOME/.profile" ]] && source "$HOME/.profile" # TODO: do i want to source .profile? -[[ -a "$ZDOTDIR/.zsh-life-system" ]] && source "$ZDOTDIR/.zsh-life-system" -[[ -a "$ZDOTDIR/.zsh-job-rs" ]] && source "$ZDOTDIR/.zsh-job-rs" +[[ -a "$ZDOTDIR/zsh-life-system" ]] && source "$ZDOTDIR/zsh-life-system" +[[ -a "$ZDOTDIR/zsh-job-rs" ]] && source "$ZDOTDIR/zsh-job-rs" # TODO: refactor the below; simplify or at least move elsewhere alias lintjs='npx prettier --write' diff --git a/src_files/.config/zsh/.zsh-job-rs b/src_files/.config/zsh/zsh-job-rs similarity index 100% rename from src_files/.config/zsh/.zsh-job-rs rename to src_files/.config/zsh/zsh-job-rs diff --git a/src_files/.config/zsh/.zsh-life-system b/src_files/.config/zsh/zsh-life-system similarity index 100% rename from src_files/.config/zsh/.zsh-life-system rename to src_files/.config/zsh/zsh-life-system diff --git a/src_files/.local/scripts/zxcv-placeholder b/src_files/.local/bin/.placeholder similarity index 100% rename from src_files/.local/scripts/zxcv-placeholder rename to src_files/.local/bin/.placeholder diff --git a/src_files/.local/bin/.tmux-session-hydrate-default b/src_files/.local/scripts/.tmux-session-hydrate-default similarity index 100% rename from src_files/.local/bin/.tmux-session-hydrate-default rename to src_files/.local/scripts/.tmux-session-hydrate-default diff --git a/src_files/.local/bin/tmux-sessionizer b/src_files/.local/scripts/tmux-sessionizer similarity index 90% rename from src_files/.local/bin/tmux-sessionizer rename to src_files/.local/scripts/tmux-sessionizer index fe8ea7c..7e7e9d0 100755 --- a/src_files/.local/bin/tmux-sessionizer +++ b/src_files/.local/scripts/tmux-sessionizer @@ -5,9 +5,9 @@ switch_to() { } hydrate() { - local tmux_hydrate_path="$HOME/.local/bin/.tmux-session-hydrate-default" + local tmux_hydrate_path="$DIR_SCRIPTS/.tmux-session-hydrate-default" [[ -f $2/.tmux-session-hydrate ]] && tmux_hydrate_path="$2/.tmux-session-hydrate" - # TODO: add special case: [[ "$1" = "hub" ]] && tmux_hydrate_path="$HOME/.local/bin/.tmux-session-hydrate-hub" + # TODO: add special case: [[ "$1" = "hub" ]] && tmux_hydrate_path="$DIR_SCRIPTS/.tmux-session-hydrate-hub" [[ -f $tmux_hydrate_path ]] && tmux send-keys -t $1 "source $tmux_hydrate_path" c-M }