diff --git a/Rakefile b/Rakefile
index 1c134e6..7e57a03 100644
--- a/Rakefile
+++ b/Rakefile
@@ -48,7 +48,7 @@ task install: %i[submodule_init submodules] do
 
   Rake::Task['link_files'].execute
   if want_to_install?('vim configuration (highly recommended)')
-    install_files(Dir.glob('{vim,vimrc}'))
+    install_files(Dir.glob('{vim}'))
     Rake::Task['install_vundle'].execute
   end
 
diff --git a/vim/vundles.vim b/vim/vundles.vim
index f1c9b85..7c2880c 100644
--- a/vim/vundles.vim
+++ b/vim/vundles.vim
@@ -20,20 +20,6 @@ Bundle "gmarik/vundle"
 " YADR's vundles are split up by category into smaller files
 " This reduces churn and makes it easier to fork. See
 " ~/.vim/vundles/ to edit them:
-runtime ruby.vundle
-runtime languages.vundle
-runtime markdown.vundle
-runtime git.vundle
-runtime appearance.vundle
-runtime textobjects.vundle
-runtime search.vundle
-runtime project.vundle
-runtime vim-improvements.vundle
-runtime go.vundle
-runtime sls.vundle
-runtime python.vundle
-runtime javascript.vundle
-
 " The plugins listed in ~/.vim/.vundles.local will be added here to
 " allow the user to add vim plugins to yadr without the need for a fork.
 if filereadable(expand("~/.yadr/vim/.vundles.local"))
