From 22c0a6c9a51026d184846b18f460d5bbc9bd2766 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Fri, 4 Jan 2019 22:47:25 +0000
Subject: [PATCH] Simplify vim setup

---
 files/vimrc        | 17 ++++++++++++-----
 tasks/packages.yml |  1 +
 tasks/vim.yml      | 23 ++++++++++++++++++++---
 3 files changed, 33 insertions(+), 8 deletions(-)

diff --git a/files/vimrc b/files/vimrc
index 6544f3c..9424268 100644
--- a/files/vimrc
+++ b/files/vimrc
@@ -1,11 +1,18 @@
-set runtimepath+=/usr/share/amix_vimrc
+execute pathogen#infect()
 
-source /usr/share/amix_vimrc/vimrcs/basic.vim
-source /usr/share/amix_vimrc/vimrcs/filetypes.vim
-source /usr/share/amix_vimrc/vimrcs/plugins_config.vim
-source /usr/share/amix_vimrc/vimrcs/extended.vim
+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
diff --git a/tasks/packages.yml b/tasks/packages.yml
index 042bb99..921955b 100644
--- a/tasks/packages.yml
+++ b/tasks/packages.yml
@@ -183,6 +183,7 @@
     - 'ttf-ms-fonts'
     - 'ttf-wps-fonts'
     - 'universal-ctags-git'
+    - 'vim-pathogen'
     - 'visual-studio-code-bin'
     - 'virtualbox'
     - 'vivaldi'
diff --git a/tasks/vim.yml b/tasks/vim.yml
index ee66296..f6f64ad 100644
--- a/tasks/vim.yml
+++ b/tasks/vim.yml
@@ -12,7 +12,24 @@
     owner: root
     group: users
 
-- git:
-    repo: https://github.com/amix/vimrc.git
-    dest: /usr/share/amix_vimrc
+- 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 }}"
+  with_items:
+    - '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'