From 93b3d768832b9469d5f3054f0f34c43f22655798 Mon Sep 17 00:00:00 2001 From: Nxllpointer <54677650+Nxllpointer@users.noreply.github.com> Date: Sat, 4 Jan 2025 12:34:32 +0100 Subject: [PATCH 1/8] Update flake --- flake.lock | 98 +++++++++++++++++++++++++++--------------------------- 1 file changed, 49 insertions(+), 49 deletions(-) diff --git a/flake.lock b/flake.lock index faa2bb4..a0eb4bc 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "autosave": { "flake": false, "locked": { - "lastModified": 1728590199, - "narHash": "sha256-NN03WnGyb6IOomNW6ZdoHR1apnOxTnGGl/zRd24Kl9k=", + "lastModified": 1733293074, + "narHash": "sha256-gCQxCSFWj4GDN/X6bXIKDBXEiZHHFNOWwHsJ294G47o=", "owner": "okuuva", "repo": "auto-save.nvim", - "rev": "5fbcaac0a2698c87a9a1bd2083cb6949505cca12", + "rev": "b58948445c43e6903987a9bb97c82e66fdcc0786", "type": "github" }, "original": { @@ -39,11 +39,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1731690394, - "narHash": "sha256-nuuQeDa2wk9aa3R+1U8cTWBw17+DupP0F5nSGXV4Ubs=", + "lastModified": 1735939328, + "narHash": "sha256-uvMB3oU6uxERfkXiweeFS0cCIOgO/ogy7GoYAlXUPDs=", "owner": "Saghen", "repo": "blink.cmp", - "rev": "91ea9295a6c3058f15b27724af0dec1afacce772", + "rev": "e3b7cb4a1094377c3093a021300de123d9fc60d3", "type": "github" }, "original": { @@ -55,11 +55,11 @@ "catppuccin": { "flake": false, "locked": { - "lastModified": 1731169755, - "narHash": "sha256-lsnePejThsEygTCKV/rfJJ/h+RSrro91am841iznJe4=", + "lastModified": 1735299190, + "narHash": "sha256-lwQLmqm01FihJdad4QRMK23MTrouyOokyuX/3enWjzs=", "owner": "catppuccin", "repo": "nvim", - "rev": "637d99e638bc6f1efedac582f6ccab08badac0c6", + "rev": "f67b886d65a029f12ffa298701fb8f1efd89295d", "type": "github" }, "original": { @@ -92,11 +92,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1731479620, - "narHash": "sha256-jBYFboMLYs0LcIfZq+kprR4vOjz6cfqaS8trwogoXQE=", + "lastModified": 1734676450, + "narHash": "sha256-iwcxhTVe4h5TqW0HsNiOQP27eMBmbBshF+q2UjEy5aU=", "owner": "nix-community", "repo": "fenix", - "rev": "46c04695cd28be15ff88e3b8d2716818b034c084", + "rev": "46e19fa0eb3260b2c3ee5b2cf89e73343c1296ab", "type": "github" }, "original": { @@ -133,11 +133,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1730504689, - "narHash": "sha256-hgmguH29K2fvs9szpq2r3pz2/8cJd2LPS+b4tfNFCwE=", + "lastModified": 1733312601, + "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "506278e768c2a08bec68eb62932193e341f55c90", + "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", "type": "github" }, "original": { @@ -219,11 +219,11 @@ "lze": { "flake": false, "locked": { - "lastModified": 1731205927, - "narHash": "sha256-+TaJ8IBra+MHNN6XS0a3aJyRGgxVttUMSVNVG4XpWkI=", + "lastModified": 1735495769, + "narHash": "sha256-CB0BhK09sQEkTDEHnI6khP0zE3hIroDlzufsfplFIqs=", "owner": "BirdeeHub", "repo": "lze", - "rev": "2b095d5ed9ebc54465d5540ba17f6618b3dfc7c0", + "rev": "a3848e98de7ab7ab620f6a2e155722eb012f3809", "type": "github" }, "original": { @@ -250,11 +250,11 @@ }, "mnw": { "locked": { - "lastModified": 1731821965, - "narHash": "sha256-QiGi/HBQRnIRGY4gQPuH7T3hr7NznOpEO7qNpF5ldmE=", + "lastModified": 1735150973, + "narHash": "sha256-OJhcCAoaMMXeD6o4qI/hxBCNELJp4dN8D5LJZc8w8XA=", "owner": "Gerg-L", "repo": "mnw", - "rev": "5fe5c41975ed0af55f55dc37cd28ba906a5d015e", + "rev": "40cd0b006cc48dffd0f8698ad7f54cf1d56779a6", "type": "github" }, "original": { @@ -266,11 +266,11 @@ "neo-tree": { "flake": false, "locked": { - "lastModified": 1726542367, - "narHash": "sha256-Lqt0KJNT9HmpJwZoWChYeVBrDWhscRe8COqVCwgcTwk=", + "lastModified": 1735961632, + "narHash": "sha256-1eGGSm1FwZ61/KU3LDVSeiFCu6+cQDMNPDg4t2AuQVo=", "owner": "nvim-neo-tree", "repo": "neo-tree.nvim", - "rev": "a77af2e764c5ed4038d27d1c463fa49cd4794e07", + "rev": "e6645ecfcba3e064446a6def1c10d788c9873f51", "type": "github" }, "original": { @@ -298,11 +298,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1731245184, - "narHash": "sha256-vmLS8+x+gHRv1yzj3n+GTAEObwmhxmkkukB2DwtJRdU=", + "lastModified": 1734435836, + "narHash": "sha256-kMBQ5PRiFLagltK0sH+08aiNt3zGERC2297iB6vrvlU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "aebe249544837ce42588aa4b2e7972222ba12e8f", + "rev": "4989a246d7a390a859852baddb1013f825435cee", "type": "github" }, "original": { @@ -314,14 +314,14 @@ }, "nixpkgs-lib": { "locked": { - "lastModified": 1730504152, - "narHash": "sha256-lXvH/vOfb4aGYyvFmZK/HlsNsr/0CVWlwYvo2rxJk3s=", + "lastModified": 1733096140, + "narHash": "sha256-1qRH7uAUsyQI7R1Uwl4T+XvdNv778H0Nb5njNrqvylY=", "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" }, "original": { "type": "tarball", - "url": "https://github.com/NixOS/nixpkgs/archive/cc2f28000298e1269cea6612cd06ec9979dd5d7f.tar.gz" + "url": "https://github.com/NixOS/nixpkgs/archive/5487e69da40cbd611ab2cadee0b4637225f7cfae.tar.gz" } }, "nixpkgs-lib_2": { @@ -338,11 +338,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1731676054, - "narHash": "sha256-OZiZ3m8SCMfh3B6bfGC/Bm4x3qc1m2SVEAlkV6iY7Yg=", + "lastModified": 1735834308, + "narHash": "sha256-dklw3AXr3OGO4/XT1Tu3Xz9n/we8GctZZ75ZWVqAVhk=", "owner": "nixos", "repo": "nixpkgs", - "rev": "5e4fbfb6b3de1aa2872b76d49fafc942626e2add", + "rev": "6df24922a1400241dae323af55f30e4318a6ca65", "type": "github" }, "original": { @@ -371,11 +371,11 @@ "nui": { "flake": false, "locked": { - "lastModified": 1726376728, - "narHash": "sha256-90Wq+vT361mTaGU/SvAezqJkX9HHmZ2GI2fKBDxPn04=", + "lastModified": 1733856815, + "narHash": "sha256-6U7E/i5FuNXQy+sF4C5DVxuTPqNKD5wxUgFohpOjm9Q=", "owner": "MunifTanjim", "repo": "nui.nvim", - "rev": "b58e2bfda5cea347c9d58b7f11cf3012c7b3953f", + "rev": "53e907ffe5eedebdca1cd503b00aa8692068ca46", "type": "github" }, "original": { @@ -387,11 +387,11 @@ "nvim-lspconfig": { "flake": false, "locked": { - "lastModified": 1731651852, - "narHash": "sha256-enldOaHszQH7fUxUEWFNcWedH9zatrNp/Dh7vHGBz/o=", + "lastModified": 1735893345, + "narHash": "sha256-byU5aewCFEztNVGqsFw/GAIwi3XAFee3V220vr4a6Z8=", "owner": "neovim", "repo": "nvim-lspconfig", - "rev": "87c7c83ce62971e0bdb29bb32b8ad2b19c8f95d0", + "rev": "a8ef5e6e497b3ebeaaf35b939c07c211563b2e05", "type": "github" }, "original": { @@ -403,11 +403,11 @@ "nvim-web-devicons": { "flake": false, "locked": { - "lastModified": 1732225809, - "narHash": "sha256-PvQ6Q4+08uf4gVH5tsVRB+7AuDSubDUUbPiUDyNAbzc=", + "lastModified": 1735863050, + "narHash": "sha256-3kLih7OCroaoWcrcfOCvFICggQBWDsb8oyjzzKodFPA=", "owner": "nvim-tree", "repo": "nvim-web-devicons", - "rev": "f09be61d05bebcba85bb47be1931322d51b95644", + "rev": "5740b7382429d20b6ed0bbdb0694185af9507d44", "type": "github" }, "original": { @@ -460,11 +460,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1731342671, - "narHash": "sha256-36eYDHoPzjavnpmEpc2MXdzMk557S0YooGms07mDuKk=", + "lastModified": 1734622712, + "narHash": "sha256-2Oc2LbFypF1EG3zTVIVcuT5XFJ7R3oAwu2tS8B0qQ0I=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "fc98e0657abf3ce07eed513e38274c89bbb2f8ad", + "rev": "fe027d79d22f2a7645da4143f5cc0f5f56239b97", "type": "github" }, "original": { @@ -596,11 +596,11 @@ "which-key": { "flake": false, "locked": { - "lastModified": 1730919714, - "narHash": "sha256-5t6UnOP2+CXB55/C4YWbp2pE+xKDLMvCJK8m085Fk4w=", + "lastModified": 1734253151, + "narHash": "sha256-f/+sYMDEguB5ZDiYiQAsDvdF/2cVcWnLBU+9qwigk4s=", "owner": "folke", "repo": "which-key.nvim", - "rev": "68e37e12913a66b60073906f5d3f14dee0de19f2", + "rev": "8ab96b38a2530eacba5be717f52e04601eb59326", "type": "github" }, "original": { From 6680dc425a0a035723e980b9bbf1c04d7da4e8a7 Mon Sep 17 00:00:00 2001 From: Nxllpointer <54677650+Nxllpointer@users.noreply.github.com> Date: Sat, 4 Jan 2025 12:42:40 +0100 Subject: [PATCH 2/8] Update neovim --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index a0eb4bc..b28ca17 100644 --- a/flake.lock +++ b/flake.lock @@ -282,11 +282,11 @@ "neovim-src": { "flake": false, "locked": { - "lastModified": 1732888740, - "narHash": "sha256-7IQta0SXbNeML8Bi+CSyIvyTes672tGRPca8pk6E7ec=", + "lastModified": 1735989995, + "narHash": "sha256-A3nCwqSjKYEOs4C09TW8gBMiY+CwhAp2Y/ARiqTl4Ec=", "owner": "Nxllpointer", "repo": "neovim", - "rev": "4d9f98b97d3632883c0e4cf694d7e07f31deb5dd", + "rev": "45950fda4d8a0096a5975c78f3cb44bd753d4dee", "type": "github" }, "original": { From 98b04ffc3fddf8a73449d497ba7a94b6ab7badb7 Mon Sep 17 00:00:00 2001 From: Nxllpointer <54677650+Nxllpointer@users.noreply.github.com> Date: Sat, 4 Jan 2025 14:39:43 +0100 Subject: [PATCH 3/8] Update tinymist --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index b28ca17..2cd38a2 100644 --- a/flake.lock +++ b/flake.lock @@ -555,11 +555,11 @@ "typst": "typst" }, "locked": { - "lastModified": 1732976411, - "narHash": "sha256-LKZeBRydT7GOAn8t9APg3EDTpI/zSbNlo1DKfolVhQM=", + "lastModified": 1735997871, + "narHash": "sha256-XqqReqruU99psPm1qLo0fGMeZEn0/0eMCbJL5BppFWM=", "owner": "Nxllpointer", "repo": "tinymist", - "rev": "365060d74f2d405ee97b877e18b2cb19081cdc65", + "rev": "8d444ee3c700689e56f1a39bdce27dfbbb5b63aa", "type": "github" }, "original": { From 693c6b6bb01ff3ae2b1b85c8fb8a7eac7958e660 Mon Sep 17 00:00:00 2001 From: Nxllpointer <54677650+Nxllpointer@users.noreply.github.com> Date: Sat, 4 Jan 2025 15:01:01 +0100 Subject: [PATCH 4/8] Fix blink.cmp --- tide-nvim/lua/tide/mappings.lua | 4 ++-- tide-nvim/lua/tide/plugins/blink.lua | 16 ++++++++++++---- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/tide-nvim/lua/tide/mappings.lua b/tide-nvim/lua/tide/mappings.lua index aa67f65..c84571c 100644 --- a/tide-nvim/lua/tide/mappings.lua +++ b/tide-nvim/lua/tide/mappings.lua @@ -72,11 +72,11 @@ function M.blink() preset = "enter", -- See https://github.com/Saghen/blink.cmp/blob/4cc0e2bc27fc5ff67f846808e42d3046e05c2f11/lua/blink/cmp/keymap.lua#L47 [''] = { 'show', - require("blink.cmp.trigger.signature").show, + require("blink.cmp.signature.trigger").show, 'show_documentation', 'hide_documentation' }, [''] = { - vim.schedule_wrap(require("blink.cmp.trigger.signature").hide), + vim.schedule_wrap(require("blink.cmp.signature.trigger").hide), 'hide' }, } diff --git a/tide-nvim/lua/tide/plugins/blink.lua b/tide-nvim/lua/tide/plugins/blink.lua index ca75de2..aa6f156 100644 --- a/tide-nvim/lua/tide/plugins/blink.lua +++ b/tide-nvim/lua/tide/plugins/blink.lua @@ -4,11 +4,19 @@ return { on_require = "blink.cmp", after = function() require("blink.cmp").setup { + fuzzy = { + prebuilt_binaries = { + download = false + } + }, + keymap = require("tide.mappings").blink(), - trigger = { signature_help = { enabled = true } }, - windows = { - autocomplete = { - selection = "manual" + + signature = { enabled = true }, + + completion = { + list = { + selection = "preselect"; } } } From e3227a7180a7a27844790043c61743871d902e63 Mon Sep 17 00:00:00 2001 From: Nxllpointer <54677650+Nxllpointer@users.noreply.github.com> Date: Sat, 4 Jan 2025 16:32:25 +0100 Subject: [PATCH 5/8] Switch to manual blink selection --- tide-nvim/lua/tide/plugins/blink.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tide-nvim/lua/tide/plugins/blink.lua b/tide-nvim/lua/tide/plugins/blink.lua index aa6f156..76c9347 100644 --- a/tide-nvim/lua/tide/plugins/blink.lua +++ b/tide-nvim/lua/tide/plugins/blink.lua @@ -16,7 +16,7 @@ return { completion = { list = { - selection = "preselect"; + selection = "manual"; } } } From 9c0229625ca2d966dd15a9559a594049e788df68 Mon Sep 17 00:00:00 2001 From: Nxllpointer <54677650+Nxllpointer@users.noreply.github.com> Date: Sat, 4 Jan 2025 16:35:03 +0100 Subject: [PATCH 6/8] Load blink on cmdline enter --- tide-nvim/lua/tide/plugins/blink.lua | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/tide-nvim/lua/tide/plugins/blink.lua b/tide-nvim/lua/tide/plugins/blink.lua index 76c9347..59bc53f 100644 --- a/tide-nvim/lua/tide/plugins/blink.lua +++ b/tide-nvim/lua/tide/plugins/blink.lua @@ -1,6 +1,6 @@ return { "blink-cmp", - event = "LspAttach", + event = { "LspAttach", "CmdlineEnter" }, on_require = "blink.cmp", after = function() require("blink.cmp").setup { From c997766a6117a06f8d13fc1cf451b620c5d10fe2 Mon Sep 17 00:00:00 2001 From: Nxllpointer <54677650+Nxllpointer@users.noreply.github.com> Date: Mon, 6 Jan 2025 09:37:07 +0100 Subject: [PATCH 7/8] Update tinymist fork --- flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index 2cd38a2..516ab3e 100644 --- a/flake.lock +++ b/flake.lock @@ -555,11 +555,11 @@ "typst": "typst" }, "locked": { - "lastModified": 1735997871, - "narHash": "sha256-XqqReqruU99psPm1qLo0fGMeZEn0/0eMCbJL5BppFWM=", + "lastModified": 1736152527, + "narHash": "sha256-AEGdt1gkXHWRT61jDhs5MrI4z2fs2pk3E6lbaJDS/ww=", "owner": "Nxllpointer", "repo": "tinymist", - "rev": "8d444ee3c700689e56f1a39bdce27dfbbb5b63aa", + "rev": "ec601ff505943095209f2db05a12805a97761c08", "type": "github" }, "original": { From 946a8f8873044f0fa898d94d2da362304874b653 Mon Sep 17 00:00:00 2001 From: Nxllpointer <54677650+Nxllpointer@users.noreply.github.com> Date: Mon, 6 Jan 2025 13:08:21 +0100 Subject: [PATCH 8/8] Dsiable blink cmdline completions --- tide-nvim/lua/tide/plugins/blink.lua | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/tide-nvim/lua/tide/plugins/blink.lua b/tide-nvim/lua/tide/plugins/blink.lua index 59bc53f..18a8c3b 100644 --- a/tide-nvim/lua/tide/plugins/blink.lua +++ b/tide-nvim/lua/tide/plugins/blink.lua @@ -18,6 +18,10 @@ return { list = { selection = "manual"; } + }, + + sources = { + cmdline = {} } } end