diff --git a/flake.lock b/flake.lock
index 5c49ebf..f588073 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,25 @@
 {
   "nodes": {
+    "basecamp": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1774509076,
+        "narHash": "sha256-3Z/1xfP4jJsSONprD5rMLpag+YFVDCkfGg1rY5+w20s=",
+        "owner": "basecamp",
+        "repo": "basecamp-cli",
+        "rev": "3d601714b184004af17e169d227f15afd14bc5f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "basecamp",
+        "repo": "basecamp-cli",
+        "type": "github"
+      }
+    },
     "nixpkgs": {
       "locked": {
         "lastModified": 1774386573,
@@ -75,6 +95,7 @@
     },
     "root": {
       "inputs": {
+        "basecamp": "basecamp",
         "nixpkgs": "nixpkgs",
         "nixpkgs-master": "nixpkgs-master",
         "opencode": "opencode",
diff --git a/flake.nix b/flake.nix
index 3448e8d..b70863e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -5,6 +5,11 @@
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     nixpkgs-master.url = "github:NixOS/nixpkgs/master";
 
+    basecamp = {
+      url = "github:basecamp/basecamp-cli";
+      inputs.nixpkgs.follows = "nixpkgs";
+    };
+
     # opencode needs newer bun from master
     opencode = {
       url = "github:anomalyco/opencode/v1.3.2";
diff --git a/pkgs/default.nix b/pkgs/default.nix
index 1b3357c..e1ed522 100644
--- a/pkgs/default.nix
+++ b/pkgs/default.nix
@@ -2,7 +2,9 @@
   pkgs,
   inputs,
   ...
-}: {
+}: let
+  system = pkgs.stdenv.hostPlatform.system;
+in {
   # Custom packages registry
   # Each package is defined in its own directory under pkgs/
   sidecar = pkgs.callPackage ./sidecar {};
@@ -21,6 +23,10 @@
   openshell = pkgs.callPackage ./openshell {};
   zellij-ps = pkgs.callPackage ./zellij-ps {};
 
-  # Imported from flake inputs
+  # Imported from flake inputs (pass-through, no modifications)
+  basecamp = inputs.basecamp.packages.${system}.default;
+  openspec = inputs.openspec.packages.${system}.default;
+
+  # Imported from flake inputs (with local modifications)
   opencode-desktop = pkgs.callPackage ./opencode-desktop {inherit inputs;};
 }