diff --git a/.envrc b/.envrc
new file mode 100644
index 0000000..3550a30
--- /dev/null
+++ b/.envrc
@@ -0,0 +1 @@
+use flake
diff --git a/flake.nix b/flake.nix
index 9da10f5..2d863e5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,5 +64,19 @@
         ];
       };
     };
+
+    devShells.x86_64-linux.default =
+      let
+        pkgs = nixpkgs.legacyPackages.x86_64-linux;
+        nhs = pkgs.writeShellScriptBin "nhs" ''
+          nh os switch --hostname framework --impure path:. "$@"
+        '';
+      in
+      pkgs.mkShell {
+        packages = [
+          pkgs.nh
+          nhs
+        ];
+      };
   };
 }
diff --git a/home.nix b/home.nix
index 24131b0..9a68ede 100644
--- a/home.nix
+++ b/home.nix
@@ -119,8 +119,6 @@
     OCL_ICD_VENDORS = "/etc/OpenCL/vendors";
     POCL_DEVICES = "cpu";
     BROWSER = "zen";
-    # Set FLAKE for nh
-    NH_FLAKE = "${config.home.homeDirectory}/Documents/nix-config";
   };
 
   programs.helix = {
@@ -219,7 +217,6 @@
       jn = "jj new";
       jdiff = "jj diff";
       jsq = "jj squash";
-      nhs = "nh os switch";
       h = "hx";
       vanity = "mkp224o-amd64-64-24k -d noisebridgevanitytor noisebridge{2..7}";
     };