feat: simplified vimrc, tweaks to zsh, nuke coc and npm

8 files changed, 49 insertions, 114 deletions

diff --git a/.vim/coc-settings.json b/.vim/coc-settings.json
deleted file mode 100644
index e24a5bb..0000000
--- a/.vim/coc-settings.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-  "coc.preferences.formatOnSaveFiletypes": [
-    "handlebars",
-    "javascript",
-    "css",
-    "html",
-    "json",
-    "liquid",
-    "markdown",
-    "rust",
-    "vue",
-    "php",
-    "xml"
-  ],
-  "diagnostic.virtualText": true,
-  "codeLens.enable": true,
-  "rust-analyzer.checkOnSave.command": "clippy",
-  "rust-analyzer.server.path": "/home/atc/.rustup/toolchains/stable-x86_64-unknown-freebsd/bin/rust-analyzer",
-  "rust-analyzer.completion.autoimport.enable": true,
-  "diagnostic.warningSign": "!",
-  "diagnostic.errorSign": "X",
-  "prettier.trailingComma": "none",
-  "prettier.arrowParens": "avoid",
-  "prettier.disableLanguages": ["handlebars"],
-  "prettier.proseWrap": "always"
-}
diff --git a/.vim/spell/en.utf-8.add b/.vim/spell/en.utf-8.add
index 3239587..fbf0a34 100644
--- a/.vim/spell/en.utf-8.add
+++ b/.vim/spell/en.utf-8.add
@@ -26,3 +26,9 @@ FreeBSD's
 doas
 Wix
 tokenization
+Enbody
+Jira
+Nextcloud
+Squarespace
+carpentertutoring
+Quickstart
diff --git a/.vim/spell/en.utf-8.add.spl b/.vim/spell/en.utf-8.add.spl
index 566eca2..20f309d 100644
--- a/.vim/spell/en.utf-8.add.spl
+++ b/.vim/spell/en.utf-8.add.spl
diff --git a/.vimrc b/.vimrc
index fde8f0f..bb12ac0 100644
--- a/.vimrc
+++ b/.vimrc
@@ -1,44 +1,28 @@
-" General options
-set wrap linebreak " break on words not chars
-set ruler 			" show the cursor position all the time
-set showcmd 			" display incomplete commands
-set ttimeout 			" time out for key codes
-set ttimeoutlen=100 		" wait up to 100ms after Esc for special key
-set display=truncate 		" show @@@ in the last line if it is truncated
-set scrolloff=5 		" show a few lines around the cursor
-set number
-set relativenumber 		" relative line numbering
-set tabstop=4 			" 4-space tabs
-set softtabstop=4 		" 4-space tabs
-set shiftwidth=4 		" 4-space shiftwidth
-set backspace=indent,eol,start 	" backspace over everything in insert
-set directory=$HOME/.vim/swapfiles// " common swap directory
-set fillchars+=vert:\ 
-set showtabline=2		" always show tab bar
-syntax enable 			" switch syntax highlighting on, used to be syntax on
-
-" Matching and key mappings
-":match ErrorMsg '\%>80v.\+' " right-hand drift warning
+" in insert mode tab key autocompletes
+function! TabOrComplete()
+	let line = getline('.')
+	let col = col('.')
+	if col > 1 && strpart(line, col - 2, 3) =~ '^\w'
+		return "\<C-N>"
+	else
+		return "\<Tab>"
+	endif
+endfunction
 
-" Automatically finish closing tags
-augroup html_vue_hbs
-	au!
-	autocmd BufNewFile,BufRead *.php|*.html|*.vue|*.hbs :inoremap <lt>/ </<C-x><C-o><Esc>==gi
-	autocmd BufNewFile,BufRead *.hbs set filetype=handlebars syntax=html
-augroup END
+inoremap <Tab> <C-R>=TabOrComplete()<CR>
 
 " only do this if autocommands enabled
 if has("autocmd")
-	autocmd InsertEnter * :set norelativenumber
-	autocmd InsertLeave * :set relativenumber
-
 	" enable file type detection and load indent files
 	filetype plugin indent on
 
+	" line numbering toggle
+	autocmd InsertEnter * :set norelativenumber
+	autocmd InsertLeave * :set relativenumber
+
+	"at startup, jump to last cursor position if valid
 	augroup vimStartup
 		au!
-
-		"at startup, jump to last cursor position if valid
 		autocmd BufReadPost *
 		\ 	if line("'\"") >= 1 && line("'\"") <= line("$") && &ft !~# 'commit'
 		\ 	| exe "normal! g`\""
@@ -46,42 +30,33 @@ if has("autocmd")
 	augroup END
 endif
 
-
-
-if empty(glob('~/.vim/autoload/plug.vim'))
-  silent !curl -fLo ~/.vim/autoload/plug.vim --create-dirs
-    \ https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
-  autocmd VimEnter * PlugInstall --sync | source $MYVIMRC
-endif
-
-call plug#begin('~/.vim/plugged')
-Plug 'neoclide/coc.nvim', {'do': 'yarn install --frozen-lockfile'}
-Plug 'rust-lang/rust.vim'
-call plug#end()
-
-" rust.vim
-let g:rustfmt_autosave = 1
-
-" COC.VIM
-"let g:coc_global_extensions = ['coc-rust-analyzer', 'coc-prettier']
-
-inoremap <silent><expr> <TAB>
-\	pumvisible() ? "\<C-n>" :
-\	<SID>check_back_space() ? "\<TAB>" :
-\	coc#refresh()
-inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
-
 " in normal mode tab key cycles through tabs
 nnoremap <Tab> :tabnext<CR>
 nnoremap <S-Tab> :tabprev<CR>
 
-function! s:check_back_space() abort
-	let col = col('.') - 1
-	return !col || getline('.')[col - 1] =~# '\s'
-endfunction
+" display
+set display=truncate 		    " show @@@ in the last line if it is truncated
+set number						" enable line numbering
+set relativenumber				" relative line numbering
+set ruler						" show the cursor position all the time
+set scrolloff=5					" show a few lines around the cursor
+set showcmd						" display incomplete commands
+set showtabline=2				" always show tab bar
+set wrap linebreak				" break on words not chars
+
+" editing
+set backspace=indent,eol,start 	" backspace over everything in insert
+set shiftwidth=4 				" 4-space shiftwidth
+set softtabstop=4 				" 4-space tabs
+set tabstop=4 					" 4-space tabs
+set ttimeout 					" time out for key codes
+set ttimeoutlen=100 			" wait up to 100ms after esc for special key
 
-highlight CocFloating ctermbg=black
+" startup
+set directory=~/.vim/swapfiles//,/tmp// " common swap directory
+
+" no bars for vertical split
+set fillchars+=vert:\ 
 
-" Auto-reloading scripts
-autocmd BufWritePost .aliases !source ~/.aliases
-autocmd BufWritePost ~/.Xresources !xrdb %
+" switch syntax highlighting on
+syntax enable
diff --git a/.xinitrc b/.xinitrc
deleted file mode 100755
index 2f0d803..0000000
--- a/.xinitrc
+++ /dev/null
@@ -1,9 +0,0 @@
-#!/bin/sh
-xrandr --output eDP-1 --auto --primary --fb 1920x1080 --output DP-3 --mode 1920x1080 --same-as eDP-1
-xrdb .Xresources
-xset b off
-urxvtd -q -f -o
-wal.sh
-dunst &
-xautolock -locker "i3lock -n -f -c 002b36" &
-exec i3 2>&1 > /var/log/xinit/i3wm.log
diff --git a/.zprofile b/.zprofile
index b627262..4542f8f 100644
--- a/.zprofile
+++ b/.zprofile
@@ -2,5 +2,5 @@ export XDG_RUNTIME_DIR=/var/run/user/`id -u` \
 	XCURSOR_PATH=${XCURSOR_PATH}:~/.local/share/icons \
 	MOZ_ENABLE_WAYLAND=1 \
 	GDK_BACKEND=wayland \
-	MOZ_DBUS_REMOTE=1 
-[ -z $DISPLAY ] && [ $(tty) = /dev/ttyv0 ] && exec sway
+	MOZ_DBUS_REMOTE=1
+[ -z $DISPLAY ] && [ $(tty) = /dev/ttyv0 ] && exec sway > /var/log/sway.log
diff --git a/.zshenv b/.zshenv
index d828be0..bf5c42b 100644
--- a/.zshenv
+++ b/.zshenv
@@ -2,7 +2,7 @@ export BROWSER=firefox
 export DOOMWADDIR=~/.local/share/crispy-doom/wads
 export EDITOR=vim
 export VISUAL=$EDITOR
-export GTK2_RC_FILES=$HOME/.local/share/themes/oomox-atc-solarized/gtk-2.0/gtkrc
+export GTK2_RC_FILES=$HOME/.local/share/themes/FlatColor/gtk-2.0/gtkrc
 export PAGER=less
 export PATH=$HOME/.local/scripts:$HOME/.local/bin/:$HOME/.cargo/bin:$HOME/node_modules/.bin:$PATH
 
diff --git a/package.json b/package.json
deleted file mode 100644
index 593e83e..0000000
--- a/package.json
+++ /dev/null
@@ -1,11 +0,0 @@
-{
-  "dependencies": {
-    "@vue/cli": "^4.4.4",
-    "htmlhint": "^0.14.0",
-    "prettier": "^2.0.5",
-    "vls": "^0.5.6"
-  },
-  "devDependencies": {
-    "ember-template-lint-plugin-prettier": "^2.0.0"
-  }
-}