diff --git a/common/.config/nvim/lua/plugins/ai.lua b/common/.config/nvim/lua/plugins/ai.lua index 119f590..4a86399 100644 --- a/common/.config/nvim/lua/plugins/ai.lua +++ b/common/.config/nvim/lua/plugins/ai.lua @@ -33,9 +33,9 @@ return { build = ":Codeium Auth", event = "InsertEnter", opts = { - enable_cmp_source = vim.g.ai_cmp, + enable_cmp_source = true, virtual_text = { - enabled = not vim.g.ai_cmp, + enabled = false, key_bindings = { accept = false, -- handled by nvim-cmp / blink.cmp next = "", diff --git a/common/.config/nvim/lua/plugins/code-generic.lua b/common/.config/nvim/lua/plugins/code-generic.lua index 15aa47d..a72c5d8 100644 --- a/common/.config/nvim/lua/plugins/code-generic.lua +++ b/common/.config/nvim/lua/plugins/code-generic.lua @@ -112,42 +112,14 @@ return { main = "ibl", }, - -- Highlights the current level of indentation, and animates the highlighting. - { - "echasnovski/mini.indentscope", - cond = require("config.util").is_not_vscode(), - opts = { - delay = 100, - symbol = "│", - options = { try_as_border = true }, - }, - init = function() - vim.api.nvim_create_autocmd("FileType", { - pattern = { - "help", - "neo-tree", - "Trouble", - "trouble", - "lazy", - "mason", - "notify", - "toggleterm", - }, - callback = function() - vim.b.miniindentscope_disable = true - end, - }) - end, - }, - + -- Tpope's surround but faster and in lua { "kylechui/nvim-surround", version = "*", -- Use for stability; omit to use `main` branch for the latest features event = "VeryLazy", config = function() - require("nvim-surround").setup({ - -- Configuration here, or leave empty to use defaults - }) + -- Configuration here, or leave empty to use defaults + require("nvim-surround").setup({}) end, }, @@ -161,13 +133,38 @@ return { -- - va) - [V]isually select [A]round [)]paren -- - yinq - [Y]ank [I]nside [N]ext [Q]uote -- - ci' - [C]hange [I]nside [']quote + -- TODO: Learn about the other mini textobjects require("mini.ai").setup({ n_lines = 500 }) -- gc require("mini.comment").setup() require("mini.pairs").setup() - -- require("mini.completion").setup() + + -- Configure mini.indentscope + if require("config.util").is_not_vscode() then + require("mini.indentscope").setup({ + delay = 100, + symbol = "│", + options = { try_as_border = true }, + }) + + vim.api.nvim_create_autocmd("FileType", { + pattern = { + "help", + "neo-tree", + "Trouble", + "trouble", + "lazy", + "mason", + "notify", + "toggleterm", + }, + callback = function() + vim.b.miniindentscope_disable = true + end, + }) + end end, }, diff --git a/common/.config/nvim/lua/plugins/lang-markdown.lua b/common/.config/nvim/lua/plugins/lang-markdown.lua index b429224..3d8a7b8 100644 --- a/common/.config/nvim/lua/plugins/lang-markdown.lua +++ b/common/.config/nvim/lua/plugins/lang-markdown.lua @@ -41,7 +41,7 @@ return { }, heading = { sign = false, - icons = {}, + icons = { "󰼏 ", "󰼐 ", "󰼑 ", "󰼒 ", "󰼓 ", "󰼔 " }, backgrounds = { "Headline1Bg", "Headline2Bg", @@ -117,14 +117,18 @@ return { relative_to_current_file = false, ---@type boolean dir_path = function() - -- TODO: Find a path consistent for both Obsidian and github - return vim.fn.expand("%:t:r") .. "-img" + local root = vim.fn.FindRootDirectory() + if root ~= "" then + return root .. "/.artifacts/img" + else + return vim.fn.expand("%:p:h") .. "/.artifacts/img" + end end, prompt_for_file_name = false, ---@type boolean file_name = "%y%m%d-%H%M%S", ---@type string - -- Format of the image to be saved, must convert it as well + -- Format of the image to be saved: must convert it as well -- https://stackoverflow.com/a/27269260 extension = "webp", ---@type string process_cmd = "convert - -quality 75 webp:-", ---@type string diff --git a/common/.config/nvim/lua/plugins/utility-plugs.lua b/common/.config/nvim/lua/plugins/utility-plugs.lua index c935617..8139c34 100644 --- a/common/.config/nvim/lua/plugins/utility-plugs.lua +++ b/common/.config/nvim/lua/plugins/utility-plugs.lua @@ -257,10 +257,6 @@ return { config = function(_, opts) require("project_explorer").setup(opts) end, - keys = { - { "fp", "ProjectExplorer", desc = "Project Explorer" }, - }, - lazy = false, }, -- Session management. Saves your session in the background