From 4b993b4339c5972d911d5fe59f37f2cd747177c2 Mon Sep 17 00:00:00 2001 From: Chris Date: Sun, 22 Nov 2020 23:38:01 -0500 Subject: [PATCH] updates --- coc-settings.json | 61 ++++++++++++++++++++++++++---- plug-config/coc/coc-extensions.vim | 1 - plug-config/floaterm.vim | 1 + plug-config/goyo.vim | 27 +++++++++++++ 4 files changed, 82 insertions(+), 8 deletions(-) diff --git a/coc-settings.json b/coc-settings.json index 1a1d9fc9..156bff39 100644 --- a/coc-settings.json +++ b/coc-settings.json @@ -7,6 +7,12 @@ "method": "m", "function": "" }, + "snippets.priority": 1, + //"yank.priority": 1, + "suggest.languageSourcePriority": 99, + "coc.source.file.priority": 2, + "coc.source.around.priority": 3, + "coc.source.buffer.priority": 4, // diagnostics "diagnostic.errorSign": " ", @@ -19,6 +25,8 @@ // codelens "codeLens.enable": true, "java.referencesCodeLens.enabled": true, + "java.implementationsCodeLens.enabled": true, + "java.completion.enabled": true, "java.jdt.ls.vmargs": "-javaagent:/usr/local/share/lombok/lombok.jar", // list @@ -40,14 +48,35 @@ "coc.preferences.hoverTarget": "float", // python config - "python.linting.enabled": false, - "python.linting.pylintEnabled": false, + "python.analysis.autoImportCompletions": true, + "python.analysis.autoSearchPaths": true, + "python.analysis.diagnosticMode": "openFilesOnly", + "python.analysis.stubPath": "typings", + "python.analysis.typeshedPaths": [], + "python.analysis.diagnosticSeverityOverrides": {}, + "python.analysis.typeCheckingMode": "basic", + "python.analysis.useLibraryCodeForTypes": true, + "python.pythonPath": "python", + "python.venvPath": "", "python.formatting.provider": "black", - // "python.formatting.blackPath": "~/.local/bin/black", - // "python.linting.pylintPath": "~/.miniconda/envs/neovim/bin/pylint", - // "python.condaPath": "~/.miniconda/bin/conda", - // "python.sortImports.path": "~/.miniconda/envs/neovim/bin/isort", - // "python.jediPath": "~/.miniconda/envs/neovim/lib/python3.8/site-packages", + "python.formatting.blackPath": "black", + "python.formatting.blackArgs": [], + "python.formatting.autopep8Path": "autopep8", + "python.formatting.autopep8Args": [], + "python.formatting.yapfPath": "yapf", + "python.formatting.yapfArgs": [], + "python.linting.enabled": true, + "python.linting.flake8Enabled": false, + "python.linting.banditEnabled": false, + "python.linting.mypyEnabled": false, + "python.linting.pytypeEnabled": false, + "python.linting.prospectorEnabled": false, + "python.linting.pydocstyleEnabled": false, + "python.linting.pylamaEnabled": false, + "python.linting.pylintEnabled": false, + "pyright.disableCompletion": false, + "pyright.disableLanguageServices": false, + "pyright.disableOrganizeImports": false, // snippets "snippets.ultisnips.directories": ["UltiSnips", "~/.config/nvim/snips"], @@ -77,11 +106,29 @@ "v": "open:vsplit" }, + "languageserver": { + "lua": { + "command": "/home/chris/.luambenvs/neovim4/bin/lua-lsp", + "filetypes": ["lua"], + "trace.server": "verbose" + } + }, + "bookmark.sign": "", //coc-emoji "coc.source.emoji.filetypes": ["markdown"] + // lua + //"lua.useSumnekoLs": true, + //"lua.commandPath": "/home/chris/.luambenvs/neovim3/bin/lua-lsp" + //"lua.enable": true, + //"Lua.completion.enable": true, + //"Lua.runtime.version": "Lua 5.1", + //"Lua.runtime.path": ["?.lua", "?/init.lua", "?/?.lua"], + //"lua.version": "5.1" + //"lua.commandPath": "/home/chris/.vscode-insiders/extensions/sumneko.lua-1.0.5/server/bin/Linux/lua-language-server" + // TODO b:coc_suggest_disable=1 GOYO // TODO add to paths.vim g:coc_node_path } diff --git a/plug-config/coc/coc-extensions.vim b/plug-config/coc/coc-extensions.vim index 28e17c62..d44e316e 100644 --- a/plug-config/coc/coc-extensions.vim +++ b/plug-config/coc/coc-extensions.vim @@ -18,7 +18,6 @@ let g:coc_global_extensions = [ \ 'coc-emoji', \ 'coc-bookmark', \ 'coc-yaml', - \ 'coc-python', \ 'coc-pyright', \ 'coc-explorer', \ 'coc-svg', diff --git a/plug-config/floaterm.vim b/plug-config/floaterm.vim index eb1eb565..09eaefa4 100644 --- a/plug-config/floaterm.vim +++ b/plug-config/floaterm.vim @@ -6,6 +6,7 @@ let g:floaterm_keymap_toggle = '' let g:floaterm_keymap_next = '' let g:floaterm_keymap_prev = '' let g:floaterm_keymap_new = '' +let g:floaterm_title='' " Floaterm let g:floaterm_gitcommit='floaterm' diff --git a/plug-config/goyo.vim b/plug-config/goyo.vim index f83965af..634faa73 100644 --- a/plug-config/goyo.vim +++ b/plug-config/goyo.vim @@ -1 +1,28 @@ " nmap z :Goyo +" autocmd User GoyoEnter set laststatus=0 +" autocmd User GoyoLeave set laststatus=2 +" function! s:goyo_enter() + +" set wrap +" set conceallevel=0 +" set tw=100 +" set noshowcmd +" set scrolloff=999 +" set laststatus=0 + +" endfunction + +" function! s:goyo_leave() + +" set wrap! +" set showcmd +" set scrolloff=5 +" set laststatus=2 + +" endfunction + +" autocmd! User GoyoEnter nested call goyo_enter() +" autocmd! User GoyoLeave nested call goyo_leave() + +autocmd! User GoyoEnter lua require('galaxyline').disable_galaxyline() +autocmd! User GoyoLeave lua require('galaxyline').galaxyline_augroup()