nixvim: move trouble to non-dev, better mapping config

2 files changed, 58 insertions, 45 deletions

diff --git a/common/nixvim.nix b/common/nixvim.nix
index d566813..69561ea 100644
--- a/common/nixvim.nix
+++ b/common/nixvim.nix
@@ -95,6 +95,8 @@ inputs:
           options.desc = "Open Diffview";
         }
 
+        # GitSigns
+
         # TODO: noremap? buffer local? silent?
         {
           key = "<leader>gs";
@@ -258,6 +260,50 @@ inputs:
           '';
           options.desc = "Toggle diff";
         }
+
+        # Trouble
+
+        {
+          key = "<leader>xx";
+          mode = "n";
+          action = "<cmd>Trouble diagnostics toggle<cr>";
+          options.desc = "Diagnostics (Trouble)";
+        }
+
+        {
+          key = "<leader>xX";
+          mode = "n";
+          action = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
+          options.desc = "Buffer Diagnostics (Trouble)";
+        }
+
+        {
+          key = "<leader>cs";
+          mode = "n";
+          action = "<cmd>Trouble symbols toggle focus=false<cr>";
+          options.desc = "Symbols (Trouble)";
+        }
+
+        {
+          key = "<leader>cl";
+          mode = "n";
+          action = "<cmd>Trouble lsp toggle focus=false win.position=right<cr>";
+          options.desc = "LSP Definitions / references / ... (Trouble)";
+        }
+
+        {
+          key = "<leader>xL";
+          mode = "n";
+          action = "<cmd>Trouble loclist toggle<cr>";
+          options.desc = "Location List (Trouble)";
+        }
+
+        {
+          key = "<leader>xQ";
+          mode = "n";
+          action = "<cmd>Trouble qflist toggle<cr>";
+          options.desc = "Quickfix List (Trouble)";
+        }
       ];
 
     # TODO:
@@ -568,7 +614,16 @@ inputs:
 
       telescope = {
         enable = true;
-        settings = { };
+        settings.defaults.mappings = {
+          i = {
+            "<C-q>".__raw = "require('trouble.sources.telescope').open";
+            "<M-q>".__raw = "require('trouble.sources.telescope').add";
+          };
+          n = {
+            "<C-q>".__raw = "require('trouble.sources.telescope').open";
+            "<M-q>".__raw = "require('trouble.sources.telescope').add";
+          };
+        };
 
         enabledExtensions = [ "noice" ];
         extensions.undo.enable = true;
@@ -656,6 +711,8 @@ inputs:
         };
       };
 
+      trouble.enable = true;
+
       vim-matchup = {
         enable = true;
         treesitter.enable = true;
diff --git a/usecases/desktop/development/nixvim-dev.nix b/usecases/desktop/development/nixvim-dev.nix
index bb6f91d..672ab81 100644
--- a/usecases/desktop/development/nixvim-dev.nix
+++ b/usecases/desktop/development/nixvim-dev.nix
@@ -246,50 +246,6 @@ _inputs:
       };
 
       todo-comments.enable = true;
-
-      trouble = {
-        enable = true;
-        lazyLoad.settings = {
-          cmd = "Trouble";
-          keys = [
-            {
-              __unkeyed-1 = "<leader>xx";
-              __unkeyed-2 = "<cmd>Trouble diagnostics toggle<cr>";
-              desc = "Diagnostics (Trouble)";
-            }
-
-            {
-              __unkeyed-1 = "<leader>xX";
-              __unkeyed-2 = "<cmd>Trouble diagnostics toggle filter.buf=0<cr>";
-              desc = "Buffer Diagnostics (Trouble)";
-            }
-
-            {
-              __unkeyed-1 = "<leader>cs";
-              __unkeyed-2 = "<cmd>Trouble symbols toggle focus=false<cr>";
-              desc = "Symbols (Trouble)";
-            }
-
-            {
-              __unkeyed-1 = "<leader>cl";
-              __unkeyed-2 = "<cmd>Trouble lsp toggle focus=false win.position=right<cr>";
-              desc = "LSP Definitions / references / ... (Trouble)";
-            }
-
-            {
-              __unkeyed-1 = "<leader>xL";
-              __unkeyed-2 = "<cmd>Trouble loclist toggle<cr>";
-              desc = "Location List (Trouble)";
-            }
-
-            {
-              __unkeyed-1 = "<leader>xQ";
-              __unkeyed-2 = "<cmd>Trouble qflist toggle<cr>";
-              desc = "Quickfix List (Trouble)";
-            }
-          ];
-        };
-      };
     };
   };
 }