diff --git a/.config/nvim/lazy-lock.json b/.config/nvim/lazy-lock.json index c256f17b..fc545193 100644 --- a/.config/nvim/lazy-lock.json +++ b/.config/nvim/lazy-lock.json @@ -60,11 +60,11 @@ "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, "nvim-jdtls": { "branch": "master", "commit": "266d0cb912bbe61d66b43c5e73db19a364380360" }, "nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" }, - "nvim-lspconfig": { "branch": "master", "commit": "88dff6268a068403c87b461aee69beb61ceb8303" }, + "nvim-lspconfig": { "branch": "master", "commit": "a8ef5e6e497b3ebeaaf35b939c07c211563b2e05" }, "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-notify": { "branch": "master", "commit": "bd9cd51f9ef2f6326fc2bc9931d0718c1794e247" }, "nvim-spider": { "branch": "main", "commit": "2b38e3e95e143313d78ca098eeecda7aebfce925" }, - "nvim-treesitter": { "branch": "master", "commit": "6cb4098d51479f644f967c17d4482bab1ba2640f" }, + "nvim-treesitter": { "branch": "master", "commit": "cfbc1c0e0ff63e5b5e37b465b915b95fc2e98cef" }, "nvim-treesitter-context": { "branch": "master", "commit": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, @@ -96,8 +96,8 @@ "venv-selector.nvim": { "branch": "regexp", "commit": "e82594274bf7b54387f9a2abe65f74909ac66e97" }, "vessel.nvim": { "branch": "main", "commit": "bd97a5e164541372c15c82d7da2e25c7f7c737cf" }, "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" }, - "vim-dadbod-completion": { "branch": "master", "commit": "71eb73d1f7399be6a56cc43b928276cd5ca27ffd" }, - "vim-dadbod-ui": { "branch": "master", "commit": "0fec59e3e1e619e302198cd491b7d27f8d398b7c" }, + "vim-dadbod-completion": { "branch": "master", "commit": "7f77c330df5f38b5ed11220c1f6622b61fd0149e" }, + "vim-dadbod-ui": { "branch": "master", "commit": "b4b95e04fcd71c7787673b2a165221d681d06171" }, "vim-dirtytalk": { "branch": "master", "commit": "aa57ba902b04341a04ff97214360f56856493583" }, "vim-systemd-syntax": { "branch": "master", "commit": "2f788c627efa7a50baa5766cfacf1852528eca28" }, "vim-tmux-navigator": { "branch": "master", "commit": "d847ea942a5bb4d4fab6efebc9f30d787fd96e65" }, diff --git a/.config/nvim/lua/config/autocmds.lua b/.config/nvim/lua/config/autocmds.lua index 37494e46..84d920d6 100644 --- a/.config/nvim/lua/config/autocmds.lua +++ b/.config/nvim/lua/config/autocmds.lua @@ -51,12 +51,14 @@ vim.api.nvim_create_autocmd("VimEnter", { end, }) -vim.api.nvim_create_autocmd("FileType", { - pattern = "markdown", - callback = function() - if vim.g.md_tex then - vim.opt_local.breakindent = true - vim.cmd([[ +local md = false +if md then + vim.api.nvim_create_autocmd("FileType", { + pattern = "markdown", + callback = function() + if vim.g.md_tex then + vim.opt_local.breakindent = true + vim.cmd([[ syn region mathBlock start=/\$\$/ end=/\$\$/ contains=@tex " inline math syn match mathInline '\$[^$].\{-}\$' contains=@tex @@ -65,111 +67,112 @@ vim.api.nvim_create_autocmd("FileType", { hi def link mathBlock Statement hi def link mathInline Statement ]]) - end - end, -}) - -vim.api.nvim_create_autocmd({ "FileType" }, { - pattern = { "markdown" }, - callback = function() - -- We want markdown files to autosave - vim.api.nvim_create_autocmd({ "InsertLeave", "TextChanged" }, { - buffer = 0, - command = "silent! write", - }) - vim.keymap.set("i", "", function() - local md_utils = require("md-utils") - local isList = md_utils.isCursorInList() - if isList then - vim.api.nvim_command("MDListItemBelow") - else - vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("", true, true, true), "n", true) end - end, { desc = "Continue List", silent = true, remap = true }) - vim.opt_local.wrap = true - vim.opt_local.spell = true - -- local secondary = "#379393" - -- local primary = "#933737" - -- local colorbuddy = require("colorbuddy") - -- local colors = colorbuddy.colors - -- vim.api.nvim_set_hl(0, "ObsidianRefText", { fg = colors.secondary:to_vim(), bold = true, underline = true }) - -- vim.api.nvim_set_hl(0, "ObsidianRef", { fg = colors.secondary:to_vim(), bold = true, underline = true }) - -- vim.api.nvim_set_hl(0, "ObsidianBullet", { fg = colors.complement:to_vim(), bold = true, underline = false }) - -- vim.api.nvim_set_hl(0, "ObsidianDone", { fg = colors.complement:to_vim(), bold = true, underline = false }) - -- vim.api.nvim_set_hl(0, "ObsidianTodo", { fg = colors.complement:to_vim(), bold = true, underline = false }) - -- vim.api.nvim_set_hl(0, "obsidiantag", { fg = colors.complement:to_vim(), bold = false, italic = true }) - -- vim.api.nvim_set_hl(0, "ObsidianTag", { fg = colors.complement:to_vim(), bold = false, italic = true }) - -- vim.api.nvim_buf_set_keymap(0, "n", "mc", "gzaiW`", { desc = "Markdown: add Code Surround", silent = true }) - -- vim.api.nvim_buf_set_keymap(0, "n", "", "normal! zz", { remap = false }) - -- vim.api.nvim_buf_set_keymap(0, "n", "", "normal! zz", { remap = false }) - -- vim.api.nvim_buf_set_keymap( - -- 0, - -- "n", - -- "mr", - -- "gzd`", - -- { desc = "Markdown: delete Code Surround", silent = true } - -- ) - -- vim.api.nvim_buf_set_keymap( - -- 0, - -- "i", - -- "", - -- "__", - -- { desc = "Markdown: Italics", noremap = true, silent = true } - -- ) - -- vim.api.nvim_buf_set_keymap(0, "i", "", "- [ ] ", { desc = "Markdown: Task", noremap = true, silent = true }) - -- vim.api.nvim_buf_set_keymap( - -- 0, - -- "i", - -- "", - -- "I# ", - -- { desc = "Markdown: Heading", noremap = true, silent = true } - -- ) - -- vim.api.nvim_buf_set_keymap( - -- 0, - -- "i", - -- "", - -- "I## ", - -- { desc = "Markdown: Heading", noremap = true, silent = true } - -- ) - -- vim.api.nvim_buf_set_keymap( - -- 0, - -- "i", - -- "", - -- "I### ", - -- { desc = "Markdown: Heading", noremap = true, silent = true } - -- ) - -- vim.api.nvim_buf_set_keymap( - -- 0, - -- "i", - -- "", - -- "I#### ", - -- { desc = "Markdown: Heading", noremap = true, silent = true } - -- ) - -- vim.api.nvim_buf_set_keymap( - -- 0, - -- "i", - -- "", - -- "I##### ", - -- { desc = "Markdown: Heading", noremap = true, silent = true } - -- ) - -- vim.api.nvim_buf_set_keymap( - -- 0, - -- "i", - -- "", - -- "****", - -- { desc = "Markdown: Bold", noremap = true, silent = true } - -- ) - -- vim.api.nvim_buf_set_keymap( - -- 0, - -- "i", - -- "", - -- "I- ", - -- { desc = "Markdown: Bullet Point", noremap = true, silent = true } - -- ) - -- local wk = require("which-key") - -- wk.add({ - -- { "", mode = "i", desc = "Markdown Italics" }, - -- { "", mode = "i", desc = "Markdown Bold" }, - -- }) - end, -}) + end, + }) + + vim.api.nvim_create_autocmd({ "FileType" }, { + pattern = { "markdown" }, + callback = function() + -- We want markdown files to autosave + vim.api.nvim_create_autocmd({ "InsertLeave", "TextChanged" }, { + buffer = 0, + command = "silent! write", + }) + vim.keymap.set("i", "", function() + local md_utils = require("md-utils") + local isList = md_utils.isCursorInList() + if isList then + vim.api.nvim_command("MDListItemBelow") + else + vim.api.nvim_feedkeys(vim.api.nvim_replace_termcodes("", true, true, true), "n", true) + end + end, { desc = "Continue List", silent = true, remap = true }) + vim.opt_local.wrap = true + vim.opt_local.spell = true + -- local secondary = "#379393" + -- local primary = "#933737" + -- local colorbuddy = require("colorbuddy") + -- local colors = colorbuddy.colors + -- vim.api.nvim_set_hl(0, "ObsidianRefText", { fg = colors.secondary:to_vim(), bold = true, underline = true }) + -- vim.api.nvim_set_hl(0, "ObsidianRef", { fg = colors.secondary:to_vim(), bold = true, underline = true }) + -- vim.api.nvim_set_hl(0, "ObsidianBullet", { fg = colors.complement:to_vim(), bold = true, underline = false }) + -- vim.api.nvim_set_hl(0, "ObsidianDone", { fg = colors.complement:to_vim(), bold = true, underline = false }) + -- vim.api.nvim_set_hl(0, "ObsidianTodo", { fg = colors.complement:to_vim(), bold = true, underline = false }) + -- vim.api.nvim_set_hl(0, "obsidiantag", { fg = colors.complement:to_vim(), bold = false, italic = true }) + -- vim.api.nvim_set_hl(0, "ObsidianTag", { fg = colors.complement:to_vim(), bold = false, italic = true }) + -- vim.api.nvim_buf_set_keymap(0, "n", "mc", "gzaiW`", { desc = "Markdown: add Code Surround", silent = true }) + -- vim.api.nvim_buf_set_keymap(0, "n", "", "normal! zz", { remap = false }) + -- vim.api.nvim_buf_set_keymap(0, "n", "", "normal! zz", { remap = false }) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "n", + -- "mr", + -- "gzd`", + -- { desc = "Markdown: delete Code Surround", silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "__", + -- { desc = "Markdown: Italics", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap(0, "i", "", "- [ ] ", { desc = "Markdown: Task", noremap = true, silent = true }) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I# ", + -- { desc = "Markdown: Heading", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I## ", + -- { desc = "Markdown: Heading", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I### ", + -- { desc = "Markdown: Heading", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I#### ", + -- { desc = "Markdown: Heading", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I##### ", + -- { desc = "Markdown: Heading", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "****", + -- { desc = "Markdown: Bold", noremap = true, silent = true } + -- ) + -- vim.api.nvim_buf_set_keymap( + -- 0, + -- "i", + -- "", + -- "I- ", + -- { desc = "Markdown: Bullet Point", noremap = true, silent = true } + -- ) + -- local wk = require("which-key") + -- wk.add({ + -- { "", mode = "i", desc = "Markdown Italics" }, + -- { "", mode = "i", desc = "Markdown Bold" }, + -- }) + end, + }) +end diff --git a/.config/nvim/lua/plugins/ashen.lua b/.config/nvim/lua/plugins/ashen.lua index d3cc5c69..5ff0ab99 100644 --- a/.config/nvim/lua/plugins/ashen.lua +++ b/.config/nvim/lua/plugins/ashen.lua @@ -7,9 +7,9 @@ return { -- "folke/snacks.nvim", -- }, dev = true, - opts = { - -- colors = { blue = "#ffffff" }, - }, + -- opts = { + -- -- colors = { blue = "#ffffff" }, + -- }, }, { "LazyVim/LazyVim", diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua index 1823557b..d83cd705 100644 --- a/.config/nvim/lua/plugins/blink.lua +++ b/.config/nvim/lua/plugins/blink.lua @@ -13,9 +13,10 @@ return { -- opts_extend = {"sources"}, opts = { sources = { - default = { "lsp", "snippets", "path", "markdown", "lazydev", "buffer" }, + -- default = { "lsp", "snippets", "path", "markdown", "lazydev", "buffer" }, + default = { "lsp", "snippets", "path", "lazydev", "buffer" }, providers = { - markdown = { name = "RenderMarkdown", module = "render-markdown.integ.blink" }, + -- markdown = { name = "RenderMarkdown", module = "render-markdown.integ.blink" }, ripgrep = { module = "blink-ripgrep", name = "Ripgrep", diff --git a/.config/nvim/lua/plugins/render-markdown.lua b/.config/nvim/lua/plugins/render-markdown.lua index c40f0b9c..0f375518 100644 --- a/.config/nvim/lua/plugins/render-markdown.lua +++ b/.config/nvim/lua/plugins/render-markdown.lua @@ -6,6 +6,7 @@ local icons = { } return { "MeanderingProgrammer/render-markdown.nvim", + enabled = false, dependencies = { "nvim-treesitter/nvim-treesitter", "echasnovski/mini.icons" }, opts = { indent = {