fixed luasnip keybindings; made ai plugins an option

module.nix

@@ -3,6 +3,12 @@
   options.nixvim-config = {
     enable = lib.mkEnableOption "Enable nixvim-config";
 
+    enable-ai = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      description = "Enable ai plugins";
+    };
+
     enable-startify = lib.mkOption {
       type = lib.types.bool;
       default = false;

plugins/avante.nix

@@ -1,11 +1,49 @@
-{ ... }:
+{ config, ... }:
 {
-  programs.nixvim.plugins.avante = {
+  programs.nixvim.plugins = if config.nixvim-config.enable-ai then {
+    ## required dependencies
+    dressing.enable = true;  # this is archived and may break in the future
+    nui.enable = true;
+
+    ## optional dependencies
+    cmp.enable = true;
+    copilot-lua.enable = true;
+    fzf-lua.enable = true;
+    mini.enable = true;
+    telescope.enable = true;
+    web-devicons.enable = true;
+
+    avante = {
       enable = true;
 
       settings = {
         provider = "copilot";
 
+        files = {
+          auto_include = true;  # Automatically include relevant files
+          max_files = 50;       # Maximum number of files to include in context
+          max_size_kb = 1000;   # Maximum total size of files in KB
+
+          # Define which files to include/exclude
+          include = [
+            "*.lua"
+            "*.nix"
+            "*.rs"
+            "*.ts"
+            "*.js"
+            "*.jsx"
+            "*.tsx"
+            # Add more patterns as needed
+          ];
+
+          exclude = [
+            "node_modules/**"
+            "dist/**"
+            ".git/**"
+            # Add more patterns to exclude
+          ];
+        };
+
         claude = {
           api_key_name = "<api_key_name>";
         };
@@ -43,22 +81,39 @@
           };
         };
 
-      mappings = {
+        ## Default keybindings:
-        ask = "<leader>ca";
+        # <leader>aa - ask
-        edit = "<leader>ce";
+        # <leader>ae - edit
-        refresh = "<leader>cr";
+        # <leader>ar - refresh
-        focus = "<leader>cf";
+        # <leader>af - focus
-        toggle = {
+        # co         - choose ours
-          default = "<leader>ct";
+        # ct         - choose theirs
-          debug = "<leader>cd";
+        # ca         - choose all theirs
-          hint = "<leader>ch";
+        # c0         - choose none
-          suggestion = "<leader>cs";
+        # cb         - choose both
-          repomap = "<leader>cR";
+        # cc         - choose cursor
-        };
+        # ]x         - previous conflict
-        files = {
+        # [x         - next conflict
-          add_current = "<leader>cc";
+        # [[         - previous code block
-        };
+        # ]]         - next code block
-      };
+
+        # mappings = {
+        #   ask = "<leader>ca";
+        #   edit = "<leader>ce";
+        #   refresh = "<leader>cr";
+        #   focus = "<leader>cf";
+        #   toggle = {
+        #     default = "<leader>ct";
+        #     debug = "<leader>cd";
+        #     hint = "<leader>ch";
+        #     suggestion = "<leader>cs";
+        #     repomap = "<leader>cR";
+        #   };
+        #   files = {
+        #     add_current = "<leader>cc";
+        #   };
+        # };
       };
     };
+  } else {};
 }

plugins/cmp.nix

@@ -1,4 +1,4 @@
-{ ... }:
+{ config, ... }:
 {
   programs.nixvim = {
     plugins = {
@@ -42,6 +42,19 @@
               option.get_bufnrs.__raw = "vim.api.nvim_list_bufs";
               keywordLength = 3;
             }
+          ] ++ (if config.nixvim-config.enable-ai then [
+            { name = "codecompanion"; }
+            { name = "copilot"; }
+          ] else []) ++ [
+            {
+              name = "path"; # file system paths
+              keywordLength = 3;
+            }
+            {
+              name = "luasnip"; # snippets
+              keywordLength = 3;
+            }
+            { name = "cmdline"; }
             { name = "codecompanion"; }
             { name = "copilot"; }
             {
@@ -157,6 +170,7 @@
             "<S-Tab>" = "cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true })";
             "<C-l>" = ''
               cmp.mapping(function()
+                local luasnip = require('luasnip')
                 if luasnip.expand_or_locally_jumpable() then
                   luasnip.expand_or_jump()
                 end
@@ -164,6 +178,7 @@
             '';
             "<C-h>" = ''
               cmp.mapping(function()
+                local luasnip = require('luasnip')
                 if luasnip.locally_jumpable(-1) then
                   luasnip.jump(-1)
                 end

plugins/codecompanion.nix

@@ -1,7 +1,7 @@
-{ pkgs, ... }:
+{ config, pkgs, ... }:
 {
   programs.nixvim = {
-    keymaps = [
+    keymaps = if config.nixvim-config.enable-ai then [
       {
         mode = [ "n" ];
         key = "<c-c>";
@@ -12,10 +12,10 @@
         key = ",c";
         action = ":CodeCompanionChat Toggle<CR>";
       }
-    ];
+    ] else [];
 
     plugins.codecompanion = {
-      enable = true;
+      enable = config.nixvim-config.enable-ai;
 
       settings = {
         adapters = {

plugins/copilot.nix

@@ -1,8 +1,8 @@
-{ ... }:
+{ config, ... }:
 {
   programs.nixvim = {
     plugins.copilot-lua = {
-      enable = true;
+      enable = config.nixvim-config.enable-ai;
 
       settings = {
         suggestion.enabled = false;

plugins/default.nix

@@ -26,6 +26,8 @@
 
   programs.nixvim.plugins = {
     comment.enable = true;
+    ## needed by avante. already archived, so may need to migrate to snacks
+    dressing.enable = true;
     fugitive.enable = true;
     gitsigns.enable = true;
     lightline.enable = false;
@@ -40,6 +42,8 @@
         top_down = false;
       };
     };
+    ## needed by avante.
+    nui.enable = true;
     nvim-autopairs.enable = true;
     nvim-bqf.enable = true;
     nvim-lightbulb.enable = true;

plugins/luasnip.nix

@@ -1,14 +1,14 @@
 { ... }:
 {
   programs.nixvim = {
-    # keymaps = [
+    keymaps = [
-    #   {
+      {
-    #     mode = "i";
+        mode = "i";
-    #     key = "<c-c>";
+        key = "<c-b>";
-    #     action.__raw = ''function() require("luasnip.extras.select_choice")() end'';
+        action.__raw = ''function() require("luasnip.extras.select_choice")() end'';
-    #     options.desc = "Search";
+        options.desc = "Search";
-    #   }
+      }
-    # ];
+    ];
 
     plugins.luasnip = {
       enable = true;
@@ -25,16 +25,16 @@
         updateevents = ["TextChanged" "TextChangedI"];
         region_check_events = "CursorHold";
         delete_check_events = "InsertLeave";
-        # ext_opts.__raw = ''
+        ext_opts.__raw = ''
-        # {
+        {
-        #   [require('luasnip.util.types').choiceNode] = {
+          [require('luasnip.util.types').choiceNode] = {
-        #     active = {
+            active = {
-        #       virt_text = { { 'choice <c-c>', 'Comment' } },
+              virt_text = { { 'choice <c-b>', 'Comment' } },
-        #       hl_mode = 'combine',
+              hl_mode = 'combine',
-        #     },
+            },
-        #   },
+          },
-        # }
+        }
-        # '';
+        '';
       };
     };
   };