diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index 8f28c01..776df12 100644
--- a/hosts/Disco.nix
+++ b/hosts/Disco.nix
@@ -2,7 +2,7 @@
 {
     imports = [
         ./development.nix
-        ./gnome.nix
+        ./xfce.nix
         ./x270.nix
         ./scanner.nix
         ./printer.nix
diff --git a/hosts/xfce.nix b/hosts/xfce.nix
new file mode 100644
index 0000000..bc0b1a6
--- /dev/null
+++ b/hosts/xfce.nix
@@ -0,0 +1,43 @@
+{ config, pkgs, ... }:
+{
+    services.xserver = {
+        enable = true;
+        libinput.enable = true;
+        desktopManager = {
+            xfce.enable = true;
+            xterm.enable = false;
+        };
+        displayManager = {
+            lightdm.enable = true;
+            defaultSession = "xfce";
+            autoLogin.enable = true;
+            autoLogin.user = "fruchti";
+        };
+    };
+    nixpkgs.config.pulseaudio = true;
+    hardware.pulseaudio.enable = true;
+    hardware.bluetooth.enable = true;
+    services.blueman.enable = true;
+    # environment.xfce.excludePackages = with pkgs.xfce; [
+    #     xfce4-terminal
+    # ];
+    environment.systemPackages = with pkgs; [
+        xfce.xfce4-whiskermenu-plugin
+        xfce.xfce4-pulseaudio-plugin
+        xfce.xfce4-volumed-pulse
+        xfce.xfwm4-themes
+        pinentry-gnome
+        lounge-gtk-theme
+        hackneyed
+        blueman
+        gnome.file-roller
+    ];
+    security.pam.services.lightdm.enableGnomeKeyring = true;
+    services.gnome.gnome-keyring.enable = true;
+
+    services.cpupower-gui.enable = true;
+
+    programs.gnupg.agent.pinentryFlavor = "gnome3";
+    services.pcscd.enable = true;
+    services.dbus.packages = [ pkgs.gcr ];
+}