diff --git a/modules/system/settings/default.nix b/modules/system/settings/default.nix
index e9d3e545..5a196fae 100644
--- a/modules/system/settings/default.nix
+++ b/modules/system/settings/default.nix
@@ -2,9 +2,9 @@
 {
   imports = [
     ./font
+    ./locale
     ./minimal
     ./nix
     ./security
-    ./timezone
   ];
 }
diff --git a/modules/system/settings/locale/default.nix b/modules/system/settings/locale/default.nix
new file mode 100644
index 00000000..9931ad3d
--- /dev/null
+++ b/modules/system/settings/locale/default.nix
@@ -0,0 +1,6 @@
+{ ... }:
+{
+  console.keyMap = "us";
+  i18n.defaultLocale = "en_CA.UTF-8";
+  time.timeZone = "America/Toronto";
+}
diff --git a/modules/system/settings/timezone/default.nix b/modules/system/settings/timezone/default.nix
deleted file mode 100644
index f0b23faf..00000000
--- a/modules/system/settings/timezone/default.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{ ... }:
-{
-  time.timeZone = "America/Toronto";
-}