diff --git a/modules/modules/locale.nix b/modules/modules/locale.nix
new file mode 100644
index 0000000..d0da985
--- /dev/null
+++ b/modules/modules/locale.nix
@@ -0,0 +1,22 @@
+{ config, options, lib, ... }:
+with lib;
+with lib.hlissner;
+let
+  cfg = config.modules.locale;
+in
+{
+  options.modules.locale = {
+    keymap = mkOpt "us";
+    locale = mkOpt "en_us.UTF-8";
+    timezone = mkOpt "America/New_York";
+  };
+
+  config = {
+    console.keyMap = mkDefault cfg.keymap;
+    services.xserver.layout = mkDefault cfg.keymap;
+
+    i18n.defaultLocale = cfg.locale;
+
+    time.timeZone = cfg.timezone;
+  };
+}
diff --git a/profiles/core/locale.nix b/profiles/core/locale.nix
deleted file mode 100644
index 0ddd230..0000000
--- a/profiles/core/locale.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }: {
-  i18n.defaultLocale = "en_US.UTF-8";
-  console.keyMap = "us";
-  services.xserver.layout = "us";
-
-  time.timeZone = "America/New_York";
-}