diff --git a/users/richie/systems/locale.nix b/users/richie/systems/locale.nix
new file mode 100644
index 0000000..5b6d68e
--- /dev/null
+++ b/users/richie/systems/locale.nix
@@ -0,0 +1,20 @@
+{
+  time.timeZone = "America/New_York";
+  console.keyMap = "us";
+
+  i18n = {
+    defaultLocale = "en_US.utf8";
+    supportedLocales = [ "en_US.UTF-8/UTF-8" ];
+    extraLocaleSettings = {
+      LC_ADDRESS = "en_US.UTF-8";
+      LC_IDENTIFICATION = "en_US.UTF-8";
+      LC_MEASUREMENT = "en_US.UTF-8";
+      LC_MONETARY = "en_US.UTF-8";
+      LC_NAME = "en_US.UTF-8";
+      LC_NUMERIC = "en_US.UTF-8";
+      LC_PAPER = "en_US.UTF-8";
+      LC_TELEPHONE = "en_US.UTF-8";
+      LC_TIME = "en_US.UTF-8";
+    };
+  };
+}
diff --git a/users/richie/systems/rhapsody-in-green/configuration.nix b/users/richie/systems/rhapsody-in-green/configuration.nix
index 66fbef0..6c1903a 100644
--- a/users/richie/systems/rhapsody-in-green/configuration.nix
+++ b/users/richie/systems/rhapsody-in-green/configuration.nix
@@ -3,7 +3,7 @@
 {
   imports = [
     ../programs.nix
-    ../us_ny.nix
+    ../locale.nix
     ./hardware.nix
   ];
   nixpkgs.config.allowUnfree = true;
diff --git a/users/richie/systems/us_ny.nix b/users/richie/systems/us_ny.nix
deleted file mode 100644
index fea9a6c..0000000
--- a/users/richie/systems/us_ny.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-{
-  time.timeZone = "America/New_York";
-  console.keyMap = "us";
-
-  i18n = {
-    defaultLocale = "en_US.utf8";
-    supportedLocales = [ "en_US.UTF-8/UTF-8" ];
-  };
-}