diff --git a/nvim/.config/nvim/lua/plugins/ide.lua b/nvim/.config/nvim/lua/plugins/ide.lua index 043030b..193d998 100644 --- a/nvim/.config/nvim/lua/plugins/ide.lua +++ b/nvim/.config/nvim/lua/plugins/ide.lua @@ -22,7 +22,9 @@ local formatters = { javascript = { { "prettierd", "prettier" } }, javascriptreact = { { "prettierd", "prettier" } }, json = { "jq" }, + liquid = { { "prettierd", "prettier" } }, lua = { "stylua" }, + markdown = { { "prettierd", "prettier" } }, python = { "ruff_fix", "ruff_format" }, sh = { "shfmt" }, svelte = { { "prettierd", "prettier" } }, @@ -123,7 +125,7 @@ return { end, }) end, - event = { "BufWritePost", "InsertLeave" }, + event = { "BufWritePre", "InsertEnter" }, }, -- formatting setup @@ -248,6 +250,7 @@ return { "nvim-neotest/neotest", dependencies = { "nvim-lua/plenary.nvim", + "nvim-neotest/nvim-nio", "nvim-treesitter/nvim-treesitter", "antoinemadec/FixCursorHold.nvim", diff --git a/nvim/.config/nvim/lua/plugins/prose.lua b/nvim/.config/nvim/lua/plugins/prose.lua index a5dcc7a..17d9646 100644 --- a/nvim/.config/nvim/lua/plugins/prose.lua +++ b/nvim/.config/nvim/lua/plugins/prose.lua @@ -71,7 +71,15 @@ local prose_plugs = { require("zk").edit(opts, { title = "Zk Orphans" }) end) end - require("zk").setup({ picker = "telescope" }) + require("zk").setup({ + picker = "telescope", + lsp = { + auto_attach = { + enabled = true, + filteypes = { "markdown", "quarto" }, + }, + }, + }) end, ft = writing_ft, cmd = { diff --git a/nvim/.config/nvim/lua/plugins/ui.lua b/nvim/.config/nvim/lua/plugins/ui.lua index 479e256..7e5690a 100644 --- a/nvim/.config/nvim/lua/plugins/ui.lua +++ b/nvim/.config/nvim/lua/plugins/ui.lua @@ -3,34 +3,46 @@ return { { "nvim-lualine/lualine.nvim", requires = { "nvim-tree/nvim-web-devicons", config = true }, - opts = { - options = { - icons_enabled = true, - theme = "auto", - component_separators = { left = "", right = "" }, - section_separators = { left = "", right = "" }, - disabled_filetypes = {}, - always_divide_middle = true, - }, - sections = { - lualine_a = { "mode" }, - lualine_b = { "branch", "diff", "diagnostics" }, - lualine_c = { "filename" }, - lualine_x = { "encoding", "fileformat", "filetype" }, - lualine_y = { "progress" }, - lualine_z = { "location" }, - }, - inactive_sections = { - lualine_a = {}, - lualine_b = { "branch", "diff" }, - lualine_c = { "filename" }, - lualine_x = {}, - lualine_y = { "location" }, - lualine_z = {}, - }, - tabline = {}, - extensions = { "quickfix", "toggleterm" }, - }, + config = function() + -- FIXME: Errors out on no pynvim installed + -- local function molten() + -- if + -- require("core.util").is_available("molten.status") + -- and require("molten.status").initialized() ~= "" + -- then + -- return "󱪄" + -- end + -- return "" + -- end + require("lualine").setup({ + options = { + icons_enabled = true, + theme = "auto", + component_separators = { left = "", right = "" }, + section_separators = { left = "", right = "" }, + disabled_filetypes = {}, + always_divide_middle = true, + }, + sections = { + lualine_a = { "mode" }, + lualine_b = { "branch", "diff", "diagnostics" }, + lualine_c = { "filename" }, + lualine_x = { "encoding", "fileformat", "filetype", "molten" }, + lualine_y = { "progress" }, + lualine_z = { "location" }, + }, + inactive_sections = { + lualine_a = {}, + lualine_b = { "branch", "diff" }, + lualine_c = { "filename" }, + lualine_x = {}, + lualine_y = { "location" }, + lualine_z = {}, + }, + tabline = {}, + extensions = { "quickfix", "toggleterm" }, + }) + end, event = { "BufNewFile", "BufAdd", "BufWinEnter" }, }, -- create pretty unobtrusive notifications