foo

fmt

flake.lock

@@ -197,22 +197,6 @@
         "type": "github"
       }
     },
-    "homebrew-bundle": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1745335228,
-        "narHash": "sha256-TIKR2UgtyUmHLNZp255/vLs+1I10hXe+sciMEbAGFwE=",
-        "owner": "homebrew",
-        "repo": "homebrew-bundle",
-        "rev": "a3265c84b232e13048ecbf6fc18a2eedfadbeb08",
-        "type": "github"
-      },
-      "original": {
-        "owner": "homebrew",
-        "repo": "homebrew-bundle",
-        "type": "github"
-      }
-    },
     "homebrew-cask": {
       "flake": false,
       "locked": {
@@ -421,7 +405,6 @@
         "disko": "disko",
         "flake-parts": "flake-parts",
         "home-manager": "home-manager_2",
-        "homebrew-bundle": "homebrew-bundle",
         "homebrew-cask": "homebrew-cask",
         "homebrew-core": "homebrew-core",
         "nix-homebrew": "nix-homebrew",

flake.nix

@@ -11,7 +11,6 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nix-homebrew.url = "github:zhaofengli-wip/nix-homebrew";
-    homebrew-bundle.url = "github:homebrew/homebrew-bundle";
     homebrew-core.url = "github:homebrew/homebrew-core";
     homebrew-cask.url = "github:homebrew/homebrew-cask";
     disko = {
@@ -26,17 +25,26 @@
   };
 
   outputs = inputs @ {flake-parts, ...}:
-    flake-parts.lib.mkFlake {inherit inputs;} (let
+    flake-parts.lib.mkFlake {inherit inputs;} (
+      let
         user = "cschmatzler";
         darwinHosts = builtins.attrNames (builtins.readDir ./hosts/darwin);
         nixosHosts = builtins.attrNames (builtins.readDir ./hosts/nixos);
       in {
-      systems = ["x86_64-linux" "aarch64-darwin"];
+        systems = [
+          "x86_64-linux"
+          "aarch64-darwin"
+        ];
 
-      flake.darwinConfigurations = inputs.nixpkgs.lib.genAttrs darwinHosts (hostname:
+        flake.darwinConfigurations = inputs.nixpkgs.lib.genAttrs darwinHosts (
+          hostname:
             inputs.darwin.lib.darwinSystem {
               system = "aarch64-darwin";
-          specialArgs = inputs // {inherit user hostname;};
+              specialArgs =
+                inputs
+                // {
+                  inherit user hostname;
+                };
               modules = [
                 inputs.home-manager.darwinModules.home-manager
                 inputs.nix-homebrew.darwinModules.nix-homebrew
@@ -48,7 +56,6 @@
                     taps = {
                       "homebrew/homebrew-core" = inputs.homebrew-core;
                       "homebrew/homebrew-cask" = inputs.homebrew-cask;
-                  "homebrew/homebrew-bundle" = inputs.homebrew-bundle;
                     };
                     mutableTaps = false;
                     autoMigrate = true;
@@ -56,18 +63,25 @@
                 }
                 ./hosts/darwin/${hostname}
               ];
-        });
+            }
+        );
 
-      flake.nixosConfigurations = inputs.nixpkgs.lib.genAttrs nixosHosts (hostname:
+        flake.nixosConfigurations = inputs.nixpkgs.lib.genAttrs nixosHosts (
+          hostname:
             inputs.nixpkgs.lib.nixosSystem {
               system = "x86_64-linux";
-          specialArgs = inputs // {inherit user hostname;};
+              specialArgs =
+                inputs
+                // {
+                  inherit user hostname;
+                };
               modules = [
                 inputs.disko.nixosModules.disko
                 inputs.home-manager.nixosModules.home-manager
                 ./hosts/nixos/${hostname}
               ];
-        });
+            }
+        );
 
         perSystem = {
           pkgs,
@@ -104,11 +118,14 @@
             shellHook = ''export EDITOR=nvim'';
           };
 
-        apps = builtins.listToAttrs (map (n: {
+          apps = builtins.listToAttrs (
+            map (n: {
               name = n;
               value = mkApp n;
             })
-          appNames);
+            appNames
+          );
         };
-    });
+      }
+    );
 }

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;
+          basic = false;
-          windows = true;
-          move_with_alt = true;
         };
         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 = ''
-
+          {
-  programs.nixvim.keymaps = [
+            { 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";
-      key = "<leader>ff";
+            keys = "<Leader>";
-      action = ":Pick files<CR>";
+          }
-      options.desc = "Search files";
+          {
+            mode = "x";
+            keys = "<Leader>";
           }
           {
             mode = "n";
-      key = "<leader>/";
+            keys = "[";
-      action = ":Pick grep_live<CR>";
+          }
-      options.desc = "Grep";
+          {
+            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 = "`";
           }
         ];
+      };
+    };
+  };
 }

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