From 51145e740ae0f129457ac43c605d289d975f813b Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Thu, 20 Jun 2024 17:43:11 +0200
Subject: [PATCH 1/2] nvim: Ensure TS is always set up for image.nvim

---
 nvim/.config/nvim/after/ftplugin/quarto.lua     | 4 ++++
 nvim/.config/nvim/lua/plugins/config/lsp.lua    | 4 ++--
 nvim/.config/nvim/lua/plugins/data_analysis.lua | 7 ++++---
 3 files changed, 10 insertions(+), 5 deletions(-)

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
 	},
 }

From a5f0698ab04a44f5e2c98756e48a445d127f7b04 Mon Sep 17 00:00:00 2001
From: Marty Oehme <marty.oehme@gmail.com>
Date: Thu, 20 Jun 2024 17:44:34 +0200
Subject: [PATCH 2/2] nvim: Make molten not lazyload

For some reason molten-nvim fails sometimes when lazy loading. This
simply turns lazy load off for the time being but I should instead
investigate a little more what is actually causing it.
---
 .../nvim/lua/plugins/data_analysis.lua        | 26 +++++++++++++++++++
 1 file changed, 26 insertions(+)

diff --git a/nvim/.config/nvim/lua/plugins/data_analysis.lua b/nvim/.config/nvim/lua/plugins/data_analysis.lua
index 0f153a6..3fbc520 100644
--- a/nvim/.config/nvim/lua/plugins/data_analysis.lua
+++ b/nvim/.config/nvim/lua/plugins/data_analysis.lua
@@ -191,6 +191,32 @@ return {
 			{ "<leader>vn", ":MoltenInfo<cr>" },
 			{ "<localleader>ci", ":MoltenInit<cr>" },
 		},
+		cmd = {
+			"MoltenInfo",
+			"MoltenInit",
+			"MoltenDeinit",
+			"MoltenGoto",
+			"MoltenNext",
+			"MoltenPrev",
+			"MoltenEvaluateLine",
+			"MoltenEvaluateVisual",
+			"MoltenEvaluateOperator",
+			"MoltenEvaluateArgument",
+			"MoltenReevaluateCell",
+			"MoltenDelete",
+			"MoltenShowOutput",
+			"MoltenHideOutput",
+			"MoltenEnterOutput",
+			"MoltenInterrupt",
+			"MoltenOpenInBrowser",
+			"MoltenImagePopup",
+			"MoltenRestart",
+			"MoltenSave",
+			"MoltenLoad",
+			"MoltenExportOutput",
+			"MoltenImportOutput",
+		},
+		lazy = false,
 	},
 
 	-- Edit code blocks in md/quarto using whatever language is