diff --git a/lazy-lock.json b/lazy-lock.json index 7137067..e69e5d3 100644 --- a/lazy-lock.json +++ b/lazy-lock.json @@ -3,10 +3,11 @@ "FixCursorHold.nvim": { "branch": "master", "commit": "1900f89dc17c603eec29960f57c00bd9ae696495" }, "LuaSnip": { "branch": "master", "commit": "03c8e67eb7293c404845b3982db895d59c0d1538" }, "bigfile.nvim": { "branch": "main", "commit": "33eb067e3d7029ac77e081cfe7c45361887a311a" }, + "blink-cmp-git": { "branch": "master", "commit": "7c6cfa3d427f50a6eae5c38628b31b8675bab05d" }, "blink-emoji.nvim": { "branch": "master", "commit": "81e6c080d1e64c9ef548534c51147fd8063481c8" }, "blink-ripgrep.nvim": { "branch": "main", "commit": "519ac7894113f6a7b517b157c26e31fbd58a0de5" }, "blink.cmp": { "branch": "main", "commit": "b6f11a0aa33e601c469a126e3ed6e35208fe3ea3" }, - "blink.compat": { "branch": "main", "commit": "5ca8848c8cc32abdc980e5db4f0eb7bb8fbf84dc" }, + "blink.compat": { "branch": "main", "commit": "1176525a78319a208300a1910b6fd9e0cfabff25" }, "catppuccin.nvim": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, "ccc.nvim": { "branch": "main", "commit": "b57cbaf8db3ac43c56c9e2c7f3812944638260ed" }, "cellular-automaton.nvim": { "branch": "main", "commit": "11aea08aa084f9d523b0142c2cd9441b8ede09ed" }, @@ -20,7 +21,7 @@ "conform.nvim": { "branch": "master", "commit": "363243c03102a531a8203311d4f2ae704c620d9b" }, "crates.nvim": { "branch": "main", "commit": "1c924d5a9ea3496c4e1a02d0d51388ba809f8468" }, "cratesearch.nvim": { "branch": "master", "commit": "9d09625d017f6b2e116503f935bc6862961313fa" }, - "csvview.nvim": { "branch": "main", "commit": "b5e57ee599d91c7eb6915df6b515915501b0b7df" }, + "csvview.nvim": { "branch": "main", "commit": "092fada3e43b61fe7573bf439e1bc92f1e304f2b" }, "darkplus.nvim": { "branch": "master", "commit": "c7fff5ce62406121fc6c9e4746f118b2b2499c4c" }, "darkvoid.nvim": { "branch": "master", "commit": "45be993a5617e05811b6b293c05e6aded7003cc9" }, "demicolon.nvim": { "branch": "main", "commit": "a5bd58e35742b04fc53dd3b30719299e85348da9" }, @@ -61,7 +62,6 @@ "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "melange.nvim": { "branch": "master", "commit": "2db5407f2f6d6d6286f50f2f7365728d66f6f3ae" }, "mini.icons": { "branch": "main", "commit": "910db5df9724d65371182948f921fce23c2c881e" }, - "minuet-ai.nvim": { "branch": "main", "commit": "8e452f2e16380161f9de8db02f3723d2b704e93e" }, "neoconf.nvim": { "branch": "main", "commit": "ddd37d70db79ecce1d88055b43adee70e9df56bc" }, "neocord": { "branch": "main", "commit": "4d55d8dab2d5f2f272192add7a2c21982039c699" }, "neogen": { "branch": "main", "commit": "b2e78708876f4da507839726816010a68e33fec8" }, @@ -77,14 +77,14 @@ "nui-components.nvim": { "branch": "main", "commit": "caecfe2089e5ffbe99c2b0e0468da91990263a90" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, "nvim-autopairs": { "branch": "master", "commit": "3d02855468f94bf435db41b661b58ec4f48a06b7" }, - "nvim-colorizer.lua": { "branch": "master", "commit": "2933cb5b547b8a2dba20e8087d488462ad5bc6bc" }, + "nvim-colorizer.lua": { "branch": "master", "commit": "19bd49d0aa483f442e24003f94e8fd80065694df" }, "nvim-dap": { "branch": "master", "commit": "ead0de6eac91a555b714bfd7d28959eeecfb96f9" }, "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" }, "nvim-dap-ui": { "branch": "master", "commit": "bc81f8d3440aede116f821114547a476b082b319" }, "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, "nvim-dbee": { "branch": "master", "commit": "495f6f718ccfb98eba51c7998e30f3f3ea6e95e1" }, "nvim-lint": { "branch": "master", "commit": "789b7ada1b4f00e08d026dffde410dcfa6a0ba87" }, - "nvim-lspconfig": { "branch": "master", "commit": "9962e25a23f0e992116b99a9a6400947d5a7177b" }, + "nvim-lspconfig": { "branch": "master", "commit": "bf81bef7d75a0f4a0cf61462b318ea00b3c97cc8" }, "nvim-nio": { "branch": "master", "commit": "21f5324bfac14e22ba26553caf69ec76ae8a7662" }, "nvim-silicon": { "branch": "main", "commit": "7f66bda8f60c97a5bf4b37e5b8acb0e829ae3c32" }, "nvim-surround": { "branch": "main", "commit": "ae298105122c87bbe0a36b1ad20b06d417c0433e" }, @@ -93,7 +93,7 @@ "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, "nvim-ts-context-commentstring": { "branch": "main", "commit": "1b212c2eee76d787bbea6aa5e92a2b534e7b4f8f" }, - "nvim-ufo": { "branch": "main", "commit": "edcb48240dcd0d77f3429b1858317acb7f8702b4" }, + "nvim-ufo": { "branch": "main", "commit": "a8e039806794ebad4f501a25c6213eb841c1949c" }, "nvim-web-devicons": { "branch": "master", "commit": "1c9136332840edee0c593f2f4f89598c8ed97f5f" }, "oil.nvim": { "branch": "master", "commit": "ba858b662599eab8ef1cba9ab745afded99cb180" }, "onedark.nvim": { "branch": "master", "commit": "67a74c275d1116d575ab25485d1bfa6b2a9c38a6" }, @@ -105,7 +105,7 @@ "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" }, "promise-async": { "branch": "main", "commit": "119e8961014c9bfaf1487bf3c2a393d254f337e2" }, "pymple.nvim": { "branch": "main", "commit": "110cc9499b89f2b7230a0c3a7332b3e4b1ac5b7b" }, - "rainbow-delimiters.nvim": { "branch": "master", "commit": "85b80abaa09cbbc039e3095b2f515b3cf8cadd11" }, + "rainbow-delimiters.nvim": { "branch": "master", "commit": "68a869ec386df5b8fef9ce9907c6c0850400e205" }, "rainbow_csv.nvim": { "branch": "main", "commit": "7f3fddfe813641035fac2cdf94c2ff69bb0bf0b9" }, "rose-pine.nvim": { "branch": "main", "commit": "42f0724e0bca9f57f0bcfa688787c37b8d4befe8" }, "rustaceanvim": { "branch": "master", "commit": "242e47bc356818b956e685a2e8de1d613caf45bf" }, @@ -126,7 +126,7 @@ "telescope.nvim": { "branch": "master", "commit": "a0bbec21143c7bc5f8bb02e0005fa0b982edc026" }, "timber.nvim": { "branch": "main", "commit": "7e96bc1a01cea35e872e4ac387edfc1c68ca37f6" }, "todo-comments.nvim": { "branch": "main", "commit": "304a8d204ee787d2544d8bc23cd38d2f929e7cc5" }, - "tokyonight.nvim": { "branch": "main", "commit": "8cb8b1aded4087712030ef3e840ad6468fbc7b0f" }, + "tokyonight.nvim": { "branch": "main", "commit": "dca4adba7dc5f09302a00b0e76078d54d82d2658" }, "tree-sitter-bruno": { "branch": "main", "commit": "347e99f256930213cd7fcd0efe3f9af83035c4b1" }, "treesitter-utils": { "branch": "main", "commit": "df621499e4227f0476f6f4bdb75a9d8dd18d16f2" }, "trouble.nvim": { "branch": "main", "commit": "6f380b8826fb819c752c8fd7daaee9ef96d4c689" }, @@ -142,7 +142,7 @@ "vim-illuminate": { "branch": "master", "commit": "5eeb7951fc630682c322e88a9bbdae5c224ff0aa" }, "vim-log-highlighting": { "branch": "master", "commit": "1037e26f3120e6a6a2c0c33b14a84336dee2a78f" }, "vim-tmux-navigator": { "branch": "master", "commit": "d847ea942a5bb4d4fab6efebc9f30d787fd96e65" }, - "vimtex": { "branch": "master", "commit": "83e331dcad5ce28012e656eea3906b5b897db2ba" }, + "vimtex": { "branch": "master", "commit": "3a9f47ce6e42c4a3c9a92a254f1f611a8d374fc9" }, "which-key.nvim": { "branch": "main", "commit": "b74a3c85f03225bc91f4f5a9056518d3fa9a3470" }, "yuck.vim": { "branch": "master", "commit": "9b5e0370f70cc30383e1dabd6c215475915fe5c3" }, "zen-mode.nvim": { "branch": "main", "commit": "863f150ca321b3dd8aa1a2b69b5f411a220e144f" } diff --git a/lua/plugins/avante.lua b/lua/plugins/avante.lua deleted file mode 100644 index 1fec8cd..0000000 --- a/lua/plugins/avante.lua +++ /dev/null @@ -1,46 +0,0 @@ -return { - "yetone/avante.nvim", - event = "VeryLazy", - lazy = false, - version = false, -- Set this to "*" to always pull the latest release version, or set it to false to update to the latest code changes. - enabled = false, - opts = { - -- add any opts here - }, - -- 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 = { - "stevearc/dressing.nvim", - "nvim-lua/plenary.nvim", - "MunifTanjim/nui.nvim", - "nvim-telescope/telescope.nvim", - -- "hrsh7th/nvim-cmp", -- autocompletion for avante commands and mentions - "echasnovski/mini.icons", - { - -- 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" }, - }, - }, -} diff --git a/lua/plugins/blink.lua b/lua/plugins/blink.lua index 29deb38..aae1ec8 100644 --- a/lua/plugins/blink.lua +++ b/lua/plugins/blink.lua @@ -7,7 +7,10 @@ return { { "L3MON4D3/LuaSnip", version = "v2.*" }, "Saecki/crates.nvim", "davidsierradz/cmp-conventionalcommits", - "petertriho/cmp-git", -- TODO: make this work + { + "Kaiser-Yang/blink-cmp-git", + dependencies = { "nvim-lua/plenary.nvim" }, + }, "mikavilpas/blink-ripgrep.nvim", "moyiz/blink-emoji.nvim", { @@ -22,7 +25,6 @@ return { "petertriho/cmp-git", ft = { "gitcommit", "octo", "NeogitCommitMessage" }, }, - -- "milanglacier/minuet-ai.nvim", }, version = "*", opts = { @@ -44,15 +46,14 @@ return { cmp.scroll_documentation_down(4) end, }, - [""] = { - function() - require("blink-cmp").show({ sources = { "ripgrep" } }) - end, - "fallback", - }, + -- [""] = { + -- function() + -- require("blink-cmp").show({ sources = { "ripgrep" } }) + -- end, + -- "fallback", + -- }, [""] = {}, [""] = {}, - -- [""] = require("minuet").make_blink_map(), }, appearance = { @@ -64,6 +65,7 @@ return { -- elsewhere in your config, without redefining it, due to `opts_extend` sources = { default = { + "git", "lazydev", "crates", "lsp", @@ -72,7 +74,7 @@ return { "git", "dbee", "snippets", - -- "minuet", + "ripgrep", }, providers = { lazydev = { @@ -85,11 +87,6 @@ return { module = "blink.compat.source", score_offset = 10, }, - git = { - name = "git", - module = "blink.compat.source", - score_offset = 20, - }, dbee = { name = "cmp-dbee", module = "blink.compat.source", @@ -119,11 +116,15 @@ return { module = "blink.compat.source", score_offset = 100, }, - -- minuet = { - -- name = "minuet", - -- module = "minuet.blink", - -- score_offset = 8, -- Gives minuet higher priority among suggestions - -- }, + git = { + score_offset = 100, + module = "blink-cmp-git", + name = "Git", + should_show_items = function() + return vim.o.filetype == "gitcommit" or vim.o.filetype == "markdown" + end, + opts = {}, + }, }, }, completion = { diff --git a/lua/plugins/cmp-git.lua b/lua/plugins/cmp-git.lua deleted file mode 100644 index 3b0eda1..0000000 --- a/lua/plugins/cmp-git.lua +++ /dev/null @@ -1,15 +0,0 @@ -return { - "petertriho/cmp-git", - dependencies = { "nvim-lua/plenary.nvim" }, - ft = { "gitcommit", "octo", "NeogitCommitMessage" }, - opts = { - gitlab = { - hosts = { - "git.modulation.lv", - }, - }, - }, - config = function(_, opts) - require("cmp_git").setup(opts) - end, -} diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 6bfe7b8..3cfdaab 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -328,7 +328,6 @@ return { outputPath = "$root/target/$dir/$name", }, }, - -- ts_ls = function() end, }, }, } diff --git a/lua/plugins/minuet.lua b/lua/plugins/minuet.lua deleted file mode 100644 index 0719015..0000000 --- a/lua/plugins/minuet.lua +++ /dev/null @@ -1,26 +0,0 @@ -return { - "milanglacier/minuet-ai.nvim", - enabled = false, - opts = { - end_point = "http://127.0.0.1:1234/v1/chat/completions", - virtualtext = { - auto_trigger_ft = {}, - keymap = { - -- accept whole completion - accept = "", - -- accept one line - accept_line = "", - -- accept n lines (prompts for number) - accept_n_lines = "", - -- Cycle to prev completion item, or manually invoke completion - prev = "", - -- Cycle to next completion item, or manually invoke completion - next = "", - dismiss = "", - }, - }, - }, - config = function(_, opts) - require("minuet").setup(opts) - end, -} diff --git a/lua/plugins/typescript-tools.lua b/lua/plugins/typescript-tools.lua index e453eb6..b6399a1 100644 --- a/lua/plugins/typescript-tools.lua +++ b/lua/plugins/typescript-tools.lua @@ -4,7 +4,6 @@ return { dependencies = { "nvim-lua/plenary.nvim", "neovim/nvim-lspconfig", - "saghen/blink.cmp", }, ft = { "javascriptreact", "typescriptreact", "javascript", "typescript" }, opts = { @@ -14,7 +13,7 @@ return { end, settings = { -- spawn additional tsserver instance to calculate diagnostics on it - separate_diagnostic_server = true, + separate_diagnostic_server = false, -- "change"|"insert_leave" determine when the client asks the server about diagnostic publish_diagnostic_on = "insert_leave", -- array of strings("fix_all"|"add_missing_imports"|"remove_unused"|