diff --git a/configs/nvim/init.vim b/configs/nvim/init.vim
index bdf8063..60e7b49 100644
--- a/configs/nvim/init.vim
+++ b/configs/nvim/init.vim
@@ -1,12 +1,4 @@
-
-" Syntax highlighting
-syntax on
-
-" Enable modeline
-set modeline
-
-" Enable mouse usage
-set mouse=a
+source ~/.vimrc
 
 " Configure the right-click menu
 if !exists('g:vscode')
@@ -21,78 +13,10 @@ if !exists('g:vscode')
     inoremenu PopUp.Select\ All                 <C-Home><C-O>VG
 endif
 
-" Tab size
-set tabstop=4
-set shiftwidth=4
-set expandtab
-
-" VSCode-style selection indenting
-nnoremap <Tab> >>_
-nnoremap <S-Tab> <<_
-inoremap <S-Tab> <C-D>
-vnoremap <Tab> >gv
-vnoremap <S-Tab> <gv
-
-" VSCode-style shift-arrow for selection
-set keymodel=startsel,stopsel
-
-" VSCode-style word deletion
-inoremap <C-BS> <C-W>
-inoremap <C-Del> <Esc>lcw
-nnoremap <C-Del> cw<Esc>l
-
-" VSCode-style comment toggling
-nnoremap <C-_> :Commentary<CR>
-vnoremap <C-_> :Commentary<CR>
-inoremap <C-_> <C-O>:Commentary<CR>
-
-" Force VIM to use system clipboard
-set clipboard=unnamedplus
-
-" Enable per-project vimrc files
-set exrc
-set secure
-
-" Enable filetype plugins
-set nocompatible
-filetype plugin on
-syntax on
-
 " Custom syntax highlighting
-if !exists('g:vscode')
-    au BufRead,BufNewFile *.usd set filetype=usda
-    au BufRead,BufNewFile *.usda set filetype=usda
-    autocmd FileType usda source ~/.config/nvim/third_party/usda-syntax/vim/usda.vim
-endif
-
-" Hide the intro message
-set shortmess+=I
-
-" Force help documents into new tabs
-cnoreabbrev <expr> help getcmdtype() == ":" && getcmdline() == 'help' ? 'tab help' : 'help'
-cnoreabbrev <expr> h getcmdtype() == ":" && getcmdline() == 'h' ? 'tab help' : 'h'
-
-" Enable spell checking
-if !exists('g:vscode')
-    set spell
-    set spelllang=en_ca,en_us
-    set spelloptions=camel
-    hi clear SpellCap
-    hi clear SpellRare
-
-    " Disable spellcheck for some file formats
-    autocmd FileType man setlocal nospell
-    autocmd FileType diff setlocal nospell
-    autocmd FileType usda setlocal nospell
-endif
-
-" Configure Diff rendering
-hi DiffText         ctermfg=White       ctermbg=none
-hi DiffFile         ctermfg=White       ctermbg=none cterm=bold
-hi DiffIndexLine    ctermfg=White       ctermbg=none cterm=bold
-hi DiffAdd          ctermfg=DarkGreen   ctermbg=none
-hi DiffChange       ctermfg=DarkRed     ctermbg=none
-hi DiffDelete       ctermfg=DarkRed     ctermbg=none
+au BufRead,BufNewFile *.usd set filetype=usda
+au BufRead,BufNewFile *.usda set filetype=usda
+autocmd FileType usda source ~/.config/nvim/third_party/usda-syntax/vim/usda.vim
 
 " Disable the gitgutter background
 let g:gitgutter_override_sign_column_highlight = 1
diff --git a/configs/vim/.vimrc b/configs/vim/.vimrc
new file mode 100644
index 0000000..8e14521
--- /dev/null
+++ b/configs/vim/.vimrc
@@ -0,0 +1,74 @@
+" Syntax highlighting
+syntax on
+
+" Enable modeline
+set modeline
+
+" Enable mouse usage
+set mouse=a
+
+" Tab size
+set tabstop=4
+set shiftwidth=4
+set expandtab
+
+" VSCode-style selection indenting
+nnoremap <Tab> >>_
+nnoremap <S-Tab> <<_
+inoremap <S-Tab> <C-D>
+vnoremap <Tab> >gv
+vnoremap <S-Tab> <gv
+
+" VSCode-style shift-arrow for selection
+set keymodel=startsel,stopsel
+
+" VSCode-style word deletion
+inoremap <C-BS> <C-W>
+inoremap <C-Del> <Esc>lcw
+nnoremap <C-Del> cw<Esc>l
+
+" VSCode-style comment toggling
+nnoremap <C-_> :Commentary<CR>
+vnoremap <C-_> :Commentary<CR>
+inoremap <C-_> <C-O>:Commentary<CR>
+
+" Force VIM to use system clipboard
+set clipboard=unnamedplus
+
+" Enable per-project vimrc files
+set exrc
+set secure
+
+" Enable filetype plugins
+set nocompatible
+filetype plugin on
+syntax on
+
+" Hide the intro message
+set shortmess+=I
+
+" Force help documents into new tabs
+cnoreabbrev <expr> help getcmdtype() == ":" && getcmdline() == 'help' ? 'tab help' : 'help'
+cnoreabbrev <expr> h getcmdtype() == ":" && getcmdline() == 'h' ? 'tab help' : 'h'
+
+" Enable spell checking
+if !exists('g:vscode')
+    set spell
+    set spelllang=en_ca,en_us
+    set spelloptions=camel
+    hi clear SpellCap
+    hi clear SpellRare
+
+    " Disable spellcheck for some file formats
+    autocmd FileType man setlocal nospell
+    autocmd FileType diff setlocal nospell
+    autocmd FileType usda setlocal nospell
+endif
+
+" Configure Diff rendering
+hi DiffText         ctermfg=White       ctermbg=none
+hi DiffFile         ctermfg=White       ctermbg=none cterm=bold
+hi DiffIndexLine    ctermfg=White       ctermbg=none cterm=bold
+hi DiffAdd          ctermfg=DarkGreen   ctermbg=none
+hi DiffChange       ctermfg=DarkRed     ctermbg=none
+hi DiffDelete       ctermfg=DarkRed     ctermbg=none
\ No newline at end of file
diff --git a/install-linux.sh b/install-linux.sh
index 8293c72..934bd47 100644
--- a/install-linux.sh
+++ b/install-linux.sh
@@ -78,6 +78,7 @@ chmod 644 "$HOME/.ssh/config"
 if type -p chown > /dev/null; then chown "$USER:$USER" "$HOME/.ssh/config"; fi 
 
 # Configure (neo)Vim
+ln -sf $EWCONFIG_ROOT/configs/vim/.vimrc ~/.vimrc
 ln -sf $EWCONFIG_ROOT/configs/nvim/init.vim ~/.config/nvim/init.vim
 ln -snf $EWCONFIG_ROOT/configs/nvim/pack ~/.config/nvim/pack
 ln -snf $EWCONFIG_ROOT/configs/nvim/third_party ~/.config/nvim/third_party