diff --git a/home/common/nvim/blink-cmp.lua b/home/common/nvim/blink-cmp.lua
index ea0124d..102d04e 100644
--- a/home/common/nvim/blink-cmp.lua
+++ b/home/common/nvim/blink-cmp.lua
@@ -5,6 +5,7 @@ require 'blink-cmp'.setup({
     ['<S-Tab>'] = { 'select_prev', 'fallback' },
     ['<PageDown>'] = { 'scroll_documentation_down', 'fallback' },
     ['<PageUp>'] = { 'scroll_documentation_up', 'fallback' },
+    ['<A-y>'] = require('minuet').make_blink_map(),
   },
   completion = {
     accept = {
@@ -46,7 +47,11 @@ require 'blink-cmp'.setup({
           }
         }
       }
-    }
+    },
+
+    trigger = {
+      prefetch_on_insert = false
+    },
   },
 
   fuzzy = {
@@ -61,21 +66,30 @@ require 'blink-cmp'.setup({
   },
 
   cmdline = {
-    sources = {},
+    keymap = { preset = 'inherit' },
+    completion = { menu = { auto_show = true } },
   },
 
   sources = {
     default = {
       'lsp',
       'emoji',
+      'minuet',
     },
     providers = {
       emoji = {
         module = "blink-emoji",
         name = "Emoji",
-        score_offset = 1,
+        score_offset = -40,
         opts = { insert = true },
-      }
+      },
+      minuet = {
+        name = 'minuet',
+        module = 'minuet.blink',
+        async = true,
+        timeout_ms = 3000, -- Should match minuet.config.request_timeout * 1000
+        score_offset = -50,
+      },
     },
   },
 })
diff --git a/home/common/nvim/default.nix b/home/common/nvim/default.nix
index 53311c8..c31a72d 100644
--- a/home/common/nvim/default.nix
+++ b/home/common/nvim/default.nix
@@ -48,6 +48,7 @@ in
       blink-emoji-nvim
       friendly-snippets
       go-nvim
+      plenary-nvim
       targets-vim
       ts-comments-nvim
 
@@ -115,6 +116,37 @@ in
         config = lib.fileContents ./mini.lua;
       }
 
+      {
+        plugin = minuet-ai-nvim;
+        type = "lua";
+        config = ''
+            require('minuet').setup {
+            provider_options = {
+              codestral = {
+                optional = {
+                  max_tokens = 256,
+                  stop = { '\n\n' },
+                },
+              },
+            },
+            virtualtext = {
+              auto_trigger_ft = {
+                'go',
+                'rust',
+              },
+              keymap = {
+                accept = '<A-a>',
+                accept_line = '<A-A>',
+                accept_n_lines = '<A-z>',
+                prev = '<A-[>',
+                next = '<A-]>',
+                dismiss = '<A-e>',
+              },
+            },
+          }
+        '';
+      }
+
       {
         plugin = rustaceanvim;
         type = "lua";
diff --git a/home/common/nvim/dieter/lua/dieter/init.lua b/home/common/nvim/dieter/lua/dieter/init.lua
index 6c5eebb..3bb0849 100644
--- a/home/common/nvim/dieter/lua/dieter/init.lua
+++ b/home/common/nvim/dieter/lua/dieter/init.lua
@@ -114,7 +114,6 @@ local colors = {
 }
 
 local setupGroups = function(c)
-
   return {
     Normal = { fg = c.foreground, bg = c.background },
 
@@ -231,7 +230,7 @@ local setupGroups = function(c)
     BlinkCmpSignatureHelpBorder = { link = 'BlinkCmpDocBorder' },
 
     BlinkCmpGhostText = { fg = c.suggestion, italic = true, bold = true },
-    NeoCodeiumSuggestion = { link = 'BlinkCmpGhostText' },
+    MinuetVirtualText = { link = 'BlinkCmpGhostText' },
 
     LspReferenceText = { fg = c.highlight_intense, undercurl = true },
     LspInlayHint = { fg = c.accent1, italic = true, bold = true },