nixos: remove nixos/{i18n,users,networking/timezone}

flake.nix

@@ -91,7 +91,10 @@
           ./machines/nixos/81fw-lenovo-legion-y7000           # Hardware-specific
           ./machines/nixos/81fw-lenovo-legion-y7000/machine-1 # Machine-specific
 
-          { networking.hostName = "81FW-NixOS"; }             # Hostname
+          {
+            networking.hostName = "81FW-NixOS"; # Hostname
+            time.timeZone = "Asia/Shanghai";    # Timezone
+          }
         ];
       };
 
@@ -105,7 +108,10 @@
           ./machines/nixos/imac-2017
           ./machines/nixos/imac-2017/machine-1
 
-          { networking.hostName = "iMac-NixOS"; }
+          {
+            networking.hostName = "iMac-NixOS";
+            time.timeZone = "Asia/Shanghai";
+          }
         ];
       };
     };
@@ -121,7 +127,10 @@
           ./users/guanranwang/darwin/presets/desktop.nix
           ./machines/darwin/imac-2017
 
-          { networking.hostName = "iMac-macOS"; }
+          {
+            networking.hostName = "iMac-macOS";
+            time.timeZone = "Asia/Shanghai";
+          }
         ];
       };
     };

nixos/i18n/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./i18n.nix
-  ];
-}

nixos/i18n/i18n.nix

@@ -1,32 +0,0 @@
-{ ... }:
-
-# Internationalisation configurations
-# Use Home Manager for IME configurations
-{
-  i18n = {
-    defaultLocale = "en_US.UTF-8";
-    extraLocaleSettings = {
-      LC_ADDRESS = "en_US.UTF-8";
-      LC_IDENTIFICATION = "en_US.UTF-8";
-      LC_MEASUREMENT = "en_US.UTF-8";
-      LC_MONETARY = "en_US.UTF-8";
-      LC_NAME = "en_US.UTF-8";
-      LC_NUMERIC = "en_US.UTF-8";
-      LC_PAPER = "en_US.UTF-8";
-      LC_TELEPHONE = "en_US.UTF-8";
-      LC_TIME = "en_US.UTF-8";
-    };
-    supportedLocales = [
-      "en_US.UTF-8/UTF-8"
-      "zh_CN.UTF-8/UTF-8"
-    ];
-  };
-
-  # console = {
-  #   font = "Lat2-Terminus16";
-  #   keyMap = "us";
-  #   useXkbConfig = true; # use xkbOptions in tty.
-  # };
-
-  services.xserver.layout = "us"; # keymap in x11
-}

nixos/networking/default.nix

@@ -8,6 +8,5 @@
     ./dhcp.nix
     ./firewall.nix
     ./proxy.nix
-    ./timezone.nix
   ];
 }

nixos/networking/timezone.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  time.timeZone = "Asia/Shanghai";
-}

nixos/presets/core.nix

@@ -4,13 +4,11 @@
 {
   imports = [
     ../boot
-    ../i18n
     ../networking
     ../nix
     ../packages
     ../power-management
     #../specialisation # dont actually use this
-    ../users
   ];
 
   # Installed packages (System wide)

nixos/users/default.nix

@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./users.nix
-  ];
-}

nixos/users/users.nix

@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}