diff --git a/modules/common.nix b/modules/common.nix
index 564e07e..2f8914f 100644
--- a/modules/common.nix
+++ b/modules/common.nix
@@ -11,9 +11,16 @@
   # SYSTEM
   # --------------------------------------------------------------------------
   networking.hostName = "atlas";
-  time.timeZone = "Europe/Rome";  # TODO: Change to your timezone
+  time.timeZone = "Europe/Berlin";
   i18n.defaultLocale = "en_US.UTF-8";
 
+  # German keyboard layout (nodeadkeys variant)
+  console.keyMap = "de-latin1-nodeadkeys";
+  services.xserver.xkb = {
+    layout = "de";
+    variant = "nodeadkeys";
+  };
+
   networking.networkmanager.enable = true;
 
   # --------------------------------------------------------------------------