diff --git a/home-manager/desktop/compositor/hyprland/default.nix b/home-manager/desktop/compositor/hyprland/default.nix
index 379f57d..364eb34 100644
--- a/home-manager/desktop/compositor/hyprland/default.nix
+++ b/home-manager/desktop/compositor/hyprland/default.nix
@@ -6,7 +6,9 @@
   ...
 }:
 let
-  xkbLayout = "gb";
+  xkbLayout = let
+    envLayout = builtins.getEnv "NOUGHTY_KEYBOARD_LAYOUT";
+  in if envLayout != "" then envLayout else "gb";
   palette = noughtyConfig.catppuccin.palette;
 in
 {
diff --git a/just/home-manager.just b/just/home-manager.just
index b12f9d3..9fd66d2 100644
--- a/just/home-manager.just
+++ b/just/home-manager.just
@@ -7,6 +7,7 @@ build-home: _header _is_compatible _has_config
     export HOSTNAME="${HOSTNAME:-$(hostname -s)}"
     export USER="${USER}"
     export HOME="${HOME}"
+    export NOUGHTY_KEYBOARD_LAYOUT="$(localectl status | grep "X11 Layout" | awk '{print $3}' || echo "gb")"
     nom build {{NIX_OPTS}} ".#homeConfigurations.${USER}@${HOSTNAME}.activationPackage"
     rm result 2> /dev/null || true
 
@@ -19,5 +20,6 @@ switch-home: build-home
     export HOSTNAME="${HOSTNAME:-$(hostname -s)}"
     export USER="${USER}"
     export HOME="${HOME}"
+    export NOUGHTY_KEYBOARD_LAYOUT="$(localectl status | grep "X11 Layout" | awk '{print $3}' || echo "gb")"
     home-manager --impure -b noughty-{{STAMP}} --flake ".#${USER}@${HOSTNAME}" switch 2> /dev/null
     rm result 2> /dev/null || true