diff --git a/config/zed/settings.json b/config/zed/settings.json
index e2e6220..b9f5595 100644
--- a/config/zed/settings.json
+++ b/config/zed/settings.json
@@ -102,11 +102,6 @@
   "terminal": {
     "font_family": "MonaspiceNe Nerd Font Mono",
     "dock": "bottom",
-    "env": {
-      "EDITOR": "zed --wait",
-      "VISUAL": "zed --wait",
-      "MANPAGER": "zed --wait +Man!"
-    },
     "working_directory": "current_project_directory"
   },
   "languages": {
diff --git a/flake.nix b/flake.nix
index 18804b1..a75377f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -10,7 +10,7 @@
     home-manager.inputs.nixpkgs.follows = "nixpkgs";
   };
 
-  outputs = inputs@{ self, nixpkgs, nixpkgs-unstable, nix-darwin, home-manager, ... }: {
+  outputs = { self, nixpkgs, nixpkgs-unstable, nix-darwin, home-manager, ... }: {
     # Build darwin flake using:
     # $ darwin-rebuild build --flake .#mbp
     darwinConfigurations.mbp = nix-darwin.lib.darwinSystem {
@@ -27,5 +27,35 @@
         ./modules/hosts/pi.nix
       ];
     };
+    devShells.aarch64-darwin = let pkgs = nixpkgs.legacyPackages.aarch64-darwin; in {
+      rust = pkgs.mkShellNoCC {
+        name = "rust";
+        packages = with pkgs; [
+          cargo
+          rustc
+          rustfmt
+          clippy
+          rust-analyzer
+        ];
+      };
+
+      js = pkgs.mkShellNoCC {
+        name = "js";
+        packages = with pkgs; [
+          bun
+          nodejs_26
+          pnpm
+          typescript
+        ];
+      };
+
+      nix = pkgs.mkShellNoCC {
+        name = "nix";
+        packages = with pkgs; [
+          nil
+          nixd
+        ];
+      };
+    };
   };
 }
diff --git a/modules/home/fish.nix b/modules/home/fish.nix
index 67e41bd..441457a 100644
--- a/modules/home/fish.nix
+++ b/modules/home/fish.nix
@@ -48,6 +48,10 @@ in
   };
 
   programs.bottom.enable = true;
+  programs.direnv = {
+    enable = true;
+    enableFishIntegration = true;
+  };
   programs.fd.enable = true;
   programs.git.enable = true;
   programs.gh = {
diff --git a/modules/home/packages.nix b/modules/home/packages.nix
index 7f83a9f..ab9f053 100644
--- a/modules/home/packages.nix
+++ b/modules/home/packages.nix
@@ -27,9 +27,6 @@ in {
     pnpm
     bun
 
-    # Nix
-    nil
-    nixd
     # TailwindCSS
     tailwindcss-language-server
     # TS
@@ -37,6 +34,7 @@ in {
     oxfmt
     typescript-go
     typescript-language-server
+
     # Astro
     astro-language-server
   ] ++ [
diff --git a/modules/hosts/mbp.nix b/modules/hosts/mbp.nix
index 2a4d0aa..9b3fa0f 100644
--- a/modules/hosts/mbp.nix
+++ b/modules/hosts/mbp.nix
@@ -24,6 +24,13 @@
 
       home.packages = with pkgs; [
         kind
+
+        # Rust
+        cargo
+        rustc
+        rust-analyzer
+        rustfmt
+        clippy
       ];
 
       home.stateVersion = "26.05";