diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index 4d74da1..5703b5b 100644
--- a/hosts/Disco.nix
+++ b/hosts/Disco.nix
@@ -11,7 +11,7 @@
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
     console.keyMap = "de";
-    services.xserver.layout = "de-x270";
+    services.xserver.xkb.layout = "de-x270";
     i18n.defaultLocale = "de_DE.UTF-8";
     networking.hostName = "Disco";
     networking.networkmanager.enable = true;
diff --git a/hosts/xfce.nix b/hosts/xfce.nix
index bc0b1a6..42d0d2f 100644
--- a/hosts/xfce.nix
+++ b/hosts/xfce.nix
@@ -2,18 +2,20 @@
 {
     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";
         };
     };
+    services.displayManager = {
+        defaultSession = "xfce";
+        autoLogin.enable = true;
+        autoLogin.user = "fruchti";
+    };
+    services.libinput.enable = true;
     nixpkgs.config.pulseaudio = true;
     hardware.pulseaudio.enable = true;
     hardware.bluetooth.enable = true;
@@ -26,7 +28,7 @@
         xfce.xfce4-pulseaudio-plugin
         xfce.xfce4-volumed-pulse
         xfce.xfwm4-themes
-        pinentry-gnome
+        pinentry-gtk2
         lounge-gtk-theme
         hackneyed
         blueman
@@ -37,7 +39,7 @@
 
     services.cpupower-gui.enable = true;
 
-    programs.gnupg.agent.pinentryFlavor = "gnome3";
+    programs.gnupg.agent.pinentryPackage = pkgs.pinentry-gtk2;
     services.pcscd.enable = true;
     services.dbus.packages = [ pkgs.gcr ];
 }