From cc3991a38a383f01f6bbadd15e58aa4b1d7e725f Mon Sep 17 00:00:00 2001
From: Donovan Glover <donovan@dglover.co>
Date: Wed, 3 Apr 2024 07:14:47 -0400
Subject: [PATCH] meta: Merge timezone and locale with system

Usually one would want to define all of these options at the same time,
so it doesn't make sense to require importing several different modules.

For values that aren't needed, users can either override the configuration
in their own module or use an option that has been written upstream for the
module.
---
 modules/locale.nix   | 4 ----
 modules/system.nix   | 5 +++++
 modules/timezone.nix | 3 ---
 3 files changed, 5 insertions(+), 7 deletions(-)
 delete mode 100644 modules/locale.nix
 delete mode 100644 modules/timezone.nix

diff --git a/modules/locale.nix b/modules/locale.nix
deleted file mode 100644
index 7764131d..00000000
--- a/modules/locale.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  i18n.defaultLocale = "ja_JP.UTF-8";
-  i18n.supportedLocales = [ "ja_JP.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8" ];
-}
diff --git a/modules/system.nix b/modules/system.nix
index f1322545..a70fd2e4 100644
--- a/modules/system.nix
+++ b/modules/system.nix
@@ -1,3 +1,8 @@
 {
+  time.timeZone = "America/New_York";
+
+  i18n.defaultLocale = "ja_JP.UTF-8";
+  i18n.supportedLocales = [ "ja_JP.UTF-8/UTF-8" "en_US.UTF-8/UTF-8" "fr_FR.UTF-8/UTF-8" ];
+
   system.stateVersion = "22.11";
 }
diff --git a/modules/timezone.nix b/modules/timezone.nix
deleted file mode 100644
index 5174a5b6..00000000
--- a/modules/timezone.nix
+++ /dev/null
@@ -1,3 +0,0 @@
-{
-  time.timeZone = "America/New_York";
-}