diff --git a/flake.lock b/flake.lock
--- a/flake.lock
+++ b/flake.lock
@@ -635,7 +635,7 @@ "nixpkgs": [
           "music-player",
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_8"
+        "rust-overlay": "rust-overlay_9"
       },
       "locked": {
         "lastModified": 1686621798,
@@ -1886,6 +1886,30 @@ "repo": "gomod2nix",
         "type": "github"
       }
     },
+    "goose": {
+      "inputs": {
+        "flake-utils": [
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay_4"
+      },
+      "locked": {
+        "lastModified": 1781788582,
+        "narHash": "sha256-/VRILP/nc40sfbOI5iLy03sgGVf+prkMJY9WqFpyoAM=",
+        "ref": "refs/heads/main",
+        "rev": "ff09b0a4b7c4f315965c73ed1c56a34f8d3727b7",
+        "revCount": 1,
+        "type": "git",
+        "url": "ssh://gitea@git.darksailor.dev/servius/goose.git"
+      },
+      "original": {
+        "type": "git",
+        "url": "ssh://gitea@git.darksailor.dev/servius/goose.git"
+      }
+    },
     "handoff": {
       "inputs": {
         "flake-utils": "flake-utils_5",
@@ -1929,7 +1953,7 @@ "flake-utils": "flake-utils_6",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_4"
+        "rust-overlay": "rust-overlay_5"
       },
       "locked": {
         "lastModified": 1779574850,
@@ -2208,7 +2232,7 @@ "flake-utils": "flake-utils_8",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_5"
+        "rust-overlay": "rust-overlay_6"
       },
       "locked": {
         "lastModified": 1779833838,
@@ -2361,7 +2385,7 @@ "flake-utils": "flake-utils_9",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_6"
+        "rust-overlay": "rust-overlay_7"
       },
       "locked": {
         "lastModified": 1724218012,
@@ -2450,7 +2474,7 @@ "nixpkgs": [
           "nixpkgs"
         ],
         "pre-commit": "pre-commit",
-        "rust-overlay": "rust-overlay_7"
+        "rust-overlay": "rust-overlay_8"
       },
       "locked": {
         "lastModified": 1780574905,
@@ -2850,7 +2874,7 @@ "nix-github-actions": "nix-github-actions_3",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_9"
+        "rust-overlay": "rust-overlay_10"
       },
       "locked": {
         "lastModified": 1772623144,
@@ -3487,6 +3511,7 @@ "deploy-rs": "deploy-rs",
         "disko": "disko",
         "eilmeldung": "eilmeldung",
         "flake-utils": "flake-utils_4",
+        "goose": "goose",
         "handoff": "handoff",
         "hdbctrl": "hdbctrl",
         "headplane": "headplane",
@@ -3578,6 +3603,27 @@ },
     "rust-overlay_10": {
       "inputs": {
         "nixpkgs": [
+          "nixify",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768186348,
+        "narHash": "sha256-nkpIe3zkpeoFuOl8xBpexulECsHLQ9Ljg1gW3bPCjSI=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "af69e497567a5945a64057717bc9b17c8478097e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_11": {
+      "inputs": {
+        "nixpkgs": [
           "servius-website",
           "nixpkgs"
         ]
@@ -3596,7 +3642,7 @@ "repo": "rust-overlay",
         "type": "github"
       }
     },
-    "rust-overlay_11": {
+    "rust-overlay_12": {
       "inputs": {
         "nixpkgs": [
           "slo",
@@ -3617,7 +3663,7 @@ "repo": "rust-overlay",
         "type": "github"
       }
     },
-    "rust-overlay_12": {
+    "rust-overlay_13": {
       "inputs": {
         "nixpkgs": [
           "tmux-float",
@@ -3638,7 +3684,7 @@ "repo": "rust-overlay",
         "type": "github"
       }
     },
-    "rust-overlay_13": {
+    "rust-overlay_14": {
       "inputs": {
         "nixpkgs": [
           "zjstatus",
@@ -3704,6 +3750,27 @@ },
     "rust-overlay_4": {
       "inputs": {
         "nixpkgs": [
+          "goose",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1768445213,
+        "narHash": "sha256-y0BglISgDr61vvdb35m0O4npuqh1pojlBNDILo9j8AI=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "1cd63408e71cc0e6a89ff2cb7c4107214e2523cc",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
+    "rust-overlay_5": {
+      "inputs": {
+        "nixpkgs": [
           "hdbctrl",
           "nixpkgs"
         ]
@@ -3722,7 +3789,7 @@ "repo": "rust-overlay",
         "type": "github"
       }
     },
-    "rust-overlay_5": {
+    "rust-overlay_6": {
       "inputs": {
         "nixpkgs": "nixpkgs"
       },
@@ -3740,7 +3807,7 @@ "repo": "rust-overlay",
         "type": "github"
       }
     },
-    "rust-overlay_6": {
+    "rust-overlay_7": {
       "inputs": {
         "flake-utils": "flake-utils_10",
         "nixpkgs": "nixpkgs_2"
@@ -3759,7 +3826,7 @@ "repo": "rust-overlay",
         "type": "github"
       }
     },
-    "rust-overlay_7": {
+    "rust-overlay_8": {
       "inputs": {
         "nixpkgs": [
           "lanzaboote",
@@ -3780,7 +3847,7 @@ "repo": "rust-overlay",
         "type": "github"
       }
     },
-    "rust-overlay_8": {
+    "rust-overlay_9": {
       "inputs": {
         "flake-utils": [
           "music-player",
@@ -3807,27 +3874,6 @@ "repo": "rust-overlay",
         "type": "github"
       }
     },
-    "rust-overlay_9": {
-      "inputs": {
-        "nixpkgs": [
-          "nixify",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1768186348,
-        "narHash": "sha256-nkpIe3zkpeoFuOl8xBpexulECsHLQ9Ljg1gW3bPCjSI=",
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "rev": "af69e497567a5945a64057717bc9b17c8478097e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "oxalica",
-        "repo": "rust-overlay",
-        "type": "github"
-      }
-    },
     "servius-website": {
       "inputs": {
         "advisory-db": "advisory-db_5",
@@ -3839,7 +3885,7 @@ "nix-github-actions": "nix-github-actions_4",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_10"
+        "rust-overlay": "rust-overlay_11"
       },
       "locked": {
         "lastModified": 1772396707,
@@ -3958,7 +4004,7 @@ "crane": "crane_8",
         "flake-utils": "flake-utils_20",
         "nix-github-actions": "nix-github-actions_5",
         "nixpkgs": "nixpkgs_10",
-        "rust-overlay": "rust-overlay_11"
+        "rust-overlay": "rust-overlay_12"
       },
       "locked": {
         "lastModified": 1780470530,
@@ -4631,7 +4677,7 @@ "nix-github-actions": "nix-github-actions_6",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_12"
+        "rust-overlay": "rust-overlay_13"
       },
       "locked": {
         "lastModified": 1762159782,
@@ -4900,7 +4946,7 @@ "flake-utils": "flake-utils_23",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "rust-overlay": "rust-overlay_13"
+        "rust-overlay": "rust-overlay_14"
       },
       "locked": {
         "lastModified": 1780512417,
diff --git a/flake.nix b/flake.nix
--- a/flake.nix
+++ b/flake.nix
@@ -130,6 +130,11 @@ # url = "path:/home/servius/Projects/hdb630";
       url = "git+https://git.darksailor.dev/servius/hdbctrl";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+    goose = {
+      url = "git+ssh://gitea@git.darksailor.dev/servius/goose.git";
+      inputs.nixpkgs.follows = "nixpkgs";
+      inputs.flake-utils.follows = "flake-utils";
+    };
     nix-minecraft.url = "github:Infinidoge/nix-minecraft";
     # alvr = {
     #   url = "path:/home/servius/Projects/ALVR";
diff --git a/home/programs/goose.nix b/home/programs/goose.nix
--- a/home/programs/goose.nix
+++ b/home/programs/goose.nix
@@ -1,4 +1,5 @@
 {
+  inputs,
   pkgs,
   lib,
   config,
@@ -36,6 +37,7 @@ "/bin"
     "/usr/sbin"
     "/sbin"
   ];
+  goosedPackage = inputs.goose.packages.${pkgs.stdenv.hostPlatform.system}.goosed;
   homeAssistantMcp = pkgs.writeShellScriptBin "goose-ha-mcp" ''
     set -euo pipefail
 
@@ -172,7 +174,7 @@ export GOOSE_TLS=false
     export SHELL=${lib.escapeShellArg gooseShell}
     export PATH=${lib.escapeShellArg goosePath}
 
-    exec /Applications/Goose.app/Contents/Resources/bin/goosed agent
+    exec ${lib.getExe goosedPackage} agent
   '';
 in
   lib.mkMerge [