foo

fmt

profiles/base/home-manager/neovim/autocmd.nix

@@ -11,6 +11,12 @@
         pattern = "*";
         command = "%s/\\s\\+$//e";
       }
+      {
+        event = "BufReadPost";
+        group = "Christoph";
+        pattern = "*";
+        command = "normal zR";
+      }
       {
         event = "LspAttach";
         group = "Christoph";

profiles/base/home-manager/neovim/default.nix

@@ -2,6 +2,7 @@
   imports = [
     ./options.nix
     ./autocmd.nix
+    ./mappings.nix
     ./plugins/conform.nix
     ./plugins/mini.nix
     ./plugins/oil.nix

profiles/base/home-manager/neovim/mappings.nix

@@ -0,0 +1,28 @@
+{
+  programs.nixvim.keymaps = [
+    {
+      mode = "n";
+      key = "<leader>lf";
+      action = ":lua require('conform').format({ lsp_fallback = true })<CR>";
+      options.desc = "Format";
+    }
+    {
+      mode = "n";
+      key = "<leader>ff";
+      action = ":Pick files<CR>";
+      options.desc = "Search files";
+    }
+    {
+      mode = "n";
+      key = "<leader>/";
+      action = ":Pick grep_live<CR>";
+      options.desc = "Grep";
+    }
+    {
+      mode = "n";
+      key = "<leader>e";
+      action = ":Oil<CR>";
+      options.desc = "File browser";
+    }
+  ];
+}

profiles/base/home-manager/neovim/options.nix

@@ -2,5 +2,7 @@
   programs.nixvim.globalOpts = {
     expandtab = true;
     shiftwidth = 2;
+    foldmethod = "expr";
+    foldexpr = "nvim_treesitter#foldexpr()";
   };
 }

profiles/base/home-manager/neovim/plugins/mini.nix

@@ -6,20 +6,15 @@
         options = {
           basic = true;
           extra_ui = true;
-          win_ui_borders = "dot";
         };
         mappings = {
-          basic = true;
-          windows = true;
-          move_with_alt = true;
+          basic = false;
         };
         autocommands = {
           basic = true;
         };
       };
       icons = {};
-      notify = {};
-      sessions = {};
       statusline = {};
       extra = {};
       ai = {
@@ -30,7 +25,6 @@
       };
       align = {};
       bracketed = {};
-      bufremove = {};
       comment = {};
       completion = {
         lsp_completion = {
@@ -44,21 +38,114 @@
       visits = {};
       pick = {};
       surround = {};
+      clue = {
+        clues.__raw = ''
+          {
+            { mode = 'n', keys = '<Leader>b', desc = '+Buffer' },
+            { mode = 'n', keys = '<Leader>e', desc = '+Explore' },
+            { mode = 'n', keys = '<Leader>f', desc = '+Find' },
+            { mode = 'n', keys = '<Leader>g', desc = '+Git' },
+            { mode = 'n', keys = '<Leader>l', desc = '+LSP' },
+            { mode = 'n', keys = '<Leader>L', desc = '+Lua/Log' },
+            { mode = 'n', keys = '<Leader>o', desc = '+Other' },
+            { mode = 'n', keys = '<Leader>r', desc = '+R' },
+            { mode = 'n', keys = '<Leader>t', desc = '+Terminal/Minitest' },
+            { mode = 'n', keys = '<Leader>T', desc = '+Test' },
+            { mode = 'n', keys = '<Leader>v', desc = '+Visits' },
+            { mode = 'x', keys = '<Leader>l', desc = '+LSP' },
+            { mode = 'x', keys = '<Leader>r', desc = '+R' },
+            require("mini.clue").gen_clues.builtin_completion(),
+            require("mini.clue").gen_clues.g(),
+            require("mini.clue").gen_clues.marks(),
+            require("mini.clue").gen_clues.registers(),
+            require("mini.clue").gen_clues.windows({ submode_resize = true }),
+            require("mini.clue").gen_clues.z(),
+          }
+        '';
+        triggers = [
+          {
+            mode = "n";
+            keys = "<Leader>";
+          }
+          {
+            mode = "x";
+            keys = "<Leader>";
+          }
+          {
+            mode = "n";
+            keys = "[";
+          }
+          {
+            mode = "n";
+            keys = "]";
+          }
+          {
+            mode = "x";
+            keys = "[";
+          }
+          {
+            mode = "x";
+            keys = "]";
+          }
+          {
+            mode = "i";
+            keys = "<C-x>";
+          }
+          {
+            mode = "n";
+            keys = "g";
+          }
+          {
+            mode = "x";
+            keys = "g";
+          }
+
+          {
+            mode = "n";
+            keys = "\"";
+          }
+          {
+            mode = "x";
+            keys = "\"";
+          }
+          {
+            mode = "i";
+            keys = "<C-r>";
+          }
+          {
+            mode = "c";
+            keys = "<C-r>";
+          }
+          {
+            mode = "n";
+            keys = "<C-w>";
+          }
+          {
+            mode = "n";
+            keys = "z";
+          }
+          {
+            mode = "x";
+            keys = "z";
+          }
+          {
+            mode = "n";
+            keys = "'";
+          }
+          {
+            mode = "n";
+            keys = "`";
+          }
+          {
+            mode = "x";
+            keys = "'";
+          }
+          {
+            mode = "x";
+            keys = "`";
+          }
+        ];
+      };
     };
   };
-
-  programs.nixvim.keymaps = [
-    {
-      mode = "n";
-      key = "<leader>ff";
-      action = ":Pick files<CR>";
-      options.desc = "Search files";
-    }
-    {
-      mode = "n";
-      key = "<leader>/";
-      action = ":Pick grep_live<CR>";
-      options.desc = "Grep";
-    }
-  ];
 }

profiles/base/home-manager/neovim/plugins/oil.nix

@@ -27,13 +27,4 @@
       };
     };
   };
-
-  programs.nixvim.keymaps = [
-    {
-      mode = "n";
-      key = "<leader>e";
-      action = ":Oil<CR>";
-      options.desc = "File browser";
-    }
-  ];
 }

profiles/base/packages.nix

@@ -13,7 +13,6 @@ with pkgs; [
   killall
   libfido2
   nerd-fonts.iosevka
-  nixfmt
   nodejs_24
   nurl
   opencode