diff --git a/.gitignore b/.gitignore
index e4eaa201..ab02b585 100644
--- a/.gitignore
+++ b/.gitignore
@@ -7,3 +7,5 @@ BrewFile.lock.json
 /nix-shells/macos-vm/
 
 logs/
+
+openclaw/.npm-global/
\ No newline at end of file
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index af2b4a9b..47a81e3a 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -98,7 +98,6 @@
 
   # Packages
   nixpkgs.config.allowUnfree = true;
-  nixpkgs.overlays = [ inputs.nix-openclaw.overlays.default ];
   environment.systemPackages = with pkgs; [
     git
   ];
diff --git a/nixos/flake.lock b/nixos/flake.lock
index 63df6f3c..d7c07f32 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -1,23 +1,5 @@
 {
   "nodes": {
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems"
-      },
-      "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": [
@@ -38,85 +20,7 @@
         "type": "github"
       }
     },
-    "home-manager_2": {
-      "inputs": {
-        "nixpkgs": [
-          "nix-openclaw",
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1767909183,
-        "narHash": "sha256-u/bcU0xePi5bgNoRsiqSIwaGBwDilKKFTz3g0hqOBAo=",
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "rev": "cd6e96d56ed4b2a779ac73a1227e0bb1519b3509",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "home-manager",
-        "type": "github"
-      }
-    },
-    "nix-openclaw": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "home-manager": "home-manager_2",
-        "nix-steipete-tools": "nix-steipete-tools",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1770414328,
-        "narHash": "sha256-qjZ+5Kx/EKCaEWeOlxyMzmZRUZCUAa74PiCbNrok4Qc=",
-        "owner": "openclaw",
-        "repo": "nix-openclaw",
-        "rev": "287c9a34c6a5d9928c986556064ec1e4d189e11c",
-        "type": "github"
-      },
-      "original": {
-        "owner": "openclaw",
-        "repo": "nix-openclaw",
-        "type": "github"
-      }
-    },
-    "nix-steipete-tools": {
-      "inputs": {
-        "nixpkgs": "nixpkgs"
-      },
-      "locked": {
-        "lastModified": 1770240566,
-        "narHash": "sha256-fY8t41kMSHu2ovf89mIdvC7vkceroCwKxw/MKVn4rsE=",
-        "owner": "openclaw",
-        "repo": "nix-steipete-tools",
-        "rev": "983210e3b6e9285780e87f48ce9354b51a270e95",
-        "type": "github"
-      },
-      "original": {
-        "owner": "openclaw",
-        "repo": "nix-steipete-tools",
-        "type": "github"
-      }
-    },
     "nixpkgs": {
-      "locked": {
-        "lastModified": 1767364772,
-        "narHash": "sha256-fFUnEYMla8b7UKjijLnMe+oVFOz6HjijGGNS1l7dYaQ=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "16c7794d0a28b5a37904d55bcca36003b9109aaa",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
-    "nixpkgs_2": {
       "locked": {
         "lastModified": 1769461804,
         "narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
@@ -135,23 +39,7 @@
     "root": {
       "inputs": {
         "home-manager": "home-manager",
-        "nix-openclaw": "nix-openclaw",
-        "nixpkgs": "nixpkgs_2"
-      }
-    },
-    "systems": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
+        "nixpkgs": "nixpkgs"
       }
     }
   },
diff --git a/nixos/flake.nix b/nixos/flake.nix
index d0b7fd3d..0188a5a0 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -8,11 +8,6 @@
       url = "github:nix-community/home-manager";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-
-    nix-openclaw = {
-      url = "github:openclaw/nix-openclaw";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
   };
 
   outputs =
diff --git a/nixos/home.nix b/nixos/home.nix
index 300f3a2d..2ddd28fc 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -22,6 +22,7 @@
     google-chrome
     localsend
     #stremio
+    element-desktop
 
     # VR / Games
     bs-manager
@@ -56,8 +57,6 @@
 
     # AI
     lmstudio
-    openclaw-gateway
-    openclaw-tools
 
     # Scripts
     (pkgs.writeShellScriptBin "colors" ''
diff --git a/openclaw/.envrc b/openclaw/.envrc
new file mode 100644
index 00000000..3550a30f
--- /dev/null
+++ b/openclaw/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/openclaw/flake.lock b/openclaw/flake.lock
new file mode 100644
index 00000000..60da8a8a
--- /dev/null
+++ b/openclaw/flake.lock
@@ -0,0 +1,61 @@
+{
+  "nodes": {
+    "flake-utils": {
+      "inputs": {
+        "systems": "systems"
+      },
+      "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"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1770197578,
+        "narHash": "sha256-AYqlWrX09+HvGs8zM6ebZ1pwUqjkfpnv8mewYwAo+iM=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "00c21e4c93d963c50d4c0c89bfa84ed6e0694df2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      }
+    },
+    "systems": {
+      "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",
+  "version": 7
+}
diff --git a/openclaw/flake.nix b/openclaw/flake.nix
new file mode 100644
index 00000000..9817351a
--- /dev/null
+++ b/openclaw/flake.nix
@@ -0,0 +1,56 @@
+# nix develop
+{
+  description = "OpenClaw dev shell";
+
+  inputs = {
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
+    flake-utils.url = "github:numtide/flake-utils";
+  };
+
+  outputs =
+    {
+      self,
+      nixpkgs,
+      flake-utils,
+    }:
+    flake-utils.lib.eachDefaultSystem (
+      system:
+      let
+        pkgs = nixpkgs.legacyPackages.${system};
+      in
+      {
+        devShells.default = pkgs.mkShell {
+          name = "openclaw-shell";
+
+          buildInputs = with pkgs; [
+            nodejs_22
+            git
+            curl
+            cmake
+          ];
+
+          shellHook = ''
+            echo "🦞 OpenClaw"
+            echo ""
+
+            # Set up local npm prefix to avoid permission issues
+            export NPM_CONFIG_PREFIX="$PWD/.npm-global"
+            export PATH="$NPM_CONFIG_PREFIX/bin:$PATH"
+
+            # Ensure the prefix directory exists
+            mkdir -p "$NPM_CONFIG_PREFIX/bin"
+
+            # Install openclaw if not already installed
+            if ! command -v openclaw &> /dev/null; then
+              echo "📦 Installing OpenClaw..."
+              npm install -g openclaw
+            fi
+
+            echo ""
+            echo "Run 'openclaw gateway' to start the gateway"
+            echo ""
+          '';
+        };
+      }
+    );
+}