diff --git a/files/vimrc b/files/vimrc
index 9424268..c954284 100644
--- a/files/vimrc
+++ b/files/vimrc
@@ -1,18 +1,21 @@
-execute pathogen#infect()
-
-let g:lightline = {'colorscheme': 'wombat'}
-
 cmap w!! w !sudo tee >/dev/null %
 :set mouse=a
 
 syntax on
 filetype plugin indent on
 
-set laststatus=2
-
 if !has('gui_running')
   set t_Co=256
 endif
 
 set background=dark
-colorscheme peaksea
+
+" Tab inserts 4 spaces
+set expandtab
+set ts=4 sw=4 sts=4
+
+" Autocomplete in command mode (Tab to invoke)
+set wildmenu
+
+" Set the 'default but not default' colour scheme
+colo default
diff --git a/tasks/vim.yml b/tasks/vim.yml
index b478e28..e68c1af 100644
--- a/tasks/vim.yml
+++ b/tasks/vim.yml
@@ -1,11 +1,10 @@
-- name: Install dev packages
+- name: Install vim
   aur:
     name: "{{ item }}"
   become: true
   become_user: aur_builder
   loop:
     - gvim
-    - vim-pathogen
 
 - name: Install vimrc
   copy:
@@ -22,26 +21,3 @@
     mode: 0644
     owner: root
     group: users
-
-- name: Create vim packages directory
-  file:
-    path: "{{ home }}/.vim/bundle"
-    state: directory
-    owner: "{{ user }}"
-    mode: 0755
-
-- name: Install vim packages
-  git:
-    repo: "{{ item }}"
-    dest: "{{ home }}/.vim/bundle/{{ item.split('/')[-1] }}"
-    force: true
-  become: true
-  become_user: "{{ user }}"
-  loop:
-    - https://github.com/junegunn/goyo.vim
-    - https://github.com/itchyny/lightline.vim
-    - https://github.com/scrooloose/nerdtree
-    - https://github.com/vim-scripts/peaksea
-    - https://github.com/terryma/vim-multiple-cursors
-    - https://github.com/jremmen/vim-ripgrep
-    - https://github.com/amix/vim-zenroom2