From de8b5598e795b55ed70458cc37e6d237241a8ff0 Mon Sep 17 00:00:00 2001
From: Chris <chrisatmachine@gmail.com>
Date: Thu, 9 Apr 2020 14:09:56 -0400
Subject: updates and stuff

---
 README.md             | 1 +
 coc-settings.json     | 2 +-
 init.vim              | 3 ++-
 modules/colorizer.vim | 4 +---
 modules/general.vim   | 4 +++-
 modules/nodepath.vim  | 3 ++-
 modules/plugins.vim   | 2 +-
 modules/polyglot.vim  | 4 ++++
 utils/installer.sh    | 0
 9 files changed, 15 insertions(+), 8 deletions(-)
 create mode 100644 modules/polyglot.vim
 mode change 100644 => 100755 utils/installer.sh

diff --git a/README.md b/README.md
index bb7b2d9c..e18d40ba 100644
--- a/README.md
+++ b/README.md
@@ -54,6 +54,7 @@ example:
 
 ```
 let g:coc_node_path = expand("~/.nvm/versions/node/v12.16.1/bin/node")
+let g:node_host_prog = expand("~/.nvm/versions/node/v12.16.1/bin/node")
 ```
 
 ## Set up plugin manager
diff --git a/coc-settings.json b/coc-settings.json
index da3e97d3..95aa161a 100644
--- a/coc-settings.json
+++ b/coc-settings.json
@@ -1,3 +1,3 @@
 {
-  "coc.preferences.formatOnSaveFiletypes": ["css", "markdown", "javascript", "graphql", "html", "yaml"]
+  "coc.preferences.formatOnSaveFiletypes": ["css", "markdown", "javascript", "graphql", "html", "yaml", "python"]
 }
diff --git a/init.vim b/init.vim
index 33d41e10..b8f25196 100644
--- a/init.vim
+++ b/init.vim
@@ -13,12 +13,13 @@ source $HOME/.config/nvim/modules/markdowm_preview.vim
 source $HOME/.config/nvim/modules/goyo-limelight.vim
 source $HOME/.config/nvim/modules/relativenums.vim
 source $HOME/.config/nvim/modules/emmet.vim
-source $HOME/.config/nvim/modules/colorizer.vim
 source $HOME/.config/nvim/modules/rainbow.vim
 source $HOME/.config/nvim/modules/vim-which-key.vim
 source $HOME/.config/nvim/modules/echodoc.vim         " I forget what this does
+source $HOME/.config/nvim/modules/colorizer.vim         " I forget what this does
 source $HOME/.config/nvim/modules/coc.vim         
 source $HOME/.config/nvim/modules/sneak.vim         
+source $HOME/.config/nvim/modules/polyglot.vim         
 
 "source $HOME/.config/nvim/modules/gutentags_plus.vim " disabled until 141 error is fixed
 "source $HOME/.config/nvim/modules/ale.vim
diff --git a/modules/colorizer.vim b/modules/colorizer.vim
index 9348451c..176d78ca 100644
--- a/modules/colorizer.vim
+++ b/modules/colorizer.vim
@@ -1,4 +1,2 @@
-let g:colorizer_syntax = 1
-let g:colorizer_auto_filetype='js,css,html,jsx,ts,tsx'
-au BufNewFile,BufRead *.css,*.html,*.htm,*.js,*.jsx,*.ts,*.tsx  :ColorHighlight!
+lua require'colorizer'.setup()
 
diff --git a/modules/general.vim b/modules/general.vim
index 42f1e7a7..b7764572 100644
--- a/modules/general.vim
+++ b/modules/general.vim
@@ -57,6 +57,8 @@ inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
 nnoremap <silent> <F1> :10split term://bash<CR>
 nnoremap <silent> <F2> :bdelete! term://*<return>
 
+inoremap K <c-d>
+nnoremap J <c-u>
 
 nnoremap <C-h> <C-w>h
 nnoremap <C-j> <C-w>j
@@ -85,7 +87,7 @@ nnoremap <D-l> <C-w>l
 inoremap jk <Esc>
 inoremap kj <Esc>
 " This is how much I hate it
-inoremap <esc> <nop>
+"inoremap <esc> <nop>
 
 " Easy CAPS
 inoremap <c-u> <ESC>viwUi
diff --git a/modules/nodepath.vim b/modules/nodepath.vim
index 20d6c33d..792df67d 100644
--- a/modules/nodepath.vim
+++ b/modules/nodepath.vim
@@ -1,2 +1,3 @@
 " You can comment this and recomment it after installing coc executable('~/.nvm/versions/node/v12.16.1/bin/node')
-let g:coc_node_path = expand("~/.nvm/versions/node/v12.16.1/bin/node")
+let g:node_host_prog = expand("~/.fnm/aliases/stable/bin/node")
+let g:coc_node_path = expand("~/.fnm/aliases/stable/bin/node")
diff --git a/modules/plugins.vim b/modules/plugins.vim
index 549b4a18..fbcc7738 100644
--- a/modules/plugins.vim
+++ b/modules/plugins.vim
@@ -81,7 +81,7 @@ if dein#load_state('~/.config/nvim/dein')
   "echo doc 
   call dein#add('Shougo/echodoc.vim')
   "Colorizer "
-  call dein#add('chrisbra/Colorizer')
+  call dein#add('norcalli/nvim-colorizer.lua')
   " Python docstring "
   call dein#add('heavenshell/vim-pydocstring')
   
diff --git a/modules/polyglot.vim b/modules/polyglot.vim
new file mode 100644
index 00000000..08c5d72c
--- /dev/null
+++ b/modules/polyglot.vim
@@ -0,0 +1,4 @@
+aug i3config_ft_detection
+  au!
+  au BufNewFile,BufRead ~/.config/i3/config set filetype=i3config
+aug end
diff --git a/utils/installer.sh b/utils/installer.sh
old mode 100644
new mode 100755
-- 
cgit v1.2.3