diff --git a/outerheaven.init3.home/.config/nvim/init.vim b/outerheaven.init3.home/.config/nvim/init.vim index 9c0ccb6..3e33676 100644 --- a/outerheaven.init3.home/.config/nvim/init.vim +++ b/outerheaven.init3.home/.config/nvim/init.vim @@ -1,6 +1,8 @@ set mouse= -set expandtab " use spaces instead of \t -set autoindent " match indentation of previous line +" use spaces instead of \t +set expandtab +" match indentation of previous line +set autoindent set runtimepath^=~/.vim runtimepath+=~/.vim/after let &packpath = &runtimepath source ~/.vimrc diff --git a/outerheaven.init3.home/.vimrc b/outerheaven.init3.home/.vimrc index d5ebbac..b490349 100644 --- a/outerheaven.init3.home/.vimrc +++ b/outerheaven.init3.home/.vimrc @@ -1,5 +1,4 @@ -" NOTE: don't add more LSPs here, use 'coc.nvim' - it offers better completion -" 'vim'/common elements are held here while 'nvim' has another config: '.config/nvim/init.vim' +" NOTE: don't add more LSPs here, use coc - it offers better completion call plug#begin('~/.vim/exts') Plug 'AlexvZyl/nordic.nvim', { 'branch': 'main' } Plug 'neoclide/coc.nvim', {'branch': 'release'} diff --git a/update.sh b/update.sh index 1f33e97..c0f37cb 100755 --- a/update.sh +++ b/update.sh @@ -3,15 +3,13 @@ # minimal dotfile manager # tracks files / copies them into the repo, sorted by hostname # -set -u # array of files [relative to home] to include DOTS=( '.vimrc' '.config/nvim/init.vim' '.config/nvim/coc-settings.json' - '.config/autostart-i3ipc.yml' - '.config/sway' + # '.config/sway' ) # ensure the host running this script/updating dotfiles has a directory @@ -20,16 +18,13 @@ DOTS=( [ -d "$HOSTNAME" ] || mkdir -v "$HOSTNAME" pushd "$HOSTNAME" || exit -echo "Changed working dir to $PWD" - # now that the host/working dir is managed, process the dotfiles # ensure their directory structure is retained, then recursively copy for DOT in "${DOTS[@]}"; do DOT_DIR="$(dirname "$DOT")" [ -d "$DOT_DIR" ] || mkdir -vp "$DOT_DIR" - # naively 'copy' with rsync; rely on git to tell us about changes. TODO: reconsider - echo "Copying '$HOME/$DOT' to '$DOT'" - rsync -aqv "$HOME/$DOT" "$DOT" || echo "Couldn't copy '$DOT', got rc: $?" + # naively copy; rely on git to tell us about changes + cp -ravp "$HOME/$DOT" "$DOT" done # return where we were