diff --git a/home-manager/opdavies/PW05CH3L.nix b/home-manager/opdavies/PW05CH3L.nix
index 19d2c35b..3cd28477 100644
--- a/home-manager/opdavies/PW05CH3L.nix
+++ b/home-manager/opdavies/PW05CH3L.nix
@@ -6,7 +6,6 @@
   features = {
     cli = {
       bookmarkthis.enable = true;
-      direnv.enable = true;
       node.enable = true;
       ranger.enable = true;
       starship.enable = true;
diff --git a/home-manager/opdavies/t480.nix b/home-manager/opdavies/t480.nix
index 60134ae1..14d191ee 100644
--- a/home-manager/opdavies/t480.nix
+++ b/home-manager/opdavies/t480.nix
@@ -9,7 +9,6 @@
   features = {
     cli = {
       bookmarkthis.enable = true;
-      direnv.enable = true;
       node.enable = true;
 
       ranger.enable = true;
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 27a9e016..564f4e2e 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -5,7 +5,6 @@
     ./browsers/firefox.nix
     ./browsers/qutebrowser.nix
     ./dev-commit.nix
-    ./direnv.nix
     ./gtk.nix
     ./media/handbrake.nix
     ./media/mpv.nix
diff --git a/modules/home-manager/direnv.nix b/modules/home-manager/direnv.nix
deleted file mode 100644
index 7c8d924b..00000000
--- a/modules/home-manager/direnv.nix
+++ /dev/null
@@ -1,21 +0,0 @@
-{ config, lib, ... }:
-
-with lib;
-
-let
-  cfg = config.features.cli.direnv;
-in
-{
-  options.features.cli.direnv.enable = mkEnableOption "Enable direnv";
-
-  config = mkIf cfg.enable {
-    programs.direnv = {
-      enable = true;
-      enableZshIntegration = true;
-
-      nix-direnv.enable = true;
-
-      silent = true;
-    };
-  };
-}
diff --git a/modules2/direnv/enable.nix b/modules2/direnv/enable.nix
new file mode 100644
index 00000000..b758eec4
--- /dev/null
+++ b/modules2/direnv/enable.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.base.programs.direnv.enable = true;
+}
diff --git a/modules2/direnv/nix-direnv.nix b/modules2/direnv/nix-direnv.nix
new file mode 100644
index 00000000..f3848d08
--- /dev/null
+++ b/modules2/direnv/nix-direnv.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.base.programs.direnv.nix-direnv.enable = true;
+}
diff --git a/modules2/direnv/silent.nix b/modules2/direnv/silent.nix
new file mode 100644
index 00000000..302a19b1
--- /dev/null
+++ b/modules2/direnv/silent.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.base.programs.direnv.silent = true;
+}
diff --git a/modules2/direnv/zsh.nix b/modules2/direnv/zsh.nix
new file mode 100644
index 00000000..ca306692
--- /dev/null
+++ b/modules2/direnv/zsh.nix
@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.base.programs.direnv.enableZshIntegration = true;
+}