diff --git a/base/defaults.nix b/base/defaults.nix
index 1387f28..7e30191 100644
--- a/base/defaults.nix
+++ b/base/defaults.nix
@@ -2,7 +2,8 @@
 {
     config = lib.mkDefault {
         i18n.defaultLocale = "en_GB.UTF-8";
-        console.keyMap = "de";
+        console.keyMap = "us";
+        services.xserver.layout = "us-fruchti";
         services.openssh.enable = true;
         services.openssh.passwordAuthentication = false;
 
diff --git a/base/xkb/default.nix b/base/xkb/default.nix
index 742b489..a119ecc 100644
--- a/base/xkb/default.nix
+++ b/base/xkb/default.nix
@@ -1,6 +1,5 @@
 { ... }:
 {
-    services.xserver.layout = "us-fruchti";
     services.xserver.extraLayouts = {
         de-fruchti = {
             description = "DE layout with some small changes for Thinkpad X270";
diff --git a/hosts/Disco.nix b/hosts/Disco.nix
index 557138d..c90290d 100644
--- a/hosts/Disco.nix
+++ b/hosts/Disco.nix
@@ -13,6 +13,8 @@ in
 
     boot.loader.systemd-boot.enable = true;
     boot.loader.efi.canTouchEfiVariables = true;
+    console.keyMap = "de";
+    services.xserver.layout = "de-x270";
     i18n.defaultLocale = "de_DE.UTF-8";
     networking.hostName = "Disco";
     networking.networkmanager.enable = true;