diff --git a/lua/lsp/basedpyright.lua b/lua/lsp/basedpyright.lua index c944261..d0898f9 100644 --- a/lua/lsp/basedpyright.lua +++ b/lua/lsp/basedpyright.lua @@ -1,22 +1,5 @@ - -local function isempty(s) - return s == nil or s == "" -end - -local function use_if_defined(val, fallback) - return val ~= nil and val or fallback -end - return { on_attach = function() - local conda_prefix = os.getenv("CONDA_PREFIX") - if not isempty(conda_prefix) then - vim.g.python_host_prog = use_if_defined(vim.g.python_host_prog, conda_prefix .. "/bin/python") - vim.g.python3_host_prog = use_if_defined(vim.g.python3_host_prog, conda_prefix .. "/bin/python") - else - vim.g.python_host_prog = use_if_defined(vim.g.python_host_prog, "python") - vim.g.python3_host_prog = use_if_defined(vim.g.python3_host_prog, "python3") - end G.api.nvim_create_user_command('R', function() G.cmd [[set splitbelow]] G.cmd [[sp]] diff --git a/lua/options.lua b/lua/options.lua index 8a2051f..1a7ef51 100644 --- a/lua/options.lua +++ b/lua/options.lua @@ -69,3 +69,23 @@ G.au({ "VimEnter", "BufEnter" }, { -- if index -- } -- }) + + +local function isempty(s) + return s == nil or s == "" +end + +local function use_if_defined(val, fallback) + return val ~= nil and val or fallback +end + + +local conda_prefix = os.getenv("CONDA_PREFIX") +if not isempty(conda_prefix) then + vim.g.python_host_prog = use_if_defined(vim.g.python_host_prog, conda_prefix .. "/bin/python") + vim.g.python3_host_prog = use_if_defined(vim.g.python3_host_prog, conda_prefix .. "/bin/python") +else + vim.g.python_host_prog = use_if_defined(vim.g.python_host_prog, "python") + vim.g.python3_host_prog = use_if_defined(vim.g.python3_host_prog, "python3") +end +