diff --git a/flake.lock b/flake.lock index dc19021..4c78c98 100644 --- a/flake.lock +++ b/flake.lock @@ -31,51 +31,19 @@ "type": "github" } }, - "plugins-live-share": { + "plugins-blink-ripgrep": { "flake": false, "locked": { - "lastModified": 1729253766, - "narHash": "sha256-fUYFdeP+T+KwGpvm0eh5GcAS35ZU5f0N9A/JsqBgHGA=", - "owner": "azratul", - "repo": "live-share.nvim", - "rev": "bf5e8e087c368aae0325a09d1ea43f2a08f5e9aa", + "lastModified": 1735411615, + "narHash": "sha256-V3Tf8bPpO7KjP/AwcgYjMZdTejydvBx/t33H3+wsNLo=", + "owner": "mikavilpas", + "repo": "blink-ripgrep.nvim", + "rev": "f4d9460a3552c735c7835a545ce32125610c1ce5", "type": "github" }, "original": { - "owner": "azratul", - "repo": "live-share.nvim", - "type": "github" - } - }, - "plugins-lsp-progress": { - "flake": false, - "locked": { - "lastModified": 1734338835, - "narHash": "sha256-WLBNiUzylljTof52+bZgiMIPjzEFeCEq3eSamdo467M=", - "owner": "linrongbin16", - "repo": "lsp-progress.nvim", - "rev": "f3df1df8f5ea33d082db047b5d2d2b83cc01cd8a", - "type": "github" - }, - "original": { - "owner": "linrongbin16", - "repo": "lsp-progress.nvim", - "type": "github" - } - }, - "plugins-typst-preview": { - "flake": false, - "locked": { - "lastModified": 1734839452, - "narHash": "sha256-d6Tv7xZRghYYDfABk/p2e9qTm4qnWHM+ejKDCcR0TfY=", - "owner": "chomosuke", - "repo": "typst-preview.nvim", - "rev": "c1100e8788baabe8ca8f8cd7fd63d3d479e49e36", - "type": "github" - }, - "original": { - "owner": "chomosuke", - "repo": "typst-preview.nvim", + "owner": "mikavilpas", + "repo": "blink-ripgrep.nvim", "type": "github" } }, @@ -83,9 +51,7 @@ "inputs": { "nixCats": "nixCats", "nixpkgs": "nixpkgs", - "plugins-live-share": "plugins-live-share", - "plugins-lsp-progress": "plugins-lsp-progress", - "plugins-typst-preview": "plugins-typst-preview" + "plugins-blink-ripgrep": "plugins-blink-ripgrep" } } }, diff --git a/flake.nix b/flake.nix index ea32598..2909765 100644 --- a/flake.nix +++ b/flake.nix @@ -5,18 +5,8 @@ nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nixCats.url = "github:BirdeeHub/nixCats-nvim"; - plugins-typst-preview = { - url = "github:chomosuke/typst-preview.nvim"; - flake = false; - }; - - plugins-lsp-progress = { - url = "github:linrongbin16/lsp-progress.nvim"; - flake = false; - }; - - plugins-live-share = { - url = "github:azratul/live-share.nvim"; + plugins-blink-ripgrep = { + url = "github:mikavilpas/blink-ripgrep.nvim"; flake = false; }; }; @@ -139,9 +129,7 @@ # lz.n (not necessarily lazy loaded) optionalPlugins = { gitPlugins = with pkgs.neovimPlugins; [ - typst-preview - lsp-progress - live-share + blink-ripgrep ]; general = with pkgs.vimPlugins; [ nvim-autopairs @@ -184,6 +172,8 @@ blink-cmp clangd_extensions-nvim tailwind-tools-nvim + typst-preview-nvim + lsp-progress-nvim ]; }; diff --git a/lua/plugins/blink-cmp.lua b/lua/plugins/blink-cmp.lua index 3d2048a..350f4cc 100644 --- a/lua/plugins/blink-cmp.lua +++ b/lua/plugins/blink-cmp.lua @@ -2,13 +2,30 @@ return { "blink.cmp", event = "BufEnter", after = function() + require("lz.n").trigger_load("blink-ripgrep") + require("blink.cmp").setup({ - keymap = { preset = "default" }, + keymap = { + preset = "default", + [""] = { + function() + require("blink-cmp").show({ providers = { "ripgrep" } }) + end, + }, + }, appearance = { use_nvim_cmp_as_default = true, nerd_font_variant = "normal", }, - sources = {}, + sources = { + default = { "lsp", "path", "snippets", "buffer" }, + providers = { + ripgrep = { + module = "blink-ripgrep", + name = "Ripgrep", + }, + }, + }, completion = { menu = { border = "rounded", diff --git a/lua/plugins/lsp-progress.lua b/lua/plugins/lsp-progress.lua index f3d0364..5a0680d 100644 --- a/lua/plugins/lsp-progress.lua +++ b/lua/plugins/lsp-progress.lua @@ -1,5 +1,5 @@ return { - "lsp-progress", + "lsp-progress.nvim", event = "LspAttach", after = function() require("lsp-progress").setup({ diff --git a/lua/plugins/lz-spec.lua b/lua/plugins/lz-spec.lua index d283bd4..24b6b0d 100644 --- a/lua/plugins/lz-spec.lua +++ b/lua/plugins/lz-spec.lua @@ -35,7 +35,7 @@ return { filetypes = { "markdown" }, }, { - "typst-preview", + "typst-preview.nvim", filetypes = { "*.typ" }, after = function() require("typst-preview").setup({ @@ -258,13 +258,10 @@ return { lz.trigger_load("nvim-lspconfig") require("tailwind-tools").setup({ - conceal = { - enabled = true, - }, - document_color = { - enabled = true, - }, + conceal = { enabled = true }, + document_color = { enabled = true }, }) end, }, + { "blink-ripgrep", lazy = true }, }