6 files changed, 7 insertions, 14 deletions
diff --git a/hosts/fina/default.nix b/hosts/fina/default.nix
index 1620ca6..30f7dcd 100644
--- a/hosts/fina/default.nix
+++ b/hosts/fina/default.nix
@@ -13,9 +13,6 @@
 
   config = {
     modules.nix.extend = false;
-    time.timeZone = "America/Los_Angeles";
-    i18n.defaultLocale = "en_US.UTF-8";
-    console.keyMap = "us";
     system.stateVersion = "24.05";
 
     boot = {
diff --git a/modules/desktop/software/default.nix b/modules/desktop/software/default.nix
index c1aff52..179f4ad 100644
--- a/modules/desktop/software/default.nix
+++ b/modules/desktop/software/default.nix
@@ -34,7 +34,6 @@
 
   console = {
     earlySetup = true;
-    keyMap = "us";
     font = "ter-v16n";
     packages = [ pkgs.terminus_font ];
   };
diff --git a/modules/desktop/software/input.nix b/modules/desktop/software/input.nix
index 2d9f651..5d43085 100644
--- a/modules/desktop/software/input.nix
+++ b/modules/desktop/software/input.nix
@@ -1,8 +1,6 @@
-{ pkgs, secrets, ... }:
+{ pkgs, ... }:
 {
   i18n = {
-    defaultLocale = secrets.i18n.locale;
-
     inputMethod = {
       enable = true;
       type = "fcitx5";
diff --git a/modules/desktop/software/locale.nix b/modules/desktop/software/locale.nix
index 8ebd49b..aded640 100644
--- a/modules/desktop/software/locale.nix
+++ b/modules/desktop/software/locale.nix
@@ -1,9 +1,4 @@
-{ secrets, ... }:
 {
   location.provider = "geoclue2";
-
-  time = {
-    timeZone = "${secrets.i18n.timezone}";
-    hardwareClockInLocalTime = false;
-  };
+  time.hardwareClockInLocalTime = false;
 }
diff --git a/modules/pc/default.nix b/modules/pc/default.nix
index 27ef69b..97fe6b9 100644
--- a/modules/pc/default.nix
+++ b/modules/pc/default.nix
@@ -1,5 +1,9 @@
-{ pkgs, ... }:
+{ pkgs, secrets, ... }:
 {
+  i18n.defaultLocale = secrets.i18n.locale;
+  time.timeZone = secrets.i18n.timezone;
+  console.keyMap = secrets.i18n.keymap;
+
   environment.systemPackages = with pkgs; [
     vim
     wget
diff --git a/secrets/secrets.toml b/secrets/secrets.toml
index c97d134..42c5e39 100644
--- a/secrets/secrets.toml
+++ b/secrets/secrets.toml