about summary refs log tree commit diff
path: root/modules
diff options
context:
space:
mode:
authorAlyssa Ross <hi@alyssa.is>2019-12-24 17:51:49 +0000
committerAlyssa Ross <hi@alyssa.is>2019-12-24 23:03:50 +0000
commit576037d0ea38143331e91133c71f4f6f969240f7 (patch)
tree35796f9c4caa1563c62b833bed40091afc616a54 /modules
parent013020e270f15cf490f1dba496b646073aa7bf97 (diff)
downloadnixlib-576037d0ea38143331e91133c71f4f6f969240f7.tar
nixlib-576037d0ea38143331e91133c71f4f6f969240f7.tar.gz
nixlib-576037d0ea38143331e91133c71f4f6f969240f7.tar.bz2
nixlib-576037d0ea38143331e91133c71f4f6f969240f7.tar.lz
nixlib-576037d0ea38143331e91133c71f4f6f969240f7.tar.xz
nixlib-576037d0ea38143331e91133c71f4f6f969240f7.tar.zst
nixlib-576037d0ea38143331e91133c71f4f6f969240f7.zip
Use C locale on servers
UTC is the default timezone, so it doesn't need to be specified
anywhere.
Diffstat (limited to 'modules')
-rw-r--r--modules/locale/default.nix8
-rw-r--r--modules/server/default.nix4
-rw-r--r--modules/workstation/default.nix4
3 files changed, 5 insertions, 11 deletions
diff --git a/modules/locale/default.nix b/modules/locale/default.nix
deleted file mode 100644
index eb92aeda76bd..000000000000
--- a/modules/locale/default.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ ... }:
-
-{
-  time.timeZone = "UTC";
-
-  i18n.defaultLocale = "eo.utf8";
-  environment.sessionVariables.LC_CTYPE = "en_GB.utf8";
-}
diff --git a/modules/server/default.nix b/modules/server/default.nix
index 42d48ec1e93d..ffda6267c4c3 100644
--- a/modules/server/default.nix
+++ b/modules/server/default.nix
@@ -1,8 +1,10 @@
 { ... }:
 
 {
-  imports = [ ../nix ../locale ../ssh ../users ];
+  imports = [ ../nix ../ssh ../users ];
 
   services.openssh.enable = true;
   security.sudo.wheelNeedsPassword = false;
+
+  i18n.defaultLocale = "C.utf8";
 }
diff --git a/modules/workstation/default.nix b/modules/workstation/default.nix
index 237bbaa2455f..173097a2d1f9 100644
--- a/modules/workstation/default.nix
+++ b/modules/workstation/default.nix
@@ -2,9 +2,9 @@
 
 {
   imports = [
-    ../nix ../locale ../shell ../users ../ssh
-    ./documentation ./windowing ./fonts ./hardware
     ./dict ./gnupg ./mail ./podman ./weechat
+    ../nix ../shell ../users ../ssh
+    ./documentation ./windowing ./fonts ./hardware ./locale
   ];
 
   environment.systemPackages = with pkgs; [ mosh ];