diff --git a/vim/vundles/appearance.vundle b/vim/vundles/appearance.vundle
deleted file mode 100644
index 2bb8f22..0000000
--- a/vim/vundles/appearance.vundle
+++ /dev/null
@@ -1,10 +0,0 @@
-Bundle "ap/vim-css-color"
-Bundle "itchyny/lightline.vim"
-Bundle "jby/tmux.vim.git"
-Bundle "morhetz/gruvbox"
-Bundle "xsunsmile/showmarks.git"
-Bundle "chriskempson/base16-vim"
-
-" Required for Gblame in terminal vim
-Bundle "godlygeek/csapprox.git"
-Bundle "altercation/vim-colors-solarized"
diff --git a/vim/vundles/git.vundle b/vim/vundles/git.vundle
deleted file mode 100644
index 06379ea..0000000
--- a/vim/vundles/git.vundle
+++ /dev/null
@@ -1,5 +0,0 @@
-Bundle "gregsexton/gitv"
-Bundle "mattn/gist-vim"
-Bundle "tpope/vim-fugitive"
-Bundle "airblade/vim-gitgutter"
-Bundle "tpope/vim-git"
diff --git a/vim/vundles/go.vundle b/vim/vundles/go.vundle
deleted file mode 100644
index 1deb7a5..0000000
--- a/vim/vundles/go.vundle
+++ /dev/null
@@ -1 +0,0 @@
-Bundle 'fatih/vim-go'
diff --git a/vim/vundles/javascript.vundle b/vim/vundles/javascript.vundle
deleted file mode 100644
index a7c2e3a..0000000
--- a/vim/vundles/javascript.vundle
+++ /dev/null
@@ -1 +0,0 @@
-Bundle 'pangloss/vim-javascript'
diff --git a/vim/vundles/languages.vundle b/vim/vundles/languages.vundle
deleted file mode 100644
index f56b60e..0000000
--- a/vim/vundles/languages.vundle
+++ /dev/null
@@ -1,8 +0,0 @@
-Bundle 'sheerun/vim-polyglot'
-Bundle 'garbas/vim-snipmate.git'
-Bundle 'honza/vim-snippets'
-Bundle 'skwp/vim-html-escape'
-Bundle 'chr4/nginx.vim'
-Bundle 'scrooloose/nerdcommenter'
-Bundle 'w0rp/ale'
-Bundle 'jparise/vim-graphql'
diff --git a/vim/vundles/markdown.vundle b/vim/vundles/markdown.vundle
deleted file mode 100644
index b3e91ce..0000000
--- a/vim/vundles/markdown.vundle
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle 'tpope/vim-markdown'
-Bundle 'suan/vim-instant-markdown'
diff --git a/vim/vundles/project.vundle b/vim/vundles/project.vundle
deleted file mode 100644
index d18e021..0000000
--- a/vim/vundles/project.vundle
+++ /dev/null
@@ -1,7 +0,0 @@
-Bundle "jistr/vim-nerdtree-tabs.git"
-Bundle "scrooloose/nerdtree.git"
-Bundle "ctrlpvim/ctrlp.vim"
-Bundle 'JazzCore/ctrlp-cmatcher'
-Bundle 'junegunn/fzf'
-Bundle "xolox/vim-misc"
-Bundle "xolox/vim-session"
diff --git a/vim/vundles/python.vundle b/vim/vundles/python.vundle
deleted file mode 100644
index 3a55217..0000000
--- a/vim/vundles/python.vundle
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle 'klen/python-mode'
-Bundle 'google/yapf'
diff --git a/vim/vundles/ruby.vundle b/vim/vundles/ruby.vundle
deleted file mode 100644
index 4d15d29..0000000
--- a/vim/vundles/ruby.vundle
+++ /dev/null
@@ -1,2 +0,0 @@
-Bundle "vim-ruby/vim-ruby.git"
-Bundle "ngmy/vim-rubocop"
diff --git a/vim/vundles/search.vundle b/vim/vundles/search.vundle
deleted file mode 100644
index 2635f88..0000000
--- a/vim/vundles/search.vundle
+++ /dev/null
@@ -1,6 +0,0 @@
-Bundle "justinmk/vim-sneak"
-Bundle "rking/ag.vim"
-Bundle "henrik/vim-indexed-search"
-Bundle "nelstrom/vim-visual-star-search"
-Bundle "skwp/greplace.vim"
-Bundle "Lokaltog/vim-easymotion"
diff --git a/vim/vundles/sls.vundle b/vim/vundles/sls.vundle
deleted file mode 100644
index ab70aac..0000000
--- a/vim/vundles/sls.vundle
+++ /dev/null
@@ -1 +0,0 @@
-Bundle 'saltstack/salt-vim'
diff --git a/vim/vundles/textobjects.vundle b/vim/vundles/textobjects.vundle
deleted file mode 100644
index 2d51e15..0000000
--- a/vim/vundles/textobjects.vundle
+++ /dev/null
@@ -1,10 +0,0 @@
-" These bundles introduce new textobjects into vim,
-" For example the Ruby one introduces the 'r' text object
-" such that 'var' gives you Visual Around Ruby
-Bundle "kana/vim-textobj-datetime"
-Bundle "kana/vim-textobj-entire"
-Bundle "kana/vim-textobj-function"
-Bundle "kana/vim-textobj-user"
-Bundle "nathanaelkane/vim-indent-guides"
-Bundle "nelstrom/vim-textobj-rubyblock"
-Bundle "wellle/targets.vim"
diff --git a/vim/vundles/vim-improvements.vundle b/vim/vundles/vim-improvements.vundle
deleted file mode 100644
index cef21c2..0000000
--- a/vim/vundles/vim-improvements.vundle
+++ /dev/null
@@ -1,28 +0,0 @@
-Bundle "AndrewRadev/splitjoin.vim"
-Bundle "Raimondi/delimitMate"
-Bundle "godlygeek/tabular"
-Bundle "tomtom/tcomment_vim.git"
-Bundle "vim-scripts/camelcasemotion.git"
-Bundle "vim-scripts/matchit.zip.git"
-Bundle "kristijanhusak/vim-multiple-cursors"
-Bundle "christoomey/vim-tmux-navigator"
-Bundle "MarcWeber/vim-addon-mw-utils.git"
-Bundle "bogado/file-line.git"
-Bundle "mattn/webapi-vim.git"
-Bundle "sjl/gundo.vim"
-Bundle "maxbrunsfeld/vim-yankstack"
-Bundle "tomtom/tlib_vim.git"
-Bundle "tpope/vim-abolish"
-Bundle "tpope/vim-endwise.git"
-Bundle "tpope/vim-ragtag"
-Bundle "tpope/vim-repeat.git"
-Bundle "tpope/vim-surround.git"
-Bundle "tpope/vim-unimpaired"
-Bundle "vim-scripts/AnsiEsc.vim.git"
-Bundle "vim-scripts/lastpos.vim"
-Bundle "vim-scripts/sudo.vim"
-Bundle "goldfeld/ctrlr.vim"
-Bundle "editorconfig/editorconfig-vim"
-Bundle 'majutsushi/tagbar'
-Bundle 'sirver/ultisnips'
-Bundle 'jiangmiao/auto-pairs'
diff --git a/vimrc b/vimrc
deleted file mode 100644
index 46b44f1..0000000
--- a/vimrc
+++ /dev/null
@@ -1,162 +0,0 @@
-" Use Vim settings, rather then Vi settings (much better!).
-" This must be first, because it changes other options as a side effect.
-scriptencoding utf-8
-set encoding=utf-8
-set nocompatible
-
-" TODO: this may not be in the correct place. It is intended to allow overriding <Leader>.
-" source ~/.vimrc.before if it exists.
-if filereadable(expand("~/.vimrc.before"))
-  source ~/.vimrc.before
-endif
-
-" ================ General Config ====================
-
-set foldcolumn=0                " Make sure that extra margin on left is removed
-set number                      "Line numbers are good
-set history=1000                "Store lots of :cmdline history
-set showmode                    "Show current mode down the bottom
-set gcr=a:blinkon0              "Disable cursor blink
-set visualbell                  "No sounds
-set autoread                    "Reload files changed outside vim
-set so=999                      " Make sure that coursor is always vertically centered on j/k moves
-set magic
-set lazyredraw                  " Don't redraw while executing macros (good performance config)
-set showcmd                     " Show (partial) commands (or size of selection in Visual mode) in the status line
-
-" Configure backspace so it acts as it should act
-set backspace=eol,start,indent
-set whichwrap+=<,>,h,l
-
-" No annoying sound on errors
-set noerrorbells
-set novisualbell
-set t_vb=
-set tm=500
-
-" This makes vim act like all other editors, buffers can
-" exist in the background without being in a window.
-" http://items.sjbach.com/319/configuring-vim-right
-set hidden
-
-"turn on syntax highlighting
-syntax on
-
-" Change leader to a comma because the backslash is too far away
-" That means all \x commands turn into ,x
-" The mapleader has to be set before vundle starts loading all
-" the plugins.
-let mapleader=","
-
-" =============== Vundle Initialization ===============
-" This loads all the plugins specified in ~/.vim/vundles.vim
-" Use Vundle plugin to manage all other plugins
-if filereadable(expand("~/.vim/vundles.vim"))
-  source ~/.vim/vundles.vim
-endif
-au BufNewFile,BufRead *.vundle set filetype=vim
-
-" ================ Turn Off Swap Files ==============
-
-set noswapfile
-set nobackup
-set nowb
-
-" ================ Persistent Undo ==================
-" Keep undo history across sessions, by storing in file.
-" Only works all the time.
-if has('persistent_undo') && isdirectory(expand('~').'/.vim/backups')
-  silent !mkdir ~/.vim/backups > /dev/null 2>&1
-  set undodir=~/.vim/backups
-  set undofile
-endif
-
-" ================ Text, Tab, Indentation ======================
-
-set autoindent
-set smartindent
-set smarttab
-set shiftwidth=2
-set softtabstop=2
-set tabstop=2
-set expandtab
-set ai "Auto indent
-set si "Smart indent
-
-" Auto indent pasted text
-nnoremap p p=`]<C-o>
-nnoremap P P=`]<C-o>
-
-" shortcuts defined by rallets
-" Refresh all files
-nnoremap <LocalLeader>r :bufdo edit<CR>
-nnoremap <LocalLeader>t :tabo<CR>
-nnoremap <LocalLeader>f :let @" = expand("%")<cr>
-nnoremap <Leader>sv :source ~/.vimrc<cr>
-
-
-
-filetype plugin on
-filetype indent on
-
-" Display tabs and trailing spaces visually
-set list listchars=tab:\ \ ,trail:·
-" set listchars=tab:>-
-
-set nowrap       "Don't wrap lines
-set linebreak    "Wrap lines at convenient points
-
-" ================ Folds ============================
-
-set foldmethod=indent   "fold based on indent
-set foldnestmax=3       "deepest fold is 3 levels
-set nofoldenable        "dont fold by default
-
-" ================ Completion =======================
-
-set wildmode=list:longest
-set wildmenu                "enable ctrl-n and ctrl-p to scroll thru matches
-set wildignore=*.o,*.obj,*~ "stuff to ignore when tab completing
-set wildignore+=*vim/backups*
-set wildignore+=*sass-cache*
-set wildignore+=*DS_Store*
-set wildignore+=vendor/rails/**
-set wildignore+=vendor/cache/**
-set wildignore+=*.gem
-set wildignore+=log/**
-set wildignore+=tmp/**
-set wildignore+=*.png,*.jpg,*.gif
-
-" ================ Scrolling ========================
-
-set scrolloff=8         "Start scrolling when we're 8 lines away from margins
-set sidescrolloff=15
-set sidescroll=1
-
-" ================ Search ===========================
-
-set incsearch       " Find the next match as we type the search
-set hlsearch        " Highlight searches by default
-set ignorecase      " Ignore case when searching...
-set smartcase       " ...unless we type a capital
-set infercase                   " Allow smarter completion by infering the case
-
-" ================ Custom Settings ========================
-so ~/.yadr/vim/settings.vim
-
-" Delete trailing white space on save, useful for Python and CoffeeScript ;)
-func! DeleteTrailingWS()
-  exe "normal mz"
-  %s/\s\+$//ge
-  exe "normal `z"
-endfunc
-autocmd BufWrite *.py :call DeleteTrailingWS()
-autocmd BufWrite *.coffee :call DeleteTrailingWS()
-
-" Use Unix as the standard file type
-set ffs=unix,dos,mac
-
-" In many terminal emulators the mouse works just fine, thus enable it.
-if has('mouse')
-  set mouse=a
-endif