From b816b91e4f1fcf090832f8bb81aa4484fc470cf6 Mon Sep 17 00:00:00 2001
From: Seth Flynn <getchoo@tuta.io>
Date: Thu, 13 Feb 2025 20:50:25 -0500
Subject: modules: set locale settings as defaults

---
 modules/nixos/defaults/default.nix |  5 +++++
 modules/nixos/traits/default.nix   |  1 -
 modules/nixos/traits/locale.nix    | 23 -----------------------
 3 files changed, 5 insertions(+), 24 deletions(-)
 delete mode 100644 modules/nixos/traits/locale.nix

(limited to 'modules/nixos')

diff --git a/modules/nixos/defaults/default.nix b/modules/nixos/defaults/default.nix
index 85dfbe6..5b542a9 100644
--- a/modules/nixos/defaults/default.nix
+++ b/modules/nixos/defaults/default.nix
@@ -11,4 +11,9 @@
   ];
 
   documentation.nixos.enable = lib.mkDefault false;
+
+  i18n = {
+    defaultLocale = "en_US.UTF-8";
+    supportedLocales = [ "en_US.UTF-8/UTF-8" ];
+  };
 }
diff --git a/modules/nixos/traits/default.nix b/modules/nixos/traits/default.nix
index 30e5331..d4b00dc 100644
--- a/modules/nixos/traits/default.nix
+++ b/modules/nixos/traits/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./arm-builder.nix
-    ./locale.nix
     ./mac-builder.nix
     ./nvd-diff.nix
   ];
diff --git a/modules/nixos/traits/locale.nix b/modules/nixos/traits/locale.nix
deleted file mode 100644
index aa103e2..0000000
--- a/modules/nixos/traits/locale.nix
+++ /dev/null
@@ -1,23 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.traits.locale;
-in
-{
-  options.traits.locale = {
-    en_US = {
-      enable = lib.mkEnableOption "en_US locale" // {
-        default = true;
-      };
-    };
-  };
-
-  config = lib.mkMerge [
-    (lib.mkIf cfg.en_US.enable {
-      i18n = {
-        supportedLocales = [ "en_US.UTF-8/UTF-8" ];
-
-        defaultLocale = "en_US.UTF-8";
-      };
-    })
-  ];
-}
-- 
cgit v1.2.3