diff --git a/flake.nix b/flake.nix
index 62060fd..5a28c7e 100644
--- a/flake.nix
+++ b/flake.nix
@@ -48,6 +48,7 @@
             dualBoot = false;
             timeZone = null;
             keyMap = "us";
+            keyboardLayout = "us";
           };
           systems = [
             {
diff --git a/lib/configuration.nix b/lib/configuration.nix
index 9e016da..77cfcce 100644
--- a/lib/configuration.nix
+++ b/lib/configuration.nix
@@ -31,5 +31,6 @@
 
     # Configure keyboard layout
     console.keyMap = machineConfig.keyMap;
+    services.xserver.xkb.layout = machineConfig.keyboardLayout;
   };
 }