diff --git a/modules/core/default.nix b/modules/core/default.nix
index b78ab5b..52c3022 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -1,6 +1,8 @@
 {
   imports = [
     #./packages.nix
+    ./program.nix
+    ./user.nix
     ./ssh.nix
   ];
 }
diff --git a/modules/core/program.nix b/modules/core/program.nix
new file mode 100644
index 0000000..5646663
--- /dev/null
+++ b/modules/core/program.nix
@@ -0,0 +1,4 @@
+{ pkgs, lib, ... }:
+{
+  programs.zsh.enable = true;
+}
diff --git a/modules/home/default.nix b/modules/home/default.nix
index c6c4f97..90c2fb3 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -1,9 +1,8 @@
 {
   imports = [
     ./hyprland
+    ./zsh
     ./git.nix
-    ./home-manager.nix
     ./packages.nix
-    ./user.nix
   ];
 }
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
new file mode 100644
index 0000000..db05157
--- /dev/null
+++ b/modules/home/zsh/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./zsh.nix
+  ];
+}
diff --git a/modules/home/zsh/zsh.nix b/modules/home/zsh/zsh.nix
new file mode 100644
index 0000000..7fcab1b
--- /dev/null
+++ b/modules/home/zsh/zsh.nix
@@ -0,0 +1,8 @@
+{
+  programs.zsh = {
+    enable = true;
+    enableCompletion = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
+  };
+}