diff --git a/modules/home/programs/shell/direnv.nix b/modules/home/programs/shell/direnv.nix
new file mode 100644
index 0000000..3c81ad6
--- /dev/null
+++ b/modules/home/programs/shell/direnv.nix
@@ -0,0 +1,12 @@
+{ config, lib, ... }:
+{
+  options.custom.programs.shell.direnv.enable = lib.mkEnableOption "";
+
+  config = lib.mkIf config.custom.programs.shell.direnv.enable {
+    programs.direnv = {
+      enable = true;
+      nix-direnv.enable = true;
+      silent = true;
+    };
+  };
+}
diff --git a/modules/home/programs/shell/zsh/default.nix b/modules/home/programs/shell/zsh/default.nix
index 7eff80f..9b561e2 100644
--- a/modules/home/programs/shell/zsh/default.nix
+++ b/modules/home/programs/shell/zsh/default.nix
@@ -8,8 +8,6 @@
   options.custom.programs.shell.zsh.enable = lib.mkEnableOption "";
 
   config = lib.mkIf config.custom.programs.shell.zsh.enable {
-    custom.programs.shell.aliases.enable = true;
-
     programs = {
       zsh = {
         enable = true;
@@ -43,12 +41,6 @@
       };
 
       fzf.enable = true;
-
-      direnv = {
-        enable = true;
-        nix-direnv.enable = true;
-        silent = true;
-      };
     };
   };
 }
diff --git a/users/seb/home.nix b/users/seb/home.nix
index a6c23bc..cd42adf 100644
--- a/users/seb/home.nix
+++ b/users/seb/home.nix
@@ -8,7 +8,11 @@
     sops.enable = true;
 
     programs = {
-      shell.zsh.enable = true;
+      shell = {
+        zsh.enable = true;
+        aliases.enable = true;
+        direnv.enable = true;
+      };
       git.enable = true;
       kitty.enable = true;
       vscode.enable = true;