diff --git a/systems/default.nix b/systems/default.nix
index 50b7d5c4..0d8cec95 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -44,7 +44,7 @@ in
       system = "x86_64-linux";
       project = config;
     };
-    homes = { inherit (config.homes) "maya:x86_64-linux" "minion:x86_64-linux"; };
+    homes = { inherit (config.homes) "maya:x86_64-linux"; };
   };
   config.systems.nixos."ocicat" = {
     pkgs = nixpkgs.x86_64-linux;
diff --git a/systems/marbled/locale.nix b/systems/marbled/locale.nix
deleted file mode 100644
index 7db3bf02..00000000
--- a/systems/marbled/locale.nix
+++ /dev/null
@@ -1,9 +0,0 @@
-# SPDX-FileCopyrightText: 2025 Collabora Productivity Limited
-#
-# SPDX-License-Identifier: MIT
-
-{ lib, ... }:
-{
-  services.xserver.xkb.variant = lib.mkForce "";
-  console.keyMap = lib.mkForce "us";
-}
diff --git a/systems/maya/keyboard.nix b/systems/maya/keyboard.nix
new file mode 100644
index 00000000..fb1bcb6a
--- /dev/null
+++ b/systems/maya/keyboard.nix
@@ -0,0 +1,17 @@
+# SPDX-FileCopyrightText: 2025 FreshlyBakedCake
+#
+# SPDX-License-Identifier: MIT
+
+{
+  services.keyd = {
+    enable = true;
+
+    keyboards.default = {
+      ids = [
+        "*"
+        "-1234:5678" # Espanso virtual keyboard
+      ];
+      settings.main.capslock = "overload(control, esc)";
+    };
+  };
+}
diff --git a/systems/maya/locale.nix b/systems/maya/locale.nix
new file mode 100644
index 00000000..b88ef170
--- /dev/null
+++ b/systems/maya/locale.nix
@@ -0,0 +1,32 @@
+# SPDX-FileCopyrightText: 2025 FreshlyBakedCake
+#
+# SPDX-License-Identifier: MIT
+
+{
+  # Set your time zone.
+  time.timeZone = "Europe/London";
+
+  # Select internationalisation properties.
+  i18n.defaultLocale = "en_GB.UTF-8";
+
+  i18n.extraLocaleSettings = {
+    LC_ADDRESS = "en_GB.UTF-8";
+    LC_IDENTIFICATION = "en_GB.UTF-8";
+    LC_MEASUREMENT = "en_GB.UTF-8";
+    LC_MONETARY = "en_GB.UTF-8";
+    LC_NAME = "en_GB.UTF-8";
+    LC_NUMERIC = "en_GB.UTF-8";
+    LC_PAPER = "en_GB.UTF-8";
+    LC_TELEPHONE = "en_GB.UTF-8";
+    LC_TIME = "en_GB.UTF-8";
+  };
+
+  # Configure keymap in X11
+  services.xserver.xkb = {
+    layout = "us";
+    variant = "";
+  };
+
+  # Configure console keymap
+  console.keyMap = "us";
+}
diff --git a/systems/marbled/users.nix b/systems/maya/users.nix
similarity index 100%
rename from systems/marbled/users.nix
rename to systems/maya/users.nix