Update vim and add tmux

playbook.yml

@@ -10,6 +10,7 @@
     - {role: 'ssh', tags: 'ssh'}
     - {role: 'zsh', tags: 'zsh'}
     - {role: 'iterm2', tags: 'iterm2'}
+    - {role: 'tmux', tags: 'tmux'}
     - {role: 'vim', tags: 'vim'}
     - {role: 'golang', tags: 'golang'}
     - {role: 'jvm', tags: 'jvm'}

roles/brew/vars/main.yml

@@ -5,6 +5,7 @@ taps:
   - homebrew/cask
   - jesseduffield/lazygit
   - wata727/tflint
+  - wagoodman/dive
 
 apps:
   - ansible
@@ -43,7 +44,7 @@ cask_apps:
   - vagrant
   - veracrypt
   - visual-studio-code
-  - virtualbox
+#  - virtualbox
   - vlc
   - wireshark
   - flux

roles/docker/tasks/main.yml

@@ -8,8 +8,3 @@
   homebrew:
     name: kubernetes-cli
     state: present
-
-- name: Make sure minikube is installed
-  homebrew_cask:
-    name: minikube
-    state: present

roles/python/tasks/main.yml

@@ -1,8 +1,11 @@
 ---
-- name: Install python 3
+- name: Install python
   homebrew:
-    name: python
+    name: '{{ item }}'
     state: latest
+  with_items:
+    - python@2
+    - python
 
 - name: Install pipenv
   pip:

roles/tmux/tasks/main.yml

@@ -0,0 +1,19 @@
+---
+- name: Make sure folders are present
+  file:
+    path: '{{ item }}'
+    state: directory
+  with_items:
+    - '{{ tmux_path }}'
+    - '{{ tmux_path }}/plugins'
+
+- name: Make sure config is generated
+  template:
+    src: 'templates/.tmux.conf.j2'
+    dest: '~/.tmux.conf'
+
+- name: Make sure tmp is installed
+  git:
+    repo: 'https://github.com/tmux-plugins/tpm'
+    dest: '{{ tmux_path }}/plugins/tpm'
+    depth: 1

roles/tmux/templates/.tmux.conf.j2

@@ -0,0 +1,8 @@
+# List of plugins
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-sensible'
+set -g @plugin 'christoomey/vim-tmux-navigator'
+
+set-environment -g PATH "/usr/local/bin:/bin:/usr/bin"
+
+run '{{ tmux_path }}/plugins/tpm/tpm'

roles/tmux/vars/main.yml

@@ -0,0 +1,2 @@
+---
+tmux_path: '~/.tmux'

roles/vim/tasks/main.yml

@@ -14,10 +14,21 @@
     url: https://raw.githubusercontent.com/junegunn/vim-plug/master/plug.vim
     dest: "{{ autoload_path }}/plug.vim"
 
+- name: Check that the python_venv exists
+  stat:
+    path: '{{ python_venv_path }}'
+  register: python_venv_present
+
+- name: Check that the python3_venv exists
+  stat:
+    path: '{{ python3_venv_path }}'
+  register: python3_venv_present
+
 - name: Make sure venvs are created for python2 and python3
   shell: |
     virtualenv -p python {{ python_venv_path }}
     virtualenv -p python3 {{ python3_venv_path }}
+  when: not (python_venv_present and python3_venv_path)
 
 - name: Make sure neovim libs are intalled to python venv
   pip:
@@ -28,7 +39,8 @@
 - name: Make sure neovim libs are intalled to python3 venv
   pip:
     virtualenv: "{{ python3_venv_path }}"
-    name: "{{ python_libs }}"
+    virtualenv_python: python3
+    name: "{{ python3_libs }}"
     state: latest
 
 - name: Create directories

roles/vim/templates/plugins.vim

@@ -3,6 +3,8 @@ call plug#begin('{{ plug_path }}')
 Plug 'editorconfig/editorconfig-vim'
 Plug 'dracula/vim'
 
+Plug 'christoomey/vim-tmux-navigator'
+
 " File explorer and tabs
 Plug 'scrooloose/nerdtree'
 
@@ -21,7 +23,7 @@ Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
 Plug 'junegunn/fzf.vim'
 
 " Autocomplete
-Plug 'Shougo/deoplete.nvim'
+Plug 'Shougo/deoplete.nvim' { 'do': ':UpdateRemovePlugins' }
 
 " Quoting/Parenthesizing
 Plug 'tpope/vim-surround'

roles/vim/vars/main.yml

@@ -9,8 +9,16 @@ autoload_path: "{{ config_path }}/autoload"
 
 python_venv_path: "{{ config_path }}/python_venv"
 python3_venv_path: "{{ config_path }}/python3_venv"
+
 python_libs:
   - neovim
   - flake8
   - websocket-client
   - sexpdata
+
+python3_libs:
+  - pynvim
+  - neovim
+  - flake8
+  - websocket-client
+  - sexpdata