浏览代码

updates and stuff

Chris 5 年之前
父节点
当前提交
de8b5598e7
共有 9 个文件被更改,包括 15 次插入8 次删除
  1. 1 0
      README.md
  2. 1 1
      coc-settings.json
  3. 2 1
      init.vim
  4. 1 3
      modules/colorizer.vim
  5. 3 1
      modules/general.vim
  6. 2 1
      modules/nodepath.vim
  7. 1 1
      modules/plugins.vim
  8. 4 0
      modules/polyglot.vim
  9. 0 0
      utils/installer.sh

+ 1 - 0
README.md

@@ -54,6 +54,7 @@ example:
 
 
 ```
 ```
 let g:coc_node_path = expand("~/.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("~/.nvm/versions/node/v12.16.1/bin/node")
 ```
 ```
 
 
 ## Set up plugin manager
 ## Set up plugin manager

+ 1 - 1
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"]
 }
 }

+ 2 - 1
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/goyo-limelight.vim
 source $HOME/.config/nvim/modules/relativenums.vim
 source $HOME/.config/nvim/modules/relativenums.vim
 source $HOME/.config/nvim/modules/emmet.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/rainbow.vim
 source $HOME/.config/nvim/modules/vim-which-key.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/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/coc.vim         
 source $HOME/.config/nvim/modules/sneak.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/gutentags_plus.vim " disabled until 141 error is fixed
 "source $HOME/.config/nvim/modules/ale.vim
 "source $HOME/.config/nvim/modules/ale.vim

+ 1 - 3
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()
 
 

+ 3 - 1
modules/general.vim

@@ -57,6 +57,8 @@ inoremap <expr><TAB> pumvisible() ? "\<C-n>" : "\<TAB>"
 nnoremap <silent> <F1> :10split term://bash<CR>
 nnoremap <silent> <F1> :10split term://bash<CR>
 nnoremap <silent> <F2> :bdelete! term://*<return>
 nnoremap <silent> <F2> :bdelete! term://*<return>
 
 
+inoremap K <c-d>
+nnoremap J <c-u>
 
 
 nnoremap <C-h> <C-w>h
 nnoremap <C-h> <C-w>h
 nnoremap <C-j> <C-w>j
 nnoremap <C-j> <C-w>j
@@ -85,7 +87,7 @@ nnoremap <D-l> <C-w>l
 inoremap jk <Esc>
 inoremap jk <Esc>
 inoremap kj <Esc>
 inoremap kj <Esc>
 " This is how much I hate it
 " This is how much I hate it
-inoremap <esc> <nop>
+"inoremap <esc> <nop>
 
 
 " Easy CAPS
 " Easy CAPS
 inoremap <c-u> <ESC>viwUi
 inoremap <c-u> <ESC>viwUi

+ 2 - 1
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')
 " 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")

+ 1 - 1
modules/plugins.vim

@@ -81,7 +81,7 @@ if dein#load_state('~/.config/nvim/dein')
   "echo doc 
   "echo doc 
   call dein#add('Shougo/echodoc.vim')
   call dein#add('Shougo/echodoc.vim')
   "Colorizer "
   "Colorizer "
-  call dein#add('chrisbra/Colorizer')
+  call dein#add('norcalli/nvim-colorizer.lua')
   " Python docstring "
   " Python docstring "
   call dein#add('heavenshell/vim-pydocstring')
   call dein#add('heavenshell/vim-pydocstring')
   
   

+ 4 - 0
modules/polyglot.vim

@@ -0,0 +1,4 @@
+aug i3config_ft_detection
+  au!
+  au BufNewFile,BufRead ~/.config/i3/config set filetype=i3config
+aug end

+ 0 - 0
utils/installer.sh