pixelifytica/nixos
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

Merge branch 'main' of github.com:elitherl/vim-config into main

Browse source
This commit is contained in:
Evie Litherland-Smith 2022-11-02 11:15:21 +00:00
parent 40fc713876 e5cb627087
commit 5230ee236a
2 changed files with 36 additions and 18 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
README.md
View file

@ -38,7 +38,7 @@ Plugin definitions are in `plugins.lua`, inside `vim` run `:PackerSync` to insta
pyenv virtualenv neovim3 # Assumes working pyenv pyenv virtualenv neovim3 # Assumes working pyenv
pyenv activate neovim3 pyenv activate neovim3
pip install -U pip setuptools wheel pip install -U pip setuptools wheel
pip install -U pynvim "python-lsp-server[all]" fortls pylsp-mypy python-lsp-black pip install -U pynvim pyright fortl # If pyright not available, fallback to: "python-lsp-server[all]" pylsp-mypy
pyenv deactivate pyenv deactivate
``` ```

24
lua/config_lsp.lua
View file

@ -104,8 +104,24 @@ cmp.setup.cmdline(':', {
-- Setup lspconfig. -- Setup lspconfig.
local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities()) local capabilities = require('cmp_nvim_lsp').default_capabilities(vim.lsp.protocol.make_client_capabilities())
require('lspconfig')['pylsp'].setup{ local function file_exists(name)
cmd = {os.getenv( "HOME" ).."/.pyenv/versions/neovim3/bin/pylsp"}, local f=io.open(name,"r")
if f~=nil then io.close(f) return true else return false end
end
local pyright_file = os.getenv( "HOME" ).."/.pyenv/versions/neovim3/bin/pyright-langserver"
local pylsp_file = os.getenv( "HOME" ).."/.pyenv/versions/neovim3/bin/pylsp"
if file_exists(pyright_file) then
require('lspconfig')['pyright'].setup{
cmd = {pyright_file, "--stdio"},
on_attach = on_attach,
flags = lsp_flags,
capabilities = capabilities,
}
elseif file_exists(pylsp_file) then
require('lspconfig')['pylsp'].setup{
cmd = {pylsp_file},
on_attach = on_attach, on_attach = on_attach,
flags = lsp_flags, flags = lsp_flags,
settings = { settings = {
@ -117,7 +133,9 @@ require('lspconfig')['pylsp'].setup{
} }
}, },
capabilities = capabilities capabilities = capabilities
} }
end
require('lspconfig')['fortls'].setup{ require('lspconfig')['fortls'].setup{
cmd = {os.getenv( "HOME" ).."/.pyenv/versions/neovim3/bin/fortls"}, cmd = {os.getenv( "HOME" ).."/.pyenv/versions/neovim3/bin/fortls"},
on_attach = on_attach, on_attach = on_attach,