Compare commits

..

No commits in common. "a5f0698ab04a44f5e2c98756e48a445d127f7b04" and "87ce74de403d6537dacbcca038aba2f7ccd326e5" have entirely different histories.

3 changed files with 5 additions and 36 deletions

View file

@ -12,11 +12,7 @@ end
-- Start quarto session -- Start quarto session
local startsession = function(file, args) local startsession = function(file, args)
file = file or default_buffer_session() file = file or default_buffer_session()
local path = require("core.util").get_python_venv_bin() local path = require("core.util").get_python_venv_bin()
if not path then
return
end
vim.g["python3_host_prog"] = path vim.g["python3_host_prog"] = path
if vim.fn.executable("jupyter-console") ~= 1 then if vim.fn.executable("jupyter-console") ~= 1 then

View file

@ -157,10 +157,10 @@ local python_path
lspconfig.basedpyright.setup({ lspconfig.basedpyright.setup({
on_attach = function(client, bufnr) on_attach = function(client, bufnr)
on_attach(client, bufnr) on_attach(client, bufnr)
require("core.util").set_python_env()
if python_path == nil then if python_path == nil then
python_path, _ = vim.fn.expand(require("core.util").get_python_venv_bin(client.config.root_dir)) python_path, _ = vim.fn.expand(require("core.util").get_python_venv_bin(client.config.root_dir))
end end
vim.g["python3_host_prog"] = python_path
-- print(string.format("[PYTHON VENV]: %s", vim.inspect(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 = {} or client.config.settings.python
client.config.settings.python.pythonPath = python_path client.config.settings.python.pythonPath = python_path
@ -180,11 +180,11 @@ lspconfig.basedpyright.setup({
lspconfig.ruff.setup({ lspconfig.ruff.setup({
on_attach = function(client, bufnr) on_attach = function(client, bufnr)
on_attach(client, bufnr) on_attach(client, bufnr)
require("core.util").set_python_env()
client.server_capabilities.hoverProvider = false -- we use pyright for hover info client.server_capabilities.hoverProvider = false -- we use pyright for hover info
if python_path == nil then if python_path == nil then
python_path, _ = vim.fn.expand(require("core.util").get_python_venv_bin(client.config.root_dir)) python_path, _ = vim.fn.expand(require("core.util").get_python_venv_bin(client.config.root_dir))
end end
vim.g["python3_host_prog"] = python_path
client.config.settings.python = {} or client.config.settings.python client.config.settings.python = {} or client.config.settings.python
client.config.settings.python.pythonPath = python_path client.config.settings.python.pythonPath = python_path
end, end,

View file

@ -60,7 +60,7 @@ return {
-- image display -- image display
{ {
"3rd/image.nvim", "3rd/image.nvim",
dependencies = { "luarocks.nvim", { "nvim-treesitter/nvim-treesitter", optional = true } }, dependencies = { "luarocks.nvim" },
cond = vim.fn.executable("magick") == 1, -- only runs if imagemagick installed cond = vim.fn.executable("magick") == 1, -- only runs if imagemagick installed
config = function() config = function()
local integrations = {} local integrations = {}
@ -88,11 +88,10 @@ return {
integrations = integrations, integrations = integrations,
}) })
vim.g.molten_image_provider = "image.nvim" vim.g.molten_image_provider = "image.nvim"
pcall(vim.fn.MoltenUpdateOption, "molten_image_provider", "image.nvim")
end end
end, end,
ft = { "markdown", "vimwiki", "quarto", "norg", "python" }, ft = { "markdown", "vimwiki", "quarto", "norg", "python" },
priority = 60, priority = 51,
}, },
-- REPL work -- REPL work
{ {
@ -191,32 +190,6 @@ return {
{ "<leader>vn", ":MoltenInfo<cr>" }, { "<leader>vn", ":MoltenInfo<cr>" },
{ "<localleader>ci", ":MoltenInit<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 -- Edit code blocks in md/quarto using whatever language is
@ -269,6 +242,6 @@ return {
}, },
}, },
cond = vim.fn.executable("jupytext") == 1, -- only runs if imagemagick installed 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
}, },
} }