diff --git a/home-manager/home.nix b/home-manager/home.nix
index 34be45a..053df44 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -15,6 +15,7 @@
     ./programs/nixcord.nix
     ./programs/zsh.nix
     ./programs/ghostty.nix
+    ./programs/thunar.nix
     ./hyprland/hyprland.nix
     inputs.nixcord.homeModules.nixcord
     inputs.spicetify-nix.homeManagerModules.spicetify
diff --git a/nixos/programs/thunar.nix b/home-manager/programs/thunar.nix
similarity index 84%
rename from nixos/programs/thunar.nix
rename to home-manager/programs/thunar.nix
index 4e7cc2c..a013527 100644
--- a/nixos/programs/thunar.nix
+++ b/home-manager/programs/thunar.nix
@@ -2,7 +2,7 @@
 {
   programs.thunar = {
     enable = true;
-    plugins = with pkgs; [
+    plugins = with pkgs.xfce; [
       thunar-archive-plugin
       thunar-volman
       thunar-vcs-plugin
diff --git a/home-manager/programs/zsh.nix b/home-manager/programs/zsh.nix
index 5a9940b..37c23c8 100644
--- a/home-manager/programs/zsh.nix
+++ b/home-manager/programs/zsh.nix
@@ -2,8 +2,8 @@
   programs.zsh = {
     enable = true;
     enableCompletion = true;
-    autosuggestion.enable = true;
-    syntaxHighlighting.enable = true;
+    enableAutosuggestions = true;
+    enableSyntaxHighlighting = true;
     oh-my-zsh.enable = true;
     oh-my-zsh.theme = "gentoo";
   };
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 6c2cad5..f6a6caf 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -10,7 +10,6 @@
     ./programs/system-packages.nix
     ./programs/xppen.nix
     ./programs/fonts.nix
-    ./programs/thunar.nix
     ./hardware/bluetooth.nix
     ./services/common.nix
     ./services/pipewire.nix
diff --git a/nixos/programs/zsh.nix b/nixos/programs/zsh.nix
new file mode 100644
index 0000000..30e71b4
--- /dev/null
+++ b/nixos/programs/zsh.nix
@@ -0,0 +1,12 @@
+{ pkgs, ... }: {
+
+  programs.zsh = {
+    enable = true;
+    autosuggestions.enable = true;
+    syntaxHighlighting.enable = true;
+    promptInit = ''
+      source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme
+      source ${../../home-manager/programs/p10k.zsh}
+    '';
+  };
+}