diff --git a/home-manager/home.nix b/home-manager/home.nix
index 053df44..34be45a 100644
--- a/home-manager/home.nix
+++ b/home-manager/home.nix
@@ -15,7 +15,6 @@
     ./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/home-manager/programs/zsh.nix b/home-manager/programs/zsh.nix
index 37c23c8..5a9940b 100644
--- a/home-manager/programs/zsh.nix
+++ b/home-manager/programs/zsh.nix
@@ -2,8 +2,8 @@
   programs.zsh = {
     enable = true;
     enableCompletion = true;
-    enableAutosuggestions = true;
-    enableSyntaxHighlighting = true;
+    autosuggestion.enable = true;
+    syntaxHighlighting.enable = true;
     oh-my-zsh.enable = true;
     oh-my-zsh.theme = "gentoo";
   };
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index f6a6caf..6c2cad5 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -10,6 +10,7 @@
     ./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/home-manager/programs/thunar.nix b/nixos/programs/thunar.nix
similarity index 84%
rename from home-manager/programs/thunar.nix
rename to nixos/programs/thunar.nix
index a013527..4e7cc2c 100644
--- a/home-manager/programs/thunar.nix
+++ b/nixos/programs/thunar.nix
@@ -2,7 +2,7 @@
 {
   programs.thunar = {
     enable = true;
-    plugins = with pkgs.xfce; [
+    plugins = with pkgs; [
       thunar-archive-plugin
       thunar-volman
       thunar-vcs-plugin
diff --git a/nixos/programs/zsh.nix b/nixos/programs/zsh.nix
deleted file mode 100644
index 30e71b4..0000000
--- a/nixos/programs/zsh.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ 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}
-    '';
-  };
-}