From b86e7d157d392a63c867fa36f5098ab459254b7f Mon Sep 17 00:00:00 2001
From: Devin Droddy <devin.droddy@gmail.com>
Date: Sat, 5 Jul 2025 11:08:15 -0400
Subject: [PATCH] supermaven-nvim: fixes

---
 modules/plugins/assistant/default.nix                 |  2 +-
 .../{supermaven => supermaven-nvim}/config.nix        |  4 ++--
 .../{supermaven => supermaven-nvim}/default.nix       |  0
 .../supermaven-nvim.nix}                              | 11 ++++++++---
 4 files changed, 11 insertions(+), 6 deletions(-)
 rename modules/plugins/assistant/{supermaven => supermaven-nvim}/config.nix (76%)
 rename modules/plugins/assistant/{supermaven => supermaven-nvim}/default.nix (100%)
 rename modules/plugins/assistant/{supermaven/supermaven.nix => supermaven-nvim/supermaven-nvim.nix} (89%)

diff --git a/modules/plugins/assistant/default.nix b/modules/plugins/assistant/default.nix
index 7329753a..a4da583a 100644
--- a/modules/plugins/assistant/default.nix
+++ b/modules/plugins/assistant/default.nix
@@ -3,7 +3,7 @@
     ./chatgpt
     ./copilot
     ./codecompanion
-    ./supermaven
+    ./supermaven-nvim
     ./avante
   ];
 }
diff --git a/modules/plugins/assistant/supermaven/config.nix b/modules/plugins/assistant/supermaven-nvim/config.nix
similarity index 76%
rename from modules/plugins/assistant/supermaven/config.nix
rename to modules/plugins/assistant/supermaven-nvim/config.nix
index f2c13ba6..55d401a5 100644
--- a/modules/plugins/assistant/supermaven/config.nix
+++ b/modules/plugins/assistant/supermaven-nvim/config.nix
@@ -3,10 +3,10 @@
   lib,
   ...
 }: let
-  cfg = config.vim.assistant.supermaven;
+  cfg = config.vim.assistant.supermaven-nvim;
 in {
   config = lib.mkIf cfg.enable {
-    vim.plugins = {
+    vim.lazy.plugins = {
       supermaven-nvim = {
         package = "supermaven-nvim";
         setupModule = "supermaven-nvim";
diff --git a/modules/plugins/assistant/supermaven/default.nix b/modules/plugins/assistant/supermaven-nvim/default.nix
similarity index 100%
rename from modules/plugins/assistant/supermaven/default.nix
rename to modules/plugins/assistant/supermaven-nvim/default.nix
diff --git a/modules/plugins/assistant/supermaven/supermaven.nix b/modules/plugins/assistant/supermaven-nvim/supermaven-nvim.nix
similarity index 89%
rename from modules/plugins/assistant/supermaven/supermaven.nix
rename to modules/plugins/assistant/supermaven-nvim/supermaven-nvim.nix
index 2a7060b3..651dfdf6 100644
--- a/modules/plugins/assistant/supermaven/supermaven.nix
+++ b/modules/plugins/assistant/supermaven-nvim/supermaven-nvim.nix
@@ -1,7 +1,8 @@
 {lib, ...}: let
-  inherit (lib) mkOption mkEnableOption types;
+  inherit (lib) types;
+  inherit (lib.options) mkOption mkEnableOption;
 in {
-  options.vim.assistant.supermaven = {
+  options.vim.assistant.supermaven-nvim = {
     enable = mkEnableOption "Supermaven AI assistant";
 
     setupOpts = lib.nvim.types.mkPluginSetupOption "Supermaven" {
@@ -75,7 +76,11 @@ in {
       condition = mkOption {
         type = types.nullOr lib.nvim.types.luaInline;
         default = null;
-        description = "Condition function to check for stopping supermaven. A returned `true` means to stop supermaven";
+        description = ''
+          Condition function to check for stopping supermaven.
+
+          A returned `true` means to stop supermaven
+        '';
       };
     };
   };