diff --git a/nvim/.config/nvim/after/ftplugin/quarto.lua b/nvim/.config/nvim/after/ftplugin/quarto.lua index 8840c65..39fecf5 100644 --- a/nvim/.config/nvim/after/ftplugin/quarto.lua +++ b/nvim/.config/nvim/after/ftplugin/quarto.lua @@ -12,7 +12,11 @@ end -- Start quarto session local startsession = function(file, args) file = file or default_buffer_session() + local path = require("core.util").get_python_venv_bin() + if not path then + return + end vim.g["python3_host_prog"] = path if vim.fn.executable("jupyter-console") ~= 1 then diff --git a/nvim/.config/nvim/lua/plugins/config/lsp.lua b/nvim/.config/nvim/lua/plugins/config/lsp.lua index 3481a46..d59ab15 100644 --- a/nvim/.config/nvim/lua/plugins/config/lsp.lua +++ b/nvim/.config/nvim/lua/plugins/config/lsp.lua @@ -157,10 +157,10 @@ local python_path lspconfig.basedpyright.setup({ on_attach = function(client, bufnr) on_attach(client, bufnr) + require("core.util").set_python_env() if python_path == nil then python_path, _ = vim.fn.expand(require("core.util").get_python_venv_bin(client.config.root_dir)) end - vim.g["python3_host_prog"] = python_path -- print(string.format("[PYTHON VENV]: %s", vim.inspect(python_path))) client.config.settings.python = {} or client.config.settings.python client.config.settings.python.pythonPath = python_path @@ -180,11 +180,11 @@ lspconfig.basedpyright.setup({ lspconfig.ruff.setup({ on_attach = function(client, bufnr) on_attach(client, bufnr) + require("core.util").set_python_env() client.server_capabilities.hoverProvider = false -- we use pyright for hover info if python_path == nil then python_path, _ = vim.fn.expand(require("core.util").get_python_venv_bin(client.config.root_dir)) end - vim.g["python3_host_prog"] = python_path client.config.settings.python = {} or client.config.settings.python client.config.settings.python.pythonPath = python_path end, diff --git a/nvim/.config/nvim/lua/plugins/data_analysis.lua b/nvim/.config/nvim/lua/plugins/data_analysis.lua index 3eb3a05..0f153a6 100644 --- a/nvim/.config/nvim/lua/plugins/data_analysis.lua +++ b/nvim/.config/nvim/lua/plugins/data_analysis.lua @@ -60,7 +60,7 @@ return { -- image display { "3rd/image.nvim", - dependencies = { "luarocks.nvim" }, + dependencies = { "luarocks.nvim", { "nvim-treesitter/nvim-treesitter", optional = true } }, cond = vim.fn.executable("magick") == 1, -- only runs if imagemagick installed config = function() local integrations = {} @@ -88,10 +88,11 @@ return { integrations = integrations, }) vim.g.molten_image_provider = "image.nvim" + pcall(vim.fn.MoltenUpdateOption, "molten_image_provider", "image.nvim") end end, ft = { "markdown", "vimwiki", "quarto", "norg", "python" }, - priority = 51, + priority = 60, }, -- REPL work { @@ -242,6 +243,6 @@ return { }, }, cond = vim.fn.executable("jupytext") == 1, -- only runs if imagemagick installed - lazy = false -- does not work in lazy mode + lazy = false, -- does not work in lazy mode }, }