diff --git a/flake.nix b/flake.nix
index 5843aa6..2811422 100644
--- a/flake.nix
+++ b/flake.nix
@@ -49,6 +49,7 @@
       nixosModules.tablet = import ./modules/unix/tablet.nix;
       nixosModules.steam = import ./modules/steam;
       nixosModules.niriSystem = import ./modules/wm/niri-system;
+      nixosModules.direnv = import ./modules/direnv;
 
       nixosConfigurations.dnsc-machine = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
diff --git a/hosts/dnsc-air/default.nix b/hosts/dnsc-air/default.nix
index 4f6077f..6c7135d 100644
--- a/hosts/dnsc-air/default.nix
+++ b/hosts/dnsc-air/default.nix
@@ -12,6 +12,7 @@
     outputs.nixosModules.macos
     outputs.nixosModules.homebrew
     outputs.nixosModules.aerospace
+    outputs.nixosModules.direnv
   ];
 
   # Device & user-specific settings
@@ -25,26 +26,19 @@
   nix.settings.trusted-users = [ "dennis" ];
 
   # Device specific overlays
-  # Overlays for all devices are defined
-  # in modules/default.nix
   nixpkgs.overlays = [];
 
   # System Packages
   environment.systemPackages = lib.mkAfter (
     with pkgs;
     [
-      yt-dlp
-      fnm
-      devenv
       rsync
-      tmux
     ]
   );
 
   # Install additional homebrew apps
   homebrew.masApps = {
     Bitwarden = 1352778147;
-    "Wipr 2" = 1662217862;
     "Yesterday For Old Reddit" = 1603279883;
     "Final Cut Pro" = 424389933;
     Wireguard = 1451685025;
@@ -67,7 +61,6 @@
 
   # Shells
   environment.shells = [ pkgs.fish ];
-  programs.direnv.enable = true;
 
   # Home Manager Setup
   home-manager = {
diff --git a/modules/direnv/default.nix b/modules/direnv/default.nix
index 2b51c9d..2b124d7 100644
--- a/modules/direnv/default.nix
+++ b/modules/direnv/default.nix
@@ -1,6 +1,7 @@
 {
   programs.direnv = {
     enable = true;
+    enableFishIntegration = true;
     nix-direnv.enable = true;
   };
 }