Sfoglia il codice sorgente

fix: python pathing

Sam Jaffe 2 mesi fa
parent
commit
8eb9011d91
2 ha cambiato i file con 14 aggiunte e 19 eliminazioni
  1. 10 1
      coc-settings.json
  2. 4 18
      vimrc

+ 10 - 1
coc-settings.json

@@ -13,7 +13,7 @@
       "ignoredRootPaths": ["~"]
     },
     "python": {
-      "command": "python",
+      "command": "~/.pyenv/versions/nvim/bin/python3",
       "args": [
 	"-mpyls",
 	"-vv"
@@ -25,8 +25,17 @@
 	"pyls": {
 	  "enable": true,
 	  "plugins": {
+	    "pycodestyle": {
+	      "enabled": false
+	    },
+	    "pyflakes": {
+	      "enabled": false
+	    },
 	    "pyls_mypy": {
 	      "enabled": true
+	    },
+	    "yapf": {
+	      "enabled": true
 	    }
 	  }
 	}

+ 4 - 18
vimrc

@@ -1,10 +1,7 @@
 " wreed vimrc
 " vim:foldmethod=marker:foldlevel=0:
 
-" let g:python_host_prog= expand('$HOME') . '/.pyenv/versions/neovim2/bin/python'
-let g:python_host_prog = expand('$HOME') . '/.pyenv/versions/2.7/bin/python'
-" let g:python3_host_prog= expand('$HOME') . '/.pyenv/versions/neovim3/bin/python'
-let g:python3_host_prog = '/Library/Frameworks/Python.framework/Versions/3.10/bin/python3'
+let g:python3_host_prog = expand('$HOME') . '/.pyenv/versions/nvim/bin/python3'
 
 "{{{ ***** PLUGINS INSTALLATION ***** "
 
@@ -276,7 +273,7 @@ nnoremap <leader>gst :GFiles!?<CR>
 augroup json_autocmd
   autocmd!
   autocmd FileType json set autoindent
-  autocmd FileType json set formatoptions=tcq2l
+  autocmd FileType json set formatoptions=cq2
   autocmd FileType json set foldmethod=indent
 augroup END
 
@@ -526,17 +523,6 @@ nnoremap <silent><nowait> <space>j  :<C-u>CocNext<CR>
 nnoremap <silent><nowait> <space>k  :<C-u>CocPrev<CR>
 " Resume latest coc list
 nnoremap <silent><nowait> <space>p  :<C-u>CocListResume<CR>
-" }}}
-
-nmap <silent> <leader>] <Plug>(coc-definition)
-" nmap <silent> gf <Plug>(coc-definition)
-nmap <silent> gy <Plug>(coc-type-definition)
-nmap <silent> gi <Plug>(coc-implementation)
-nmap <silent> gr <Plug>(coc-references)
-
-" Highlight symbol under cursor on CursorHold
-autocmd CursorHold * silent call CocActionAsync('highlight')
-
 " }}}
 " {{{ ##### instant-markdown-viewer #####
 " let g:instant_markdown_python = 1
@@ -761,7 +747,7 @@ augroup END
 
 "{{{ ***** VISUALS ***** "
 set number
-set norelativenumber
+set relativenumber
 
 set expandtab
 set shiftwidth=2
@@ -804,7 +790,7 @@ set whichwrap+=<,>,h,l
 " nnoremap <silent> <F5> :so ~/.vim/vimrc<CR>:LvimrcReload<CR>
 nnoremap <silent> <F5> :so ~/.vim/vimrc<CR>
 nnoremap <silent> <F6> :redraw!<CR>
-set pastetoggle=<F7>
+" set pastetoggle=<F7>
 nmap <F8> :mks!<CR>
 
 " treat wrapped lines as multiple lines when navigating