From 1eab1dc30f72f9c5549bc7dd65a3dea92270a69a Mon Sep 17 00:00:00 2001
From: Guanran Wang <guanran928@outlook.com>
Date: Fri, 27 Oct 2023 00:10:04 +0800
Subject: [PATCH] nixos: remove nixos/{i18n,users,networking/timezone}

---
 flake.nix                     | 15 ++++++++++++---
 nixos/i18n/default.nix        |  7 -------
 nixos/i18n/i18n.nix           | 32 --------------------------------
 nixos/networking/default.nix  |  1 -
 nixos/networking/timezone.nix |  5 -----
 nixos/presets/core.nix        |  2 --
 nixos/users/default.nix       |  7 -------
 nixos/users/users.nix         |  5 -----
 8 files changed, 12 insertions(+), 62 deletions(-)
 delete mode 100644 nixos/i18n/default.nix
 delete mode 100755 nixos/i18n/i18n.nix
 delete mode 100644 nixos/networking/timezone.nix
 delete mode 100644 nixos/users/default.nix
 delete mode 100755 nixos/users/users.nix

diff --git a/flake.nix b/flake.nix
index 604d45c..d101502 100755
--- a/flake.nix
+++ b/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";
+          }
         ];
       };
     };
diff --git a/nixos/i18n/default.nix b/nixos/i18n/default.nix
deleted file mode 100644
index 10acaf2..0000000
--- a/nixos/i18n/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./i18n.nix
-  ];
-}
\ No newline at end of file
diff --git a/nixos/i18n/i18n.nix b/nixos/i18n/i18n.nix
deleted file mode 100755
index 4cf4d62..0000000
--- a/nixos/i18n/i18n.nix
+++ /dev/null
@@ -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
-}
\ No newline at end of file
diff --git a/nixos/networking/default.nix b/nixos/networking/default.nix
index cfdd816..55ef10d 100755
--- a/nixos/networking/default.nix
+++ b/nixos/networking/default.nix
@@ -8,6 +8,5 @@
     ./dhcp.nix
     ./firewall.nix
     ./proxy.nix
-    ./timezone.nix
   ];
 }
diff --git a/nixos/networking/timezone.nix b/nixos/networking/timezone.nix
deleted file mode 100644
index add648c..0000000
--- a/nixos/networking/timezone.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-  time.timeZone = "Asia/Shanghai";
-}
diff --git a/nixos/presets/core.nix b/nixos/presets/core.nix
index b5c30dc..fc57919 100755
--- a/nixos/presets/core.nix
+++ b/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)
diff --git a/nixos/users/default.nix b/nixos/users/default.nix
deleted file mode 100644
index 29159c8..0000000
--- a/nixos/users/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-
-{
-  imports = [
-    ./users.nix
-  ];
-}
\ No newline at end of file
diff --git a/nixos/users/users.nix b/nixos/users/users.nix
deleted file mode 100755
index b4ca478..0000000
--- a/nixos/users/users.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ ... }:
-
-{
-
-}
\ No newline at end of file