diff --git a/flake.nix b/flake.nix
index c4719a9..bf62d05 100755
--- a/flake.nix
+++ b/flake.nix
@@ -45,10 +45,9 @@
           modules =
             [
               ./wrappers
-              "${self}/${hostname}/configuration.nix"
-              "${self}/${hostname}/hardware-configuration.nix"
               inputs.nix-gaming.nixosModules.pipewireLowLatency
             ]
+            ++ dirFiles "${self}/${hostname}"
             ++ dirFiles ./modules/common
             ++ opt isDesktop (
               (dirFiles ./modules/common-desktop)
diff --git a/home-manager.nix b/home-manager.nix
index 4165b3f..9f464c6 100755
--- a/home-manager.nix
+++ b/home-manager.nix
@@ -17,7 +17,6 @@
       ./home-manager/git.nix
       ./home-manager/btop.nix
       ./home-manager/vscode.nix
-      ./home-manager/direnv.nix
       ./home-manager/firefox.nix
       ./home-manager/mangohud.nix
       ./home-manager/sway.nix
diff --git a/home-manager/direnv.nix b/modules/common/direnv.nix
similarity index 70%
rename from home-manager/direnv.nix
rename to modules/common/direnv.nix
index 2b124d7..2b51c9d 100644
--- a/home-manager/direnv.nix
+++ b/modules/common/direnv.nix
@@ -1,7 +1,6 @@
 {
   programs.direnv = {
     enable = true;
-    enableFishIntegration = true;
     nix-direnv.enable = true;
   };
 }
diff --git a/modules/common/fish.nix b/modules/common/fish.nix
index 8ab79b6..e2063d6 100644
--- a/modules/common/fish.nix
+++ b/modules/common/fish.nix
@@ -1,7 +1,10 @@
 {pkgs, ...}: {
   programs.fish = {
     enable = true;
-    interactiveShellInit = "neofetch";
+    interactiveShellInit = ''
+      direnv hook fish | source
+      neofetch
+    '';
   };
   environment = {
     sessionVariables.fish_greeting = "";