modules: set locale settings as defaults

7 files changed, 7 insertions, 45 deletions

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";
-      };
-    })
-  ];
-}
diff --git a/modules/shared/default.nix b/modules/shared/default.nix
index 9ba06e6..37bc85a 100644
--- a/modules/shared/default.nix
+++ b/modules/shared/default.nix
@@ -3,7 +3,6 @@
     ./defaults
     ./mixins
     ./services
-    ./traits
     ./users
   ];
 }
diff --git a/modules/shared/defaults/default.nix b/modules/shared/defaults/default.nix
index f2bb28a..19317ec 100644
--- a/modules/shared/defaults/default.nix
+++ b/modules/shared/defaults/default.nix
@@ -8,4 +8,6 @@ in
   ];
 
   system.configurationRevision = self.rev or self.dirtyRev or "dirty-unknown";
+
+  time.timeZone = "America/New_York";
 }
diff --git a/modules/shared/traits/default.nix b/modules/shared/traits/default.nix
deleted file mode 100644
index 68dfb9d..0000000
--- a/modules/shared/traits/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./locale.nix
-  ];
-}
diff --git a/modules/shared/traits/locale.nix b/modules/shared/traits/locale.nix
deleted file mode 100644
index 3d0973c..0000000
--- a/modules/shared/traits/locale.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, lib, ... }:
-let
-  cfg = config.traits.locale;
-in
-{
-  options.traits.locale = {
-    US-east = {
-      enable = lib.mkEnableOption "eastern United States locale" // {
-        default = true;
-      };
-    };
-  };
-
-  config = lib.mkMerge [ (lib.mkIf cfg.US-east.enable { time.timeZone = "America/New_York"; }) ];
-}