clean

lua/plugins/editor.lua

@@ -8,22 +8,6 @@ return {
     end,
   },
 
-  -- Comment.nvim
-  {
-    "numToStr/Comment.nvim",
-    keys = {
-      { "gcc", mode = "n", desc = "Comment toggle current line" },
-      { "gc", mode = { "n", "o" }, desc = "Comment toggle linewise" },
-      { "gc", mode = "x", desc = "Comment toggle linewise (visual)" },
-      { "gbc", mode = "n", desc = "Comment toggle current block" },
-      { "gb", mode = { "n", "o" }, desc = "Comment toggle blockwise" },
-      { "gb", mode = "x", desc = "Comment toggle blockwise (visual)" },
-    },
-    config = function()
-      require("Comment").setup()
-    end,
-  },
-
   -- Flash.nvim for navigation
   {
     "folke/flash.nvim",

lua/plugins/lsp.lua

@@ -1,21 +1,24 @@
 return {
     { "neovim/nvim-lspconfig", lazy = false },
-    { "williamboman/mason.nvim", lazy = false, opts = {} },
+
+    -- Autocompletion
     {
-        "williamboman/mason-lspconfig.nvim",
-        lazy = false,
+        "saghen/blink.cmp",
+        dependencies = { "rafamadriz/friendly-snippets" },
+        version = "1.*",
+        event = "InsertEnter",
+
+        ---@module 'blink.cmp'
+        ---@type blink.cmp.Config
         opts = {
-            ensure_installed = {
-                "lua_ls",
-                "pyright",
-                "rust_analyzer",
-                "gopls",
-                "clangd",
-                "bashls",
-                "jsonls",
-                "html",
-                "cssls",
+            keymap = { preset = "default" },
+            appearance = { nerd_font_variant = "mono" },
+            completion = { documentation = { auto_show = true } },
+            sources = {
+                default = { "lsp", "path", "snippets", "buffer" },
             },
+            fuzzy = { implementation = "prefer_rust_with_warning" },
         },
+        opts_extend = { "sources.default" },
     },
 }

lua/plugins/ui.lua

@@ -142,23 +142,4 @@ return {
     dependencies = { "nvim-tree/nvim-web-devicons" },
   },
 
-  -- Which-key for keybinding hints
-  {
-    "folke/which-key.nvim",
-    event = "VeryLazy",
-    opts = {
-      win = {
-        border = { "┏", "━", "┓", "┃", "┛", "━", "┗", "┃" },
-      },
-    },
-    keys = {
-      {
-        "<leader>?",
-        function()
-          require("which-key").show({ global = false })
-        end,
-        desc = "Buffer Local Keymaps (which-key)",
-      },
-    },
-  },
 }