diff --git a/.gitignore b/.gitignore
index 0840c68..49d9c41 100644
--- a/.gitignore
+++ b/.gitignore
@@ -275,3 +275,6 @@ nvim/*
 nvim/lua/*
 !nvim/lua/plugins/
 nvim/lua/plugins/example.lua
+cvim/
+!cvim/vimrc
+tailscale/
diff --git a/cvim/.gitignore b/cvim/.gitignore
deleted file mode 100644
index a33ba00..0000000
--- a/cvim/.gitignore
+++ /dev/null
@@ -1,7 +0,0 @@
-.netrwhist
-autoload/
-viminfo
-colors/
-undo/
-pack/
-swap/
diff --git a/cvim/after/ftplugin/c.vim b/cvim/after/ftplugin/c.vim
deleted file mode 100644
index 9b0ea49..0000000
--- a/cvim/after/ftplugin/c.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-" Kernel coding standards
-set colorcolumn=81
-set shiftwidth=8
-set noexpandtab
diff --git a/cvim/after/ftplugin/cpp.vim b/cvim/after/ftplugin/cpp.vim
deleted file mode 100644
index 9b0ea49..0000000
--- a/cvim/after/ftplugin/cpp.vim
+++ /dev/null
@@ -1,4 +0,0 @@
-" Kernel coding standards
-set colorcolumn=81
-set shiftwidth=8
-set noexpandtab
diff --git a/cvim/after/ftplugin/css.vim b/cvim/after/ftplugin/css.vim
deleted file mode 100644
index 7b7ac76..0000000
--- a/cvim/after/ftplugin/css.vim
+++ /dev/null
@@ -1 +0,0 @@
-set shiftwidth=2
diff --git a/cvim/after/ftplugin/go.vim b/cvim/after/ftplugin/go.vim
deleted file mode 100644
index 442ec6c..0000000
--- a/cvim/after/ftplugin/go.vim
+++ /dev/null
@@ -1,3 +0,0 @@
-set colorcolumn=81
-set shiftwidth=8
-set noexpandtab
diff --git a/cvim/after/ftplugin/html.vim b/cvim/after/ftplugin/html.vim
deleted file mode 100644
index 7b7ac76..0000000
--- a/cvim/after/ftplugin/html.vim
+++ /dev/null
@@ -1 +0,0 @@
-set shiftwidth=2
diff --git a/cvim/after/plugin/nohiquickfix.vim b/cvim/after/plugin/nohiquickfix.vim
deleted file mode 100644
index 0ce23e7..0000000
--- a/cvim/after/plugin/nohiquickfix.vim
+++ /dev/null
@@ -1 +0,0 @@
-hi QuickFixLine ctermfg=NONE cterm=bold guifg=NONE gui=bold
diff --git a/cvim/after/plugin/searchhi.vim b/cvim/after/plugin/searchhi.vim
deleted file mode 100644
index 55955be..0000000
--- a/cvim/after/plugin/searchhi.vim
+++ /dev/null
@@ -1,2 +0,0 @@
-highlight Search guibg=#2e3b3b guifg=#d4be98 gui=bold
-
diff --git a/cvim/after/plugin/terminalbg.vim b/cvim/after/plugin/terminalbg.vim
deleted file mode 100644
index a8dec21..0000000
--- a/cvim/after/plugin/terminalbg.vim
+++ /dev/null
@@ -1 +0,0 @@
-highlight Normal ctermbg=NONE guibg=NONE
diff --git a/cvim/vimrc b/cvim/vimrc
index f83afe7..9263817 100644
--- a/cvim/vimrc
+++ b/cvim/vimrc
@@ -1,174 +1,7 @@
-" Enhanced vanilla ViM conifuration.
-" 	tpope's sensible.vim:
+" Self-contained ViM configuration
 
-if exists('g:loaded_sensible') || &compatible
-	finish
-else
-	let g:loaded_sensible = 'yes'
-endif
-
-" Use :help 'option' to see the documentation for the given option.
-
-" Disable vi compatibility, if for some reason it's on.
-if &compatible
-	set nocompatible
-endif
-
-" Check if an option was set from a file in $HOME.  This lets us avoid
-" overriding options in the user's vimrc, but still override options in the
-" system vimrc.
-function! s:MaySet(option) abort
-	if exists('*execute')
-		let out = execute('verbose setglobal all ' . a:option . '?')
-	else
-		redir => out
-		silent verbose execute 'setglobal all' a:option . '?'
-		redir END
-	endif
-	return out !~# " \\(\\~[\\/]\\|Lua\\)[^\n]*$"
-endfunction
-
-if s:MaySet('backspace')
-	set backspace=indent,eol,start
-endif
-" Disable completing keywords in included files (e.g., #include in C).  When
-" configured properly, this can result in the slow, recursive scanning of
-" hundreds of files of dubious relevance.
-set complete-=i
-if s:MaySet('smarttab')
-	set smarttab
-endif
-
-set nrformats-=octal
-
-" Make the escape key more responsive by decreasing the wait time for an
-" escape sequence (e.g., arrow keys).
-if !has('nvim') && &ttimeoutlen == -1
-	set ttimeout
-	set ttimeoutlen=100
-endif
-
-if has('reltime') && s:MaySet('incsearch')
-	set incsearch
-endif
-" Use CTRL-L to clear the highlighting of 'hlsearch' (off by default) and call
-" :diffupdate.
-if maparg('<C-L>', 'n') ==# ''
-	nnoremap <silent> <C-L> :nohlsearch<C-R>=has('diff')?'<Bar>diffupdate':''<CR><CR><C-L>
-endif
-
-if s:MaySet('laststatus')
-	set laststatus=2
-endif
-if s:MaySet('ruler')
-	set ruler
-endif
-if s:MaySet('wildmenu')
-	set wildmenu
-endif
-
-if s:MaySet('scrolloff')
-	set scrolloff=1
-endif
-if s:MaySet('sidescroll') && s:MaySet('sidescrolloff')
-	set sidescroll=1
-	set sidescrolloff=2
-endif
-set display+=lastline
-if has('patch-7.4.2109')
-	set display+=truncate
-endif
-
-if s:MaySet('listchars')
-	set listchars=tab:>\ ,trail:-,extends:>,precedes:<,nbsp:+
-endif
-
-" Delete comment character when joining commented lines.
-if v:version > 703 || v:version == 703 && has("patch541")
-	set formatoptions+=j
-endif
-
-" Replace the check for a tags file in the parent directory of the current
-" file with a check in every ancestor directory.
-if has('path_extra') && (',' . &g:tags . ',') =~# ',\./tags,'
-	setglobal tags-=./tags tags-=./tags; tags^=./tags;
-endif
-
-if s:MaySet('autoread')
-	set autoread
-endif
-
-if s:MaySet('history')
-	set history=1000
-endif
-if s:MaySet('tabpagemax')
-	set tabpagemax=50
-endif
-
-" Persist g:UPPERCASE variables, used by some plugins, in .viminfo.
-if !empty(&viminfo)
-	set viminfo^=!
-endif
-" Saving options in session and view files causes more problems than it
-" solves, so disable it.
-set sessionoptions-=options
-set viewoptions-=options
-
-" Allow color schemes to do bright colors without forcing bold.
-if &t_Co == 8 && $TERM !~# '^Eterm'
-	set t_Co=16
-endif
-
-" If the running Vim lacks support for the Fish shell, use Bash instead.
-if &shell =~# 'fish$' && (v:version < 704 || v:version == 704 && !has('patch276'))
-	set shell=/usr/bin/env\ bash
-endif
-
-" Disable a legacy behavior that can break plugin maps.
-if has('langmap') && exists('+langremap') && &langremap && s:MaySet('langremap')
-	set nolangremap
-endif
-
-if !(exists('g:did_load_filetypes') && exists('g:did_load_ftplugin') && exists('g:did_indent_on'))
-	filetype plugin indent on
-endif
-if has('syntax') && !exists('g:syntax_on')
-	syntax enable
-endif
-
-if empty(mapcheck('<C-U>', 'i'))
-	inoremap <C-U> <C-G>u<C-U>
-endif
-if empty(mapcheck('<C-W>', 'i'))
-	inoremap <C-W> <C-G>u<C-W>
-endif
-
-" From `:help :DiffOrig`.
-if exists(":DiffOrig") != 2
-	command DiffOrig vert new | set bt=nofile | r ++edit # | 0d_
-				\ | diffthis | wincmd p | diffthis
-endif
-
-" Correctly highlight $() and other modern affordances in filetype=sh.
-if !exists('g:is_posix') && !exists('g:is_bash') && !exists('g:is_kornshell') && !exists('g:is_dash')
-	let g:is_posix = 1
-endif
-
-" Load matchit.vim, but only if the user hasn't installed a newer version.
-if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
-	runtime! macros/matchit.vim
-endif
-
-" Enable the :Man command shipped inside Vim's man filetype plugin.
-if exists(':Man') != 2 && !exists('g:loaded_man') && &filetype !=? 'man' && !has('nvim')
-	runtime ftplugin/man.vim
-endif
-
-" 	Added functionality:
-" Configure custom path so not to mess with default vim path, and keep
-" tempfiles and other stuff organized.
+" Set up custom runtime path to isolate this configuration
 let g:customrtp = expand('~/.config/cvim')
-
 let rtp = &runtimepath
 let &runtimepath = g:customrtp . ',' . rtp . ',' . g:customrtp . '/after'
 let &packpath = &runtimepath
@@ -178,138 +11,67 @@ execute 'set spellfile=' . g:customrtp . '/spell/en.utf-8.add'
 execute 'set viminfo+=n' . g:customrtp . '/viminfo'
 execute 'set viewdir='   . g:customrtp . '/view/'
 execute 'set undodir='   . g:customrtp . '/undo//,.'
-
 for dir in ['swap', 'backup', 'spell', 'view', 'undo', 'after']
 	call mkdir(g:customrtp . '/' . dir, 'p', 0700)
 endfor
 
-if (empty($TMUX) && getenv('TERM_PROGRAM') != 'Apple_Terminal')
-	if (has("nvim"))
-		let $NVIM_TUI_ENABLE_TRUE_COLOR=1
+function! s:Curl(url, dest) abort
+	let l:dir = fnamemodify(a:dest, ':h')
+	if !isdirectory(l:dir)
+		call mkdir(l:dir, 'p')
 	endif
-	if (has("termguicolors"))
-		set termguicolors
+	let l:cmd = 'curl -fLo ' . shellescape(a:dest) . ' --create-dirs ' . shellescape(a:url)
+	call system(l:cmd)
+	if v:shell_error
+		echoerr "Failed to download: " . a:url
 	endif
+endfunction
+
+" junegunn/vim-plug
+let s:plug_url  = 'https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim'
+let s:plug_path = g:customrtp . '/autoload/plug.vim'
+if !filereadable(s:plug_path)
+  call s:Curl(s:plug_url, s:plug_path)
+  augroup PlugBootstrap
+    autocmd!
+    autocmd VimEnter * ++once PlugInstall --sync | execute 'source ' . fnameescape(g:customrtp . '/vimrc')
+  augroup END
 endif
 
-" :MakeTags
-" If inside a Git repository, generate tags for the project into
-" /tmp/tags/<project> and set the tags variable accordingly.
-" This is done on a per-buffer basis.
-function! SetupProjectTags()
-	let l:buf_dir = expand('%:p:h')
-	if empty(l:buf_dir)
-		echoerr 'Could not determine buffer directory.'
-		return
-	endif
+" Plugins
+call plug#begin(g:customrtp . '/plugged')
+Plug 'tpope/vim-sensible'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'sainnhe/gruvbox-material'
+" Plug 'https://github.com/preservim/nerdtree'
+call plug#end()
 
-	let l:git_root = systemlist('git -C ' . shellescape(l:buf_dir) . ' rev-parse --show-toplevel')
-	if v:shell_error != 0 || empty(l:git_root)
-		echoerr 'Not inside a Git repository.'
-		return
-	endif
+" Appearance
+colorscheme gruvbox-material
+set listchars=tab:\|\ ,trail:~,extends:>,precedes:<,nbsp:+
+set background=dark
+set colorcolumn=81
+set termguicolors
+set cursorline
+set number
+set nowrap
 
-	let l:git_root = l:git_root[0]
-	let l:project_name = substitute(fnamemodify(l:git_root, ':t'), '[^A-Za-z0-9]', '_', 'g')
-	let l:tags_file = '/tmp/tags/' . l:project_name . '.tags'
-
-	if !isdirectory('/tmp/tags')
-		call mkdir('/tmp/tags', 'p')
-	endif
-
-	let l:cmd = 'ctags -R -f ' . shellescape(l:tags_file) . ' ' . shellescape(l:git_root)
-	let l:output = system(l:cmd)
-
-	if v:shell_error != 0
-		echoerr l:output
-		return
-	endif
-
-	let &l:tags = l:tags_file
-endfunction
-command! MakeTags call SetupProjectTags()
-
-" Netrw configuration
+" netrw
 let g:netrw_banner=0
 let g:netrw_liststyle=3
 
-" QuickFix
-autocmd QuickFixCmdPost [^l]* nested cwindow
-autocmd QuickFixCmdPost    l* nested lwindow
-autocmd QuickFixCmdPost     * if &ft ==# 'qf' | wincmd J | endif
-
-function! WrapQuickfixNext()
-	try
-		execute 'cnext'
-	catch /^Vim\%((\a\+)\)\=:E553/
-		cfirst
-	endtry
-endfunction
-function! WrapQuickfixPrev()
-	try
-		execute 'cprevious'
-	catch /^Vim\%((\a\+)\)\=:E553/
-		clast
-	endtry
-endfunction
-
-nnoremap <silent> <Leader>n :call WrapQuickfixNext()<CR>
-nnoremap <silent> <Leader>p :call WrapQuickfixPrev()<CR>
-nnoremap <F9> :make<CR><CR>
-
-" Colorscheme
-function! s:Curl(url, dest) abort
-  if filereadable(a:dest)
-    return
-  endif
-
-  let l:dir = fnamemodify(a:dest, ':h')
-  if !isdirectory(l:dir)
-    call mkdir(l:dir, 'p')
-  endif
-
-  let l:cmd = 'curl -fLo ' . shellescape(a:dest) . ' --create-dirs ' . shellescape(a:url)
-  call system(l:cmd)
-
-  if v:shell_error
-    echoerr "Failed to download: " . a:url
-  endif
-endfunction
-
-let s:baseurl = 'https://raw.githubusercontent.com/morhetz/gruvbox/refs/heads/master/'
-let s:paths = [
-  \ 'autoload/gruvbox.vim',
-  \ 'autoload/lightline/colorscheme/gruvbox.vim',
-  \ 'autoload/airline/themes/gruvbox.vim',
-  \ 'colors/gruvbox.vim'
-  \ ]
-
-let s:rtp = substitute(&runtimepath, ',.*', '', '')
-
-for relpath in s:paths
-  let url = s:baseurl . relpath
-  let dest = s:rtp . '/' . relpath
-  call s:Curl(url, dest)
-endfor
-
-colorscheme gruvbox
-
 " Misc
-let mapleader = "\<Space>"
-set background=dark
-set list
-set listchars=tab:\|\ ,trail:~,extends:>,precedes:<,nbsp:+
-set cursorline
 set ignorecase
 set smartcase
 set hlsearch
 set swapfile
 set undofile
+set path+=**
 set mouse=a
 set showcmd
-set number
 set hidden
-set nowrap
-set colorcolumn=81
-set path+=**
-set clipboard=unnamedplus
+set list
+
+" Keybinds
+let mapleader = "\<Space>"
diff --git a/vim/.gitignore b/vim/.gitignore
index 6ae1a1a..34dbb71 100644
--- a/vim/.gitignore
+++ b/vim/.gitignore
@@ -1,4 +1,4 @@
 .netrwhist
 autoload/
-viminfo
+viminfo*
 view/