summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
-rw-r--r--README.md24
-rw-r--r--init.vim14
-rw-r--r--modules/ale.vim5
-rw-r--r--modules/language_server.vim3
-rw-r--r--modules/vim-which-key.vim11
5 files changed, 38 insertions, 19 deletions
diff --git a/README.md b/README.md
index 6654cb92..598f5ac9 100644
--- a/README.md
+++ b/README.md
@@ -3,3 +3,27 @@
Follow my development here
<https://chiarulli.me>
+
+```
+conda create -n neovim python=3.7
+
+npm i -g neovim
+
+pip install 'python-language-server[all]'
+
+pip uninstall pycodestye
+
+pip install vim-vint
+
+npm i -g bash-language-server
+
+npm install -g javascript-typescript-langserver
+
+```
+
+install ripgrep" for gutentags to ignore .gitignore
+
+install universal ctags"
+
+make sure you open the language server module and point to the correct binaries such as pyls and vint
+
diff --git a/init.vim b/init.vim
index 9f4b2e9e..d8d8884b 100644
--- a/init.vim
+++ b/init.vim
@@ -26,14 +26,8 @@ source $HOME/.config/nvim/modules/test.vim
set conceallevel=0
"TODO"
"change install script to install pyls in base and clone base instead"
-"npm i -g bash-language-server
-"npm install -g javascript-typescript-langserver
"fix ctrl+l in python
-" fixed use :map to see what things are mapped to if behavior is wonky
-"install ripgrep" for gutentags to ignore .gitignore
-"install universal ctags"
-" TODO add this to script npm i -g bash-language-server
-nnoremap <C-h> <C-w>h
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-l> <C-w>l
+nnoremap <M-h> <C-w>h
+nnoremap <M-j> <C-w>j
+nnoremap <M-k> <C-w>k
+nnoremap <M-l> <C-w>l
diff --git a/modules/ale.vim b/modules/ale.vim
index ce2680d4..e7c2a14c 100644
--- a/modules/ale.vim
+++ b/modules/ale.vim
@@ -2,10 +2,11 @@
let g:ale_linters = {
\ 'cpp' : ['gcc'],
\ 'c' : ['gcc'],
- \ 'vim' : ['vint'],
- \ 'python': ['pyls','pydocstyle', 'pycodestyle'],
+ \ 'vim' : ['~/.miniconda/envs/neovim/bin/vint'],
+ \ 'python': [],
\ 'javascript': []
\}
+ "\ 'python': ['pyls','pydocstyle', 'pycodestyle'],
let g:ale_fixers = {
\ '*': ['remove_trailing_lines', 'trim_whitespace'],
diff --git a/modules/language_server.vim b/modules/language_server.vim
index 70c010cb..78b6a046 100644
--- a/modules/language_server.vim
+++ b/modules/language_server.vim
@@ -8,12 +8,11 @@ let g:LanguageClient_serverCommands = {
\ 'rust': ['~/.cargo/bin/rustup', 'run', 'stable', 'rls'],
\ 'javascript': ['javascript-typescript-stdio'],
\ 'javascript.jsx': ['javascript-typescript-stdio'],
- \ 'python': ['pyls'],
+ \ 'python': ['~/.miniconda/envs/neovim/bin/pyls'],
\ 'sh': ['bash-language-server', 'start'],
\ 'c' : ['cquery'],
\ 'cpp' : ['cquery'],
\ }
-
nnoremap <silent> <leader>gh :call LanguageClient_textDocument_hover()<CR>
nnoremap <silent> <leader>gd :call LanguageClient_textDocument_definition()<CR>
nnoremap <silent> <leader>gr :call LanguageClient_textDocument_rename()<CR>
diff --git a/modules/vim-which-key.vim b/modules/vim-which-key.vim
index 7d3cb4cf..962e412b 100644
--- a/modules/vim-which-key.vim
+++ b/modules/vim-which-key.vim
@@ -37,11 +37,12 @@ let g:which_key_map['f'] = [ 'Denite file','files' ]
let g:which_key_map.t = {
\ 'name' : '+toggle' ,
- \ 'e' : ['NERDTreeToggle' , 'file-explorer'] ,
- \ 'b' : ['TagbarToggle' , 'tagbar'] ,
- \ 'n' : ['set nonumber!' , 'line-numbers'] ,
- \ 's' : [':nohlsearch' , 'remove-search-highlight'] ,
- \ 'c' : ['ColorToggle' , 'remove-color'] ,
+ \ 'e' : ['NERDTreeToggle' , 'file-explorer'] ,
+ \ 'b' : ['TagbarToggle' , 'tagbar'] ,
+ \ 'n' : [':set nonumber!' , 'line-numbers'] ,
+ \ 'r' : [':set norelativenumber!' , 'rel-line-numbers'] ,
+ \ 's' : [':let @/ = ""' , 'remove-search-highlight'] ,
+ \ 'c' : ['ColorToggle' , 'remove-color'] ,
\ }
let g:which_key_map.h = {