diff --git a/system/configuration.nix b/system/configuration.nix
index 033c3cb..be7f037 100644
--- a/system/configuration.nix
+++ b/system/configuration.nix
@@ -116,17 +116,11 @@
     ffmpeg ffmpegthumbnailer p7zip rar unrar zip unzip dig nix-du
     nh graphviz libnotify drawing wmctrl
 
-    #### X11 stuff
-    xorg.xev xorg.xinit xtitle xwinmosaic xdo xdotool xsel xclip
     simplescreenrecorder gpick # stuff that will ONLY work in X
 
     inputs.zen-browser.packages.${pkgs.system}.default
   ];
 
-  ### DESKTOP
-  deWm.cinnamon.enable = true;
-  deWm.xfce.enable = true;
-
   ### ENV
   environment.variables = {
     EDITOR = "nvim";
diff --git a/system/de-twm.nix b/system/de-twm.nix
index 25db8ae..0bc3e3c 100644
--- a/system/de-twm.nix
+++ b/system/de-twm.nix
@@ -24,13 +24,15 @@ in
       };
     };
 
+    environment.systemPackages = with pkgs; [
+      xorg.xev xorg.xinit xtitle xwinmosaic xdo xdotool xsel xclip
+    ] ++ lib.optionals cfg.xfce.enable [
+      xfce.gigolo xfce.xfce4-dict xfce.xfce4-panel xfce.xfce4-pulseaudio-plugin
+      xfce.xfce4-whiskermenu-plugin xfce.mousepad xfce.xfwm4-themes xfce.xfce4-netload-plugin
+    ];
+
     environment.xfce.excludePackages = with pkgs.xfce; mkIf cfg.xfce.enable [
       xfce4-appfinder xfce4-taskmanager xfce4-terminal
     ];
-
-    environment.systemPackages = with pkgs.xfce; mkIf cfg.xfce.enable [
-      gigolo xfce4-dict xfce4-panel xfce4-pulseaudio-plugin
-      xfce4-whiskermenu-plugin mousepad xfwm4-themes xfce4-netload-plugin
-    ];
   };
 }