[macbook] Add herdr.

flake.lock

@@ -193,6 +193,25 @@
         "type": "github"
       }
     },
+    "herdr": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_3",
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1784213830,
+        "narHash": "sha256-51752gcxLf+W1cFw9u8aCJ+78h8/wQYhsnMX4NkNnYU=",
+        "owner": "ogulcancelik",
+        "repo": "herdr",
+        "rev": "6e4768a7ccb172b96c30eabe745747fbde31f777",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ogulcancelik",
+        "repo": "herdr",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -371,6 +390,22 @@
       }
     },
     "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1779357205,
+        "narHash": "sha256-cCO8aTqss5x9Ky8GWkpY0Hy5fyTZEbtifSUV8QjSzic=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "f83fc3c307e74bc5fd5adb7eb6b8b13ffd2a36e1",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
       "locked": {
         "lastModified": 1768323494,
         "narHash": "sha256-yBXJLE6WCtrGo7LKiB6NOt6nisBEEkguC/lq/rP3zRQ=",
@@ -386,7 +421,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_4": {
+    "nixpkgs_5": {
       "locked": {
         "lastModified": 1749086602,
         "narHash": "sha256-DJcgJMekoxVesl9kKjfLPix2Nbr42i7cpEHJiTnBUwU=",
@@ -402,7 +437,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_5": {
+    "nixpkgs_6": {
       "locked": {
         "lastModified": 1747542820,
         "narHash": "sha256-GaOZntlJ6gPPbbkTLjbd8BMWaDYafhuuYRNrxCGnPJw=",
@@ -445,11 +480,12 @@
         "apple-silicon": "apple-silicon",
         "ghostty": "ghostty",
         "godig": "godig",
+        "herdr": "herdr",
         "home-manager": "home-manager_2",
         "nix-darwin": "nix-darwin",
         "nixgl": "nixgl",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_3",
+        "nixpkgs": "nixpkgs_4",
         "nixpkgs-darwin": "nixpkgs-darwin",
         "nixpkgs-electron-32": "nixpkgs-electron-32",
         "nixpkgs-unstable": "nixpkgs-unstable",
@@ -460,6 +496,27 @@
         "zen-browser": "zen-browser"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "nixpkgs": [
+          "herdr",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1783577481,
+        "narHash": "sha256-EWMxOWrJ031f8f/lrcEmhTRs4npw1/5N3Hcjin846c8=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "4cdea398dc491b082dccdce0fad1ed0b75fa3394",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "sops-nix": {
       "inputs": {
         "nixpkgs": [
@@ -483,7 +540,7 @@
     "ssh-agent-switcher": {
       "inputs": {
         "flake-utils": "flake-utils_5",
-        "nixpkgs": "nixpkgs_4"
+        "nixpkgs": "nixpkgs_5"
       },
       "locked": {
         "lastModified": 1749108251,
@@ -592,7 +649,7 @@
     },
     "walker": {
       "inputs": {
-        "nixpkgs": "nixpkgs_5",
+        "nixpkgs": "nixpkgs_6",
         "systems": "systems_6"
       },
       "locked": {

flake.nix

@@ -51,6 +51,11 @@
       inputs.nixpkgs.follows = "nixpkgs-unstable";  # Use same nixpkgs
     };
 
+    # Terminal workspace manager for AI coding agents.
+    herdr = {
+      url = "github:ogulcancelik/herdr";
+    };
+
     # Zen browser.
     zen-browser = {
       url = "github:0xc000022070/zen-browser-flake";
@@ -195,6 +200,7 @@
               inherit (config) user;
               inherit opencode-tunneler;
               inherit godig;
+              inherit (inputs) herdr;
             };
             home-manager.useGlobalPkgs = true;
             home-manager.useUserPackages = true;

home-modules/herdr.nix

@@ -1,41 +0,0 @@
-{ ... }: {
-
-  home.file.".config/herdr/config.toml" = {
-    text = ''
-      [keys]
-      prefix = "ctrl+a"
-
-      # Use tmux-style session selection for workspace navigation.
-      workspace_picker = "prefix+s"
-      settings = "prefix+shift+s"
-
-      # Side-by-side panes (tmux's "|" / "\" split -h).
-      # NOTE: "backslash" as a key name is inferred, not confirmed in the docs.
-      # Verify against `herdr --default-config` and adjust if it doesn't bind.
-      split_vertical = "prefix+backslash"
-
-      # Stacked panes (tmux's "-" / "_" split -v).
-      split_horizontal = "prefix+minus"
-
-      detach = "prefix+d"
-
-      # Kept "f" for next-tab like the old tmux config; herdr's
-      # previous_tab default (prefix+p) already matched.
-      next_tab = "prefix+f"
-
-      close_pane = "prefix+w"
-      close_tab = "prefix+shift+w"
-
-      # Kept "," for rename-tab like the old tmux default.
-      rename_tab = "prefix+,"
-
-      [ui]
-      mouse_capture = true
-
-      [session]
-      # Replaces tmux-resurrect/continuum: agents and panes come back on reattach.
-      resume_agents_on_restore = true
-    '';
-  };
-
-}

hosts/macbook/configuration.nix

@@ -39,9 +39,9 @@
     };
 
     taps = [
+      # "agavra/tap"
     ];
     brews = [
-      "gh"
       "watchman"
       "vite"
       "pipx"
@@ -49,6 +49,7 @@
       "glow"
       "chromaprint"
       "libiconv"
+      # "agavra/tap/tuicr"
       "automake"
       "autoconf"
       "pkg-config"

hosts/macbook/home.nix

@@ -4,6 +4,7 @@
   pkgs-unstable,
   opencode-tunneler,
   godig,
+  herdr,
   user,
   ...
 } :
@@ -24,7 +25,6 @@ in {
     ../../home-modules/secretive.nix
     ../../home-modules/starship.nix
     ../../home-modules/tmux.nix
-    ../../home-modules/herdr.nix
     ../../home-modules/opencode-config.nix
     ../../home-modules/zsh.nix
   ];
@@ -83,6 +83,7 @@ in {
 
       opencode-tunneler.packages.aarch64-darwin.default
       godig.packages.aarch64-darwin.service
+      herdr.packages.aarch64-darwin.default
     ];
 
     stateVersion = "24.11";
@@ -117,10 +118,9 @@ in {
         hostname = "82.180.160.149";
         forwardAgent = true;
       };
-      handmade-gitea = {
+      handmaderunner = {
         user = "jmug";
-        hostname = "40.160.241.66";
+        hostname = "2.25.209.218";
-        forwardAgent = true;
       };
       racknerd = {
         user = "jmug";