diff --git a/hosts/neogaia/default.nix b/hosts/neogaia/default.nix
index c5eb008..0eb0791 100644
--- a/hosts/neogaia/default.nix
+++ b/hosts/neogaia/default.nix
@@ -39,5 +39,4 @@
 
   time.timeZone = "America/New_York";
   i18n.defaultLocale = "en_GB.UTF-8";
-  console.keyMap = "us";
 }
diff --git a/system/default.nix b/system/default.nix
index bda9581..b99cd6e 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -58,6 +58,14 @@ in
     ];
     environment.systemPackages = [ pkgs.git ];
 
+    # Caps Lock is a second Escape; Shift+Caps Lock still toggles Caps Lock.
+    services.xserver.xkb.layout = "us";
+    services.xserver.xkb.options = "caps:escape_shifted_capslock";
+
+    # Compile the console keymap from the layout above, so the remap holds on a
+    # bare TTY and not only under a graphical session.
+    console.useXkbConfig = true;
+
     # Primary user, in the wheel group. No password set here.
     users.users.${user.name} = {
       isNormalUser = true;