foo

flake.lock

@@ -101,6 +101,45 @@
         "type": "github"
       }
     },
+    "flake-parts": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1754091436,
+        "narHash": "sha256-XKqDMN1/Qj1DKivQvscI4vmHfDfvYR2pfuFOJiCeewM=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "67df8c627c2c39c41dbec76a1f201929929ab0bd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -188,6 +227,34 @@
         "type": "github"
       }
     },
+    "ixx": {
+      "inputs": {
+        "flake-utils": [
+          "nixvim",
+          "nuschtosSearch",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixvim",
+          "nuschtosSearch",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1748294338,
+        "narHash": "sha256-FVO01jdmUNArzBS7NmaktLdGA5qA3lUMJ4B7a05Iynw=",
+        "owner": "NuschtOS",
+        "repo": "ixx",
+        "rev": "cc5f390f7caf265461d4aab37e98d2292ebbdb85",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "ref": "v0.0.8",
+        "repo": "ixx",
+        "type": "github"
+      }
+    },
     "nix-homebrew": {
       "inputs": {
         "brew-src": "brew-src"
@@ -254,6 +321,52 @@
         "type": "github"
       }
     },
+    "nixvim": {
+      "inputs": {
+        "flake-parts": "flake-parts",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "nuschtosSearch": "nuschtosSearch",
+        "systems": "systems_3"
+      },
+      "locked": {
+        "lastModified": 1754379602,
+        "narHash": "sha256-Fvc2xy326XkjDCY/uuj05z8DJs+AKmugEITTCNAp2rs=",
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "rev": "cd4fac45a450706c466af3bd5715b617b9efa1c6",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nixvim",
+        "type": "github"
+      }
+    },
+    "nuschtosSearch": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "ixx": "ixx",
+        "nixpkgs": [
+          "nixvim",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1753771532,
+        "narHash": "sha256-Pmpke0JtLRzgdlwDC5a+aiLVZ11JPUO5Bcqkj0nHE/k=",
+        "owner": "NuschtOS",
+        "repo": "search",
+        "rev": "2a65adaf2c0c428efb0f4a2bc406aab466e96a06",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NuschtOS",
+        "repo": "search",
+        "type": "github"
+      }
+    },
     "root": {
       "inputs": {
         "agenix": "agenix",
@@ -265,6 +378,7 @@
         "homebrew-core": "homebrew-core",
         "nix-homebrew": "nix-homebrew",
         "nixpkgs": "nixpkgs_3",
+        "nixvim": "nixvim",
         "secrets": "secrets"
       }
     },
@@ -298,6 +412,36 @@
         "repo": "default",
         "type": "github"
       }
+    },
+    "systems_2": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
+    "systems_3": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
     }
   },
   "root": "root",

flake.nix

@@ -27,14 +27,14 @@
       url = "github:nix-community/disko";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    secrets = {
-      url = "git+ssh://git@github.com/cschmatzler/nixos-config-secrets.git";
-      flake = false;
-    };
     nixvim = {
       url = "github:nix-community/nixvim";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    secrets = {
+      url = "git+ssh://git@github.com/cschmatzler/nixos-config-secrets.git";
+      flake = false;
+    };
   };
   outputs =
     {
@@ -48,6 +48,7 @@
       nixpkgs,
       disko,
       agenix,
+      nixvim,
       secrets,
     }@inputs:
     let

profiles/base/home-manager/default.nix

@@ -0,0 +1,16 @@
+{
+  imports = [
+    ./home-manager/atuin.nix
+    ./home-manager/bat.nix
+    ./home-manager/eza.nix
+    ./home-manager/fish.nix
+    ./home-manager/git.nix
+    ./home-manager/jujutsu.nix
+    ./home-manager/neovim
+    ./home-manager/ssh.nix
+    ./home-manager/starship.nix
+    ./home-manager/zellij.nix
+    ./home-manager/zoxide.nix
+    ./home-manager/zsh.nix
+  ];
+}

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

@@ -1,7 +1,8 @@
-{ inputs, ... }:
+{ nixvim, ... }:
+
 {
   imports = [
-    inputs.nixvim.homeManagerModules.nixvim
+    nixvim.homeManagerModules.nixvim
     ./options.nix
     ./plugins
   ];

profiles/darwin/default.nix

@@ -3,6 +3,7 @@
   pkgs,
   lib,
   home-manager,
+  nixvim,
   user,
   ...
 }:
@@ -32,19 +33,9 @@
         ...
       }:
       {
-        _module.args = { inherit user; };
+        _module.args = { inherit user nixvim; };
         imports = [
-          ../base/home-manager/atuin.nix
+          ../base/home-manager
-          ../base/home-manager/bat.nix
-          ../base/home-manager/eza.nix
-          ../base/home-manager/fish.nix
-          ../base/home-manager/git.nix
-          ../base/home-manager/jujutsu.nix
-          ../base/home-manager/ssh.nix
-          ../base/home-manager/starship.nix
-          ../base/home-manager/zellij.nix
-          ../base/home-manager/zoxide.nix
-          ../base/home-manager/zsh.nix
           ./home-manager/ghostty.nix
         ];
         fonts.fontconfig.enable = true;

profiles/darwin/home-manager/ghostty.nix

@@ -24,34 +24,6 @@
       mouse-scroll-multiplier = 1.25;
       shell-integration = "detect";
       shell-integration-features = "no-cursor";
-
-      keybind = [
-        "global:ctrl+shift+space=toggle_quick_terminal"
-        "shift+enter=text:\\n"
-        "ctrl+one=goto_tab:1"
-        "ctrl+two=goto_tab:2"
-        "ctrl+three=goto_tab:3"
-        "ctrl+four=goto_tab:4"
-        "ctrl+five=goto_tab:5"
-        "ctrl+six=goto_tab:6"
-        "ctrl+seven=goto_tab:7"
-        "ctrl+eight=goto_tab:8"
-        "ctrl+nine=goto_tab:9"
-        "ctrl+left=previous_tab"
-        "ctrl+right=next_tab"
-        "ctrl+h=previous_tab"
-        "ctrl+l=next_tab"
-        "ctrl+shift+left=goto_split:left"
-        "ctrl+shift+right=goto_split:right"
-        "ctrl+shift+h=goto_split:left"
-        "ctrl+shift+j=goto_split:down"
-        "ctrl+shift+k=goto_split:up"
-        "ctrl+shift+l=goto_split:right"
-        "ctrl+shift+enter=new_split:right"
-        "ctrl+t=new_tab"
-        "ctrl+w=close_tab"
-        "ctrl+shift+w=close_surface"
-      ];
     };
   };
 }