From ada47a526fc1e341dcec4f036c354045d0a86436 Mon Sep 17 00:00:00 2001
From: Alex Manning <alexander.manning@stfc.ac.uk>
Date: Wed, 8 Dec 2021 09:39:41 +0000
Subject: [PATCH] .vim

---
 home/.bash_profile                             | 3 ---
 home/.vimrc                                    | 8 ++++----
 home/.vimrc.d/{base => base.vim}               | 0
 home/.vimrc.d/coc/coc-settings.json            | 6 ++++++
 home/.vimrc.d/{dev-environ => dev-environ.vim} | 0
 home/.vimrc.d/{filetypes => filetypes.vim}     | 0
 home/.vimrc.d/{plugins => plugins.vim}         | 0
 7 files changed, 10 insertions(+), 7 deletions(-)
 rename home/.vimrc.d/{base => base.vim} (100%)
 rename home/.vimrc.d/{dev-environ => dev-environ.vim} (100%)
 rename home/.vimrc.d/{filetypes => filetypes.vim} (100%)
 rename home/.vimrc.d/{plugins => plugins.vim} (100%)

diff --git a/home/.bash_profile b/home/.bash_profile
index 57ddc1f..8b22fe2 100644
--- a/home/.bash_profile
+++ b/home/.bash_profile
@@ -12,9 +12,6 @@ PATH=$AE_HOME/scripts:$PATH
 PATH=/opt/bin:$PATH
 export PATH
 
-PYTHONPATH=$HOME/.python-modules:$PYTHONPATH
-export PYTHONPATH
-
 # If not running interactively, don't do anything else
 [[ $- != *i* ]] && return
 
diff --git a/home/.vimrc b/home/.vimrc
index 57546f2..bada279 100644
--- a/home/.vimrc
+++ b/home/.vimrc
@@ -2,8 +2,8 @@ if !exists("g:my_environ_dir")
     let g:my_environ_dir = expand('~/.alex-environ')
 endif
 
-exe "source " . g:my_environ_dir . "/home/.vimrc.d/base"
-exe "source " . g:my_environ_dir . "/home/.vimrc.d/filetypes"
+exe "source " . g:my_environ_dir . "/home/.vimrc.d/base.vim"
+exe "source " . g:my_environ_dir . "/home/.vimrc.d/filetypes.vim"
 
-exe "source " . g:my_environ_dir . "/home/.vimrc.d/plugins"
-exe "source " . g:my_environ_dir . "/home/.vimrc.d/dev-environ"
+exe "source " . g:my_environ_dir . "/home/.vimrc.d/plugins.vim"
+exe "source " . g:my_environ_dir . "/home/.vimrc.d/dev-environ.vim"
diff --git a/home/.vimrc.d/base b/home/.vimrc.d/base.vim
similarity index 100%
rename from home/.vimrc.d/base
rename to home/.vimrc.d/base.vim
diff --git a/home/.vimrc.d/coc/coc-settings.json b/home/.vimrc.d/coc/coc-settings.json
index 7170a6d..bc0a50e 100644
--- a/home/.vimrc.d/coc/coc-settings.json
+++ b/home/.vimrc.d/coc/coc-settings.json
@@ -1,10 +1,16 @@
 {
     "python.linting.enabled": false,
+    "python.jediEnabled": false,
+
     "rust-client.disableRustup": true,
+
     "javascript.format.enabled": false,
     "javascript.validate.enable": false,
+
     "typescript.format.enabled": false,
     "typescript.validate.enable": false,
+
     "json.format.enable": false,
+
     "diagnostic.displayByAle": true
 }
diff --git a/home/.vimrc.d/dev-environ b/home/.vimrc.d/dev-environ.vim
similarity index 100%
rename from home/.vimrc.d/dev-environ
rename to home/.vimrc.d/dev-environ.vim
diff --git a/home/.vimrc.d/filetypes b/home/.vimrc.d/filetypes.vim
similarity index 100%
rename from home/.vimrc.d/filetypes
rename to home/.vimrc.d/filetypes.vim
diff --git a/home/.vimrc.d/plugins b/home/.vimrc.d/plugins.vim
similarity index 100%
rename from home/.vimrc.d/plugins
rename to home/.vimrc.d/plugins.vim