diff --git a/LuaSnip/typst/env.lua b/LuaSnip/typst/env.lua index 6500d12..231e109 100644 --- a/LuaSnip/typst/env.lua +++ b/LuaSnip/typst/env.lua @@ -25,7 +25,7 @@ return { $<>$ ]], { - i(1), + i(0), } ), { condition = tex.in_text } @@ -39,7 +39,7 @@ return { $ ]], { - i(1), + i(0), } ), { condition = tex.in_text } diff --git a/LuaSnip/typst/math-commands.lua b/LuaSnip/typst/math-commands.lua index c303b0a..fe29e35 100644 --- a/LuaSnip/typst/math-commands.lua +++ b/LuaSnip/typst/math-commands.lua @@ -42,6 +42,13 @@ return { }), { condition = tex.in_mathzone } ), + s( + { trig = "norm", snippetType = "autosnippet" }, + fmta("norm(<>)", { + i(1), + }), + { condition = tex.in_mathzone } + ), s( { trig = "bar", snippetType = "autosnippet" }, fmta("overline(<>)", { diff --git a/LuaSnip/typst/symbol-short.lua b/LuaSnip/typst/symbol-short.lua index a16d330..897c803 100644 --- a/LuaSnip/typst/symbol-short.lua +++ b/LuaSnip/typst/symbol-short.lua @@ -123,7 +123,7 @@ return { s({ trig = "subset=", wordTrig = false, snippetType = "autosnippet" }, { t("subset.eq"), }, { condition = tex.in_mathzone }), - s({ trig = "sup", wordTrig = false, snippetType = "autosnippet" }, { + s({ trig = "supp", wordTrig = false, snippetType = "autosnippet" }, { t("supset"), }, { condition = tex.in_mathzone }), s({ trig = "supset=", wordTrig = false, snippetType = "autosnippet" }, { diff --git a/lazy-lock.json b/lazy-lock.json index 384bd18..10343ca 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -1,10 +1,9 @@ { "CopilotChat.nvim": { "branch": "main", "commit": "f68deee85b8d734db1a9fbf63ce17a8164921267" }, "LazyVim": { "branch": "main", "commit": "dc1ffa5bcb66f46284f91a8593dda5c7c54a1824" }, - "LuaSnip": { "branch": "master", "commit": "73813308abc2eaeff2bc0d3f2f79270c491be9d7" }, - "SchemaStore.nvim": { "branch": "main", "commit": "caad5439cc80809be7475b625a5e36d1bb06cc7e" }, + "LuaSnip": { "branch": "master", "commit": "113f831c4dc5b8c4e97454a7f89bb21746fe6484" }, + "SchemaStore.nvim": { "branch": "main", "commit": "667eaa5da8f66f1dd97c905a12dd1eb544a2d259" }, "aerial.nvim": { "branch": "master", "commit": "5e687b5a14004fa2dd9eccbee042b96869fe1557" }, - "avante.nvim": { "branch": "main", "commit": "26e40e5483db90c593bf09466bc6cbe5a7711381" }, "blink-copilot": { "branch": "main", "commit": "5d35fd07fcc148be20442da1bdd2407e03263d7d" }, "blink.cmp": { "branch": "main", "commit": "327fff91fe6af358e990be7be1ec8b78037d2138" }, "bufferline.nvim": { "branch": "main", "commit": "655133c3b4c3e5e05ec549b9f8cc2894ac6f51b3" }, @@ -13,7 +12,6 @@ "chezmoi.vim": { "branch": "main", "commit": "ca5f2ed602046d5662cb76d845c4b510aae0ce84" }, "cmake-tools.nvim": { "branch": "master", "commit": "88e07c6bff838a5bda2f461e9c1122b79ff0829f" }, "code_runner.nvim": { "branch": "main", "commit": "a0aa4325ea2958ba21d77d181a838e74be6267cd" }, - "competitest.nvim": { "branch": "master", "commit": "b42c06ca308906f07912ba9aff015ac2c0831f85" }, "conform.nvim": { "branch": "master", "commit": "fbcb4fa7f34bfea9be702ffff481a8e336ebf6ed" }, "copilot.lua": { "branch": "master", "commit": "92e08cd472653beaece28ad9c8508a851a613358" }, "cord.nvim": { "branch": "master", "commit": "1aadec47743e6cfe77ae6860a5b4305a465f03be" }, @@ -21,48 +19,43 @@ "dial.nvim": { "branch": "master", "commit": "f0404ec1f83a03f2c3457e60087c6331d1cbb83f" }, "flash.nvim": { "branch": "main", "commit": "2febce67ff9cf7638d2569d17c41af02c38401eb" }, "gitsigns.nvim": { "branch": "main", "commit": "1ee5c1fd068c81f9dd06483e639c2aa4587dc197" }, - "grug-far.nvim": { "branch": "main", "commit": "2e991081c0e653e151fc9e659514d7c2fc31d22a" }, + "grug-far.nvim": { "branch": "main", "commit": "3e72397465f774b01aa38e4fe8e6eecf23d766d9" }, "haskell-snippets.nvim": { "branch": "master", "commit": "06be2f61d2970a90e8c4db16ab8cd450233db5c1" }, "haskell-tools.nvim": { "branch": "master", "commit": "65d6993eba1a56bbd5211ef13a100d26ce3e644a" }, "inc-rename.nvim": { "branch": "main", "commit": "7c79416330364976955ec8059fe3832b72ee1271" }, "lazy.nvim": { "branch": "main", "commit": "6c3bda4aca61a13a9c63f1c1d1b16b9d3be90d7a" }, "lazydev.nvim": { "branch": "main", "commit": "e28ce52fc7ff79fcb76f0e79ee6fb6182fca90b9" }, - "lean.nvim": { "branch": "main", "commit": "91aa0dc3a6a22090565b0b6e2530b8772a09a306" }, - "lualine.nvim": { "branch": "master", "commit": "b8c23159c0161f4b89196f74ee3a6d02cdc3a955" }, + "lean.nvim": { "branch": "main", "commit": "a97dbacbd038962583efbf22cc6ef79f8e71a9fe" }, + "lualine.nvim": { "branch": "master", "commit": "3946f0122255bc377d14a59b27b609fb3ab25768" }, "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, "mason-lspconfig.nvim": { "branch": "main", "commit": "6bdb14f230de0904229ec367b410fb817e59b072" }, - "mason-nvim-dap.nvim": { "branch": "main", "commit": "86389a3dd687cfaa647b6f44731e492970034baa" }, "mason.nvim": { "branch": "main", "commit": "ad7146aa61dcaeb54fa900144d768f040090bff0" }, "mini.ai": { "branch": "main", "commit": "11c57180bc9084089206e211ac7aa598bedc9673" }, "mini.hipatterns": { "branch": "main", "commit": "5629d5fba132b4ab0b3f0039549308421f65ff45" }, "mini.icons": { "branch": "main", "commit": "284798619aed9f4c1ac1b9417b9a5e3b4b85ef3a" }, "mini.pairs": { "branch": "main", "commit": "b9aada8c0e59f2b938e98fbf4eae0799eba96ad9" }, "mini.surround": { "branch": "main", "commit": "444e155147e2b5159dd28a65f9736254c16cb817" }, - "neo-tree.nvim": { "branch": "main", "commit": "c4c168e459395275c552179a1baf9c3d885d6a74" }, "neotab.nvim": { "branch": "master", "commit": "e99d3e28c5a2066d2d368dfe4ef3827c8d75d337" }, "neotest": { "branch": "master", "commit": "7166dc36af2760a76479e021e0521e23f62165f1" }, "neotest-haskell": { "branch": "master", "commit": "5266c115617186f17708344451f46ec88f3d1f6b" }, "neotest-python": { "branch": "master", "commit": "b0d3a861bd85689d8ed73f0590c47963a7eb1bf9" }, "noice.nvim": { "branch": "main", "commit": "38c702be0d8fea81527ee6a73e1e834e72481193" }, "nui.nvim": { "branch": "main", "commit": "de740991c12411b663994b2860f1a4fd0937c130" }, - "nvim-conda": { "branch": "main", "commit": "7e63124d98f48a3bb255eaa71d1602db610b9047" }, - "nvim-dap": { "branch": "master", "commit": "881f7dc17c0b4204a1d844732f95539575350e5b" }, + "nvim-dap": { "branch": "master", "commit": "6782b097af2417a4c3e33849b0a26ae2188bd7ea" }, "nvim-dap-python": { "branch": "master", "commit": "64652d1ae1db80870d9aac7132d76e37acd86a26" }, - "nvim-dap-ui": { "branch": "master", "commit": "cf91d5e2d07c72903d052f5207511bf7ecdb7122" }, - "nvim-dap-virtual-text": { "branch": "master", "commit": "fbdb48c2ed45f4a8293d0d483f7730d24467ccb6" }, "nvim-lint": { "branch": "master", "commit": "9da1fb942dd0668d5182f9c8dee801b9c190e2bb" }, "nvim-lspconfig": { "branch": "master", "commit": "ac98db2f9f06a56498ec890a96928774eae412c3" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, - "nvim-treesitter": { "branch": "main", "commit": "0606c7a9dcaa5c5beee0b0f09043e9fdd1ba0a68" }, - "nvim-treesitter-context": { "branch": "master", "commit": "41847d3dafb5004464708a3db06b14f12bde548a" }, + "nvim-treesitter": { "branch": "main", "commit": "63fac0a576bc78a4790cbcce24646cca860bc8c1" }, "nvim-treesitter-textobjects": { "branch": "main", "commit": "1b2d85d3de6114c4bcea89ffb2cd1ce9e3a19931" }, "nvim-ts-autotag": { "branch": "main", "commit": "c4ca798ab95b316a768d51eaaaee48f64a4a46bc" }, "nvim-web-devicons": { "branch": "master", "commit": "b8221e42cf7287c4dcde81f232f58d7b947c210d" }, "persistence.nvim": { "branch": "main", "commit": "51eef57272742b773468949f6bd0503ec3f83874" }, "plenary.nvim": { "branch": "master", "commit": "b9fd5226c2f76c951fc8ed5923d85e4de065e509" }, - "render-markdown.nvim": { "branch": "main", "commit": "691651de4e02cbea9ff50c62d7d3a679abc95564" }, + "render-markdown.nvim": { "branch": "main", "commit": "475d3ad8cae486b0df6fc6050cf5b5ea1de42db8" }, "rustaceanvim": { "branch": "master", "commit": "2f5afad4fc62c609dfd2ef4613999a0e8bddcccc" }, - "snacks.nvim": { "branch": "main", "commit": "839022302b470fe166b8b8b04add49bd32bdc01b" }, + "sidekick.nvim": { "branch": "main", "commit": "4a492da6e863d06b15e887be97dd43c50b76f11d" }, + "snacks.nvim": { "branch": "main", "commit": "454ba02d69347c0735044f159b95d2495fc79a73" }, "telescope_hoogle": { "branch": "master", "commit": "14be34fd5c464e3da0992ad094f157b0b8b098f9" }, "texpresso.vim": { "branch": "main", "commit": "d543df30b61ea886cb726a18c1d1d28ea36d30cc" }, "todo-comments.nvim": { "branch": "main", "commit": "19d461ddd543e938eb22505fb03fa878800270b6" }, @@ -73,9 +66,10 @@ "venv-selector.nvim": { "branch": "main", "commit": "7fff64b5b1455207b9a9fd2ae8697cf9ac0b2a2d" }, "vim-dadbod": { "branch": "master", "commit": "e95afed23712f969f83b4857a24cf9d59114c2e6" }, "vim-dadbod-completion": { "branch": "master", "commit": "a8dac0b3cf6132c80dc9b18bef36d4cf7a9e1fe6" }, - "vim-dadbod-ui": { "branch": "master", "commit": "e8b53c0f3aa6e6127ac2a2d2071d9aade6c6e373" }, + "vim-dadbod-ui": { "branch": "master", "commit": "5a83ee1fdafcdedb03222bb46f7cfd70646025ee" }, + "vim-startuptime": { "branch": "master", "commit": "b6f0d93f6b8cf6eee0b4c94450198ba2d6a05ff6" }, "vimtex": { "branch": "master", "commit": "be9deac3a23eeb145ccf11dd09080795838496ce" }, "which-key.nvim": { "branch": "main", "commit": "b4177e3eaf15fe5eb8357ebac2286d488be1ed00" }, "yanky.nvim": { "branch": "main", "commit": "04775cc6e10ef038c397c407bc17f00a2f52b378" }, - "yazi.nvim": { "branch": "main", "commit": "84fa726ca820925daae855ba1d45e6214808f2a9" } + "yazi.nvim": { "branch": "main", "commit": "0f202fe5a92b332f996f5d4ee1e5d36b956aafc4" } } diff --git a/lazyvim.json b/lazyvim.json index 8ac54a7..79d8aa9 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -2,11 +2,11 @@ "extras": [ "lazyvim.plugins.extras.ai.copilot", "lazyvim.plugins.extras.ai.copilot-chat", + "lazyvim.plugins.extras.ai.sidekick", "lazyvim.plugins.extras.coding.blink", "lazyvim.plugins.extras.coding.luasnip", "lazyvim.plugins.extras.coding.mini-surround", "lazyvim.plugins.extras.coding.yanky", - "lazyvim.plugins.extras.dap.core", "lazyvim.plugins.extras.editor.aerial", "lazyvim.plugins.extras.editor.dial", "lazyvim.plugins.extras.editor.inc-rename", @@ -24,12 +24,11 @@ "lazyvim.plugins.extras.lang.tex", "lazyvim.plugins.extras.lang.toml", "lazyvim.plugins.extras.lang.typescript", - "lazyvim.plugins.extras.lang.yaml", "lazyvim.plugins.extras.test.core", - "lazyvim.plugins.extras.ui.treesitter-context", "lazyvim.plugins.extras.util.chezmoi", "lazyvim.plugins.extras.util.dot", - "lazyvim.plugins.extras.util.mini-hipatterns" + "lazyvim.plugins.extras.util.mini-hipatterns", + "lazyvim.plugins.extras.util.startuptime" ], "install_version": 8, "news": { diff --git a/lua/config/autocmds.lua b/lua/config/autocmds.lua index 5bb30d3..696c6a5 100644 --- a/lua/config/autocmds.lua +++ b/lua/config/autocmds.lua @@ -8,7 +8,7 @@ end -- Disable spell checking for markdown and text files vim.api.nvim_create_autocmd("FileType", { - pattern = { "markdown", "text", "tex" }, + pattern = { "markdown", "text", "tex", "typst" }, callback = function() vim.opt_local.spell = false end, diff --git a/lua/config/options.lua b/lua/config/options.lua index a3a9d5f..eb6777a 100644 --- a/lua/config/options.lua +++ b/lua/config/options.lua @@ -12,13 +12,13 @@ vim.g.maplocalleader = "\\" vim.g.autoformat = false local indent = 2 --- vim.opt.expandtab = true -- Use spaces instead of tabs vim.opt.softtabstop = indent -- Number of spaces that a counts for while performing editing operations vim.opt.tabstop = indent -- Number of spaces tabs count for vim.opt.shiftwidth = indent -- Size of an indent vim.g.node_host_prog = "/opt/homebrew/bin/neovim-node-host" --- vim.opt.expandtab = true -- Use spaces instead of tabs + + if vim.g.neovide then vim.o.guifont = "Maple Mono:h16" @@ -28,27 +28,12 @@ if vim.g.neovide then -- vim.g.transparency = 0.8 -- vim.g.neovide_transparency = 0.9 -- Allow clipboard copy paste in neovim - vim.g.neovide_input_use_logo = 1 vim.api.nvim_set_keymap("", "", "+p", { noremap = true, silent = true }) vim.api.nvim_set_keymap("!", "", "+", { noremap = true, silent = true }) vim.api.nvim_set_keymap("t", "", "+", { noremap = true, silent = true }) vim.api.nvim_set_keymap("v", "", "+", { noremap = true, silent = true }) - vim.g.terminal_color_0 = "#45475a" - vim.g.terminal_color_1 = "#f38ba8" - vim.g.terminal_color_2 = "#a6e3a1" - vim.g.terminal_color_3 = "#f9e2af" - vim.g.terminal_color_4 = "#89b4fa" - vim.g.terminal_color_5 = "#f5c2e7" - vim.g.terminal_color_6 = "#94e2d5" - vim.g.terminal_color_7 = "#bac2de" - vim.g.terminal_color_8 = "#585b70" - vim.g.terminal_color_9 = "#f38ba8" - vim.g.terminal_color_10 = "#a6e3a1" - vim.g.terminal_color_11 = "#f9e2af" - vim.g.terminal_color_12 = "#89b4fa" - vim.g.terminal_color_13 = "#f5c2e7" - vim.g.terminal_color_14 = "#94e2d5" - vim.g.terminal_color_15 = "#a6adc8" + + vim.g.neovide_input_use_logo = 1 vim.g.neovide_cursor_vfx_mode = "pixiedust" -- vim.g.neovide_transparency = 0 vim.g.neovide_normal_opacity = 0.6 diff --git a/lua/plugins/coding/competitest.lua b/lua/plugins/coding/competitest.lua index 41b5d12..473910f 100644 --- a/lua/plugins/coding/competitest.lua +++ b/lua/plugins/coding/competitest.lua @@ -1,28 +1,28 @@ return { - { - "xeluxee/competitest.nvim", - dependencies = "MunifTanjim/nui.nvim", - lazy = false, - keys = { - { "rt", "CompetiTest receive testcases", "Receive testcases" }, - { "rp", "CompetiTest receive problem", "Receive problem" }, - { "rc", "CompetiTest receive contest", "Receive contest" }, - { "c", "CompetiTest run", "Run code" }, - }, - config = function() - require("competitest").setup({ - received_problems_path = "$(HOME)/compcode/$(JUDGE)/$(CONTEST)/$(PROBLEM).$(FEXT)c", - received_contests_directory = "$(HOME)/compcode/$(JUDGE)/$(CONTEST)", - template_file = { - cpp = "~/compcode/templates/template.cpp", - }, - compile_command = { - cpp = { exec = "clang++", args = { "$(FNAME)", "-o", "$(FNOEXT)", "-lm" } }, - }, - run_command = { - cpp = { exec = "./$(FNOEXT)" }, - }, - }) - end, - }, + -- { + -- "xeluxee/competitest.nvim", + -- dependencies = "MunifTanjim/nui.nvim", + -- lazy = false, + -- keys = { + -- { "rt", "CompetiTest receive testcases", "Receive testcases" }, + -- { "rp", "CompetiTest receive problem", "Receive problem" }, + -- { "rc", "CompetiTest receive contest", "Receive contest" }, + -- { "c", "CompetiTest run", "Run code" }, + -- }, + -- config = function() + -- require("competitest").setup({ + -- received_problems_path = "$(HOME)/compcode/$(JUDGE)/$(CONTEST)/$(PROBLEM).$(FEXT)c", + -- received_contests_directory = "$(HOME)/compcode/$(JUDGE)/$(CONTEST)", + -- template_file = { + -- cpp = "~/compcode/templates/template.cpp", + -- }, + -- compile_command = { + -- cpp = { exec = "clang++", args = { "$(FNAME)", "-o", "$(FNOEXT)", "-lm" } }, + -- }, + -- run_command = { + -- cpp = { exec = "./$(FNOEXT)" }, + -- }, + -- }) + -- end, + -- }, } diff --git a/lua/plugins/default/blink.lua b/lua/plugins/default/blink.lua index db493a1..5115309 100644 --- a/lua/plugins/default/blink.lua +++ b/lua/plugins/default/blink.lua @@ -7,8 +7,16 @@ return { -- compat = { "avante_commands", "avante_mentions", "avante_files" }, -- }, keymap = { - [""] = { "select_next", "fallback" }, - [""] = { "select_prev", "fallback" }, + preset = "default", + [""] = { "show", "show_documentation", "hide_documentation" }, + [""] = { "hide", "fallback" }, + [""] = { "select_prev", "fallback" }, + [""] = { "select_next", "fallback" }, + [""] = { "select_prev", "fallback" }, + [""] = { "select_next", "fallback" }, + [""] = { "scroll_documentation_up", "fallback" }, + [""] = { "scroll_documentation_down", "fallback" }, + [""] = { "accept", "fallback" }, }, completion = { menu = { border = "single" }, diff --git a/lua/plugins/default/conform.lua b/lua/plugins/default/conform.lua index 3aebcdd..3396a6a 100644 --- a/lua/plugins/default/conform.lua +++ b/lua/plugins/default/conform.lua @@ -6,7 +6,6 @@ return { ["jsonc"] = { "jq" }, ["tex"] = { "latexindent" }, ["toml"] = { "taplo "}, - ["typst"] = { 'typstyle' }, ["markdown"] = { 'prettierd', "cbfmt" }, ["sh"] = { 'shfmt' }, } diff --git a/lua/plugins/default/copilot.lua b/lua/plugins/default/copilot.lua index e1cfc94..9e88f6f 100644 --- a/lua/plugins/default/copilot.lua +++ b/lua/plugins/default/copilot.lua @@ -1,13 +1,30 @@ return { { - "zbirenbaum/copilot.lua", + "CopilotC-Nvim/CopilotChat.nvim", opts = { - suggestion = { - keymap = { - accept = "", - next = "", - prev = "", - }, + model = "gemini-2.5-pro", + }, + }, + { + "zbirenbaum/copilot.lua", + keys = { + { + -- Open in the current working directory + "ad", + "Copilot detach", + desc = "Copilot detach", + }, + { + -- Open in the current working directory + "at", + "Copilot toggle", + desc = "Copilot toggle", + }, + }, + opts = { + copilot_model = "gemini-2.5-pro", + keymap = { + accept = "", }, }, }, diff --git a/lua/plugins/default/lspconfig.lua b/lua/plugins/default/lspconfig.lua index a7b68f7..35946c9 100644 --- a/lua/plugins/default/lspconfig.lua +++ b/lua/plugins/default/lspconfig.lua @@ -4,6 +4,8 @@ return { optional = true, opts = { servers = { + dockerls = {}, + docker_compose_language_service = {}, texlab = { keys = { { "K", "(vimtex-doc-package)", desc = "Vimtex Docs", silent = true }, @@ -19,7 +21,13 @@ return { }, }, - tinymist = {}, + tinymist = { + settings = { + formatterMode = "typstyle", + exportPdf = "onType", + semanticTokens = "enable", + }, + }, }, }, }, diff --git a/lua/plugins/default/luasnip.lua b/lua/plugins/default/luasnip.lua index 844de65..4dcd146 100644 --- a/lua/plugins/default/luasnip.lua +++ b/lua/plugins/default/luasnip.lua @@ -1,6 +1,8 @@ return { { "L3MON4D3/LuaSnip", + build = "make install_jsregexp", + dependencies = { "neotab.nvim" }, config = function() require("luasnip").config.set_config({ enable_autosnippets = true, diff --git a/lua/plugins/default/neotree.lua b/lua/plugins/default/neotree.lua deleted file mode 100644 index b4e60c7..0000000 --- a/lua/plugins/default/neotree.lua +++ /dev/null @@ -1,22 +0,0 @@ -return { - { - "nvim-neo-tree/neo-tree.nvim", - lazy = true, - opts = { - filesystem = { - window = { - mappings = { - ["o"] = "system_open", - }, - }, - commands = { - system_open = function(state) - local node = state.tree:get_node() - local path = node:get_id() - vim.api.nvim_command("silent !open -g " .. path) - end, - }, - }, - }, - }, -} diff --git a/lua/plugins/default/snacks.lua b/lua/plugins/default/snacks.lua index 1bbaa47..aee4d66 100644 --- a/lua/plugins/default/snacks.lua +++ b/lua/plugins/default/snacks.lua @@ -33,7 +33,7 @@ return { { icon = " ", key = "s", desc = "Restore Session", section = "session" }, { icon = " ", key = "x", desc = "Lazy Extras", action = ":LazyExtras" }, { icon = "󰒲 ", key = "l", desc = "Lazy", action = ":Lazy" }, - { icon = " ", key = "q", desc = "Quit", action = ":qa" }, + { icon = " ", key = "q", desc = "Quit", action = ":qa" }, }, header = [[ ███╗ ██╗███████╗ ██████╗ ██╗ ██╗██╗███╗ ███╗ @@ -50,6 +50,7 @@ return { { section = "projects", padding = 1, gap = 1 }, { title = "Options", padding = 1 }, { section = "keys", gap = 1 }, + { section = "startup" }, }, }, picker = { @@ -66,6 +67,8 @@ return { { "", function() Snacks.terminal(nil, { cwd = vim.fn.expand("%:p:h") }) end, desc = "Toggle Terminal" }, { "]]", function() Snacks.words.jump(vim.v.count1) end, desc = "Next Reference", mode = { "n", "t" } }, { "[[", function() Snacks.words.jump(-vim.v.count1) end, desc = "Prev Reference", mode = { "n", "t" } }, + { "E", function() Snacks.explorer({ cwd = LazyVim.root() }) end, desc = "Explorer Snacks (root dir)", }, + { "e", function() Snacks.explorer() end, desc = "Explorer Snacks (cwd)", }, }, }, } diff --git a/lua/plugins/lang/avante.lua b/lua/plugins/lang/avante.lua deleted file mode 100644 index 7490059..0000000 --- a/lua/plugins/lang/avante.lua +++ /dev/null @@ -1,89 +0,0 @@ -return { - { - "yetone/avante.nvim", - event = "VeryLazy", - enabled = false, - version = false, -- Never set this value to "*"! Never! - opts = { - -- add any opts here - -- for example - -- provider = "copilot", - -- copilot = { model = "claude-3.5-sonnet" }, - -- hints = { enabled = false }, - -- file_selector = { - -- provider = "snack", - -- provider_opts = {}, - -- }, - -- openai = { - -- endpoint = "https://api.openai.com/v1", - -- model = "gpt-4o", -- your desired model (or use gpt-4o, etc.) - -- timeout = 30000, -- Timeout in milliseconds, increase this for reasoning models - -- temperature = 0, - -- max_tokens = 8192, -- Increase this to include reasoning tokens (for reasoning models) - -- --reasoning_effort = "medium", -- low|medium|high, only used for reasoning models - -- }, - }, - -- if you want to build from source then do `make BUILD_FROM_SOURCE=true` - build = "make", - -- build = "powershell -ExecutionPolicy Bypass -File Build.ps1 -BuildFromSource false" -- for windows - dependencies = { - "nvim-treesitter/nvim-treesitter", - "stevearc/dressing.nvim", - "nvim-lua/plenary.nvim", - "MunifTanjim/nui.nvim", - --- The below dependencies are optional, - -- "echasnovski/mini.pick", -- for file_selector provider mini.pick - -- "nvim-telescope/telescope.nvim", -- for file_selector provider telescope - -- "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions - -- "ibhagwan/fzf-lua", -- for file_selector provider fzf - -- "nvim-tree/nvim-web-devicons", -- or echasnovski/mini.icons - "zbirenbaum/copilot.lua", -- for providers='copilot' - { - -- support for image pasting - "HakonHarnes/img-clip.nvim", - event = "VeryLazy", - opts = { - -- recommended settings - default = { - embed_image_as_base64 = false, - prompt_for_file_name = false, - drag_and_drop = { - insert_mode = true, - }, - -- required for Windows users - use_absolute_path = true, - }, - }, - }, - { - -- Make sure to set this up properly if you have lazy=true - "MeanderingProgrammer/render-markdown.nvim", - opts = { - file_types = { "markdown", "Avante" }, - }, - ft = { "markdown", "Avante" }, - }, - { - "saghen/blink.compat", - lazy = true, - opts = {}, - config = function() - -- monkeypatch cmp.ConfirmBehavior for Avante - require("cmp").ConfirmBehavior = { - Insert = "insert", - Replace = "replace", - } - end, - }, - { - "saghen/blink.cmp", - lazy = true, - opts = { - sources = { - compat = { "avante_commands", "avante_mentions", "avante_files" }, - }, - }, - }, - }, - }, -} diff --git a/lua/plugins/lang/python.lua b/lua/plugins/lang/python.lua index ffdbcc3..9e97612 100644 --- a/lua/plugins/lang/python.lua +++ b/lua/plugins/lang/python.lua @@ -1,16 +1,16 @@ return { - { - "kmontocam/nvim-conda", - ft = "python", - dependencies = { "nvim-lua/plenary.nvim" }, - keys = { - { "cv", "CondaActivate", desc = "Conda environment" }, - }, - }, - { - "nvim-neotest/neotest", - ft = "python", - dependencies = { "nvim-neotest/neotest-python" }, - opts = { adapters = { "neotest-python" } }, - }, + -- { + -- "kmontocam/nvim-conda", + -- ft = "python", + -- dependencies = { "nvim-lua/plenary.nvim" }, + -- keys = { + -- { "cv", "CondaActivate", desc = "Conda environment" }, + -- }, + -- }, + -- { + -- "nvim-neotest/neotest", + -- ft = "python", + -- dependencies = { "nvim-neotest/neotest-python" }, + -- opts = { adapters = { "neotest-python" } }, + -- }, } diff --git a/lua/plugins/lang/typst.lua b/lua/plugins/lang/typst.lua index f8d82e2..f29750d 100644 --- a/lua/plugins/lang/typst.lua +++ b/lua/plugins/lang/typst.lua @@ -1,6 +1,7 @@ return { { "chomosuke/typst-preview.nvim", + lazy = true, ft = "typst", version = "1.*", opts = { diff --git a/lua/plugins/tabout.lua b/lua/plugins/tabout.lua index 22cc804..01c4ad6 100644 --- a/lua/plugins/tabout.lua +++ b/lua/plugins/tabout.lua @@ -4,7 +4,16 @@ return { event = "InsertEnter", opts = { -- configuration goes here - tabkey = "", + pairs = { ---@type ntab.pair[] + { open = "(", close = ")" }, + { open = "[", close = "]" }, + { open = "{", close = "}" }, + { open = "'", close = "'" }, + { open = '"', close = '"' }, + { open = "`", close = "`" }, + { open = "<", close = ">" }, + { open = "$", closed = "$" }, + } }, }, } diff --git a/lua/util/latex.lua b/lua/util/latex.lua index 3d50bbb..2aed02a 100644 --- a/lua/util/latex.lua +++ b/lua/util/latex.lua @@ -65,7 +65,6 @@ M.in_env = function(env) return pos[1] ~= 0 or pos[2] ~= 0 end --- For typst M.in_mathzone= function() if has_treesitter then local buf = vim.api.nvim_get_current_buf()