diff --git a/.config/nvim/lua/plugins/blink.lua b/.config/nvim/lua/plugins/blink.lua
index a5028b9..78b3fb2 100644
--- a/.config/nvim/lua/plugins/blink.lua
+++ b/.config/nvim/lua/plugins/blink.lua
@@ -6,6 +6,7 @@ return { {
     'xzbdmw/colorful-menu.nvim',
     'disrupted/blink-cmp-conventional-commits',
     'moyiz/blink-emoji.nvim',
+    'milanglacier/minuet-ai.nvim',
   },
 
   -- use a release tag to download pre-built binaries
@@ -22,7 +23,10 @@ return { {
     -- 'super-tab' for mappings similar to vscode (tab to accept, arrow keys to navigate)
     -- 'enter' for mappings similar to 'super-tab' but with 'enter' to accept
     -- See the full "keymap" documentation for information on defining your own keymap.
-    keymap = { preset = 'default' },
+    keymap = {
+      preset = 'default',
+      --['A-y'] = require('minuet').make_blink_map()
+    },
 
     appearance = {
       -- -- Sets the fallback highlight groups to nvim-cmp's highlight groups
@@ -37,7 +41,7 @@ return { {
     -- Default list of enabled providers defined so that you can extend it
     -- elsewhere in your config, without redefining it, due to `opts_extend`
     sources = {
-      default = { 'conventional_commits', 'lsp', 'path', 'snippets', 'buffer', 'emoji', 'codecompanion' },
+      default = { 'conventional_commits', 'lsp', 'path', 'snippets', 'buffer', 'emoji', 'codecompanion', --[[ 'minuet' ]] },
       providers = {
         conventional_commits = {
           name = "Conventional Commits",
@@ -53,9 +57,18 @@ return { {
           score_offset = 15,
           opts = { insert = true },
           should_show_items = function()
-            return vim.tbl_contains({"gitcommit", "markdown" }, vim.o.filetype)
+            return vim.tbl_contains({ "gitcommit", "markdown" }, vim.o.filetype)
           end,
-        }
+        },
+        minuet = {
+          name = 'minuet',
+          module = 'minuet.blink',
+          async = true,
+          -- Should match minuet.config.request_timeout * 1000,
+          -- since minuet.config.request_timeout is in seconds
+          timeout_ms = 3000,
+          score_offset = 50, -- Gives minuet higher priority among suggestions
+        },
       }
     },
 
@@ -75,6 +88,7 @@ return { {
           }
         }
       },
+      --trigger = { prefetch_on_insert = false },
 
       accept = { auto_brackets = { enabled = false }, },
       ghost_text = { enabled = false },
diff --git a/.config/nvim/lua/plugins/codecompanion.lua b/.config/nvim/lua/plugins/codecompanion.lua
index 379732e..0cea1de 100644
--- a/.config/nvim/lua/plugins/codecompanion.lua
+++ b/.config/nvim/lua/plugins/codecompanion.lua
@@ -31,7 +31,7 @@ return {
           },
           schema = {
             model = {
-              default = "gemma3:12b",
+              default = "deepseek-r1:32b",
             },
             num_ctx = {
               default = 16384,
diff --git a/.config/nvim/lua/plugins/comment.lua b/.config/nvim/lua/plugins/comment.lua
index ee3bf5f..e836fa7 100644
--- a/.config/nvim/lua/plugins/comment.lua
+++ b/.config/nvim/lua/plugins/comment.lua
@@ -1,5 +1,23 @@
-return {
+return {{
   -- 'gcc' to toggle comments
   'numToStr/Comment.nvim',
   config = true
-}
+}, {
+    "soemre/commentless.nvim",
+    cmd = "Commentless",
+    keys = {
+        {
+            "z/",
+            function()
+                require("commentless").toggle()
+            end,
+            desc = "Toggle Comments",
+        },
+    },
+    dependencies = {
+        "nvim-treesitter/nvim-treesitter",
+    },
+    opts = {
+        -- Customize Configuration
+    },
+}}
diff --git a/.config/nvim/lua/plugins/lspconfig.lua b/.config/nvim/lua/plugins/lspconfig.lua
index 7099d3e..2e6e8d1 100644
--- a/.config/nvim/lua/plugins/lspconfig.lua
+++ b/.config/nvim/lua/plugins/lspconfig.lua
@@ -9,7 +9,8 @@ return {
   },
   config = function()
     local nvim_lsp = require('lspconfig')
-    require('clangd_extensions').setup({
+    vim.lsp.config('clangd_extensions', {
+    -- require('clangd_extensions').setup({
       ast = {
         -- These are unicode, should be available in any font
         role_icons = {
@@ -40,6 +41,7 @@ return {
         }
       }
     })
+    vim.lsp.enable('clangd_extensions')
     --local lsp_signature = require('lsp_signature')
 
     -- Mappings.
@@ -164,14 +166,14 @@ return {
     --   single_file_support = true,
     --   settings = {
     --     matlab = {
-    --       indexWorkspace = false,
+    --       -- indexWorkspace = false,
     --       installPath = "/usr/local/MATLAB/R2024b",
-    --       matlabConnectionTiming = "onStart",
-    --       telemetry = true,
+    --       -- matlabConnectionTiming = "onStart",
+    --       -- telemetry = true,
     --     },
     --   }
     -- })
-    --
+
     nvim_lsp.typos_lsp.setup({
       cmd = { 'typos-lsp' },
       filetypes = { '*' },