From 3b346c4dd9e33db3bf3722b889a666074ed9b54b Mon Sep 17 00:00:00 2001
From: Ryan Yin <xiaoyin_c@qq.com>
Date: Tue, 20 Feb 2024 16:14:51 +0800
Subject: [PATCH] fix: some packages has been removed from macOS introduced by
 ae238d401ddaeffa99c7ed696875b43460720c27

---
 modules/base.nix                  | 41 ++++++++++++++++++++++++++++++-
 modules/nixos/base/misc.nix       | 24 ------------------
 modules/nixos/base/networking.nix | 15 -----------
 3 files changed, 40 insertions(+), 40 deletions(-)

diff --git a/modules/base.nix b/modules/base.nix
index 7c4cade6..c33b45cd 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -1,5 +1,5 @@
 {
-  vars_networking,
+  pkgs,
   username,
   userfullname,
   nuenv,
@@ -11,6 +11,45 @@
     ]
     ++ (import ../overlays args);
 
+  environment.systemPackages = with pkgs; [
+    git # used by nix flakes
+    git-lfs # used by huggingface models
+
+    # archives
+    zip
+    xz
+    zstd
+    unzip
+    p7zip
+
+    # Text Processing
+    # Docs: https://github.com/learnbyexample/Command-line-text-processing
+    gnugrep # GNU grep, provides `grep`/`egrep`/`fgrep`
+    gnused # GNU sed, very powerful(mainly for replacing text in files)
+    gawk # GNU awk, a pattern scanning and processing language
+    jq # A lightweight and flexible command-line JSON processor
+
+    # networking tools
+    mtr # A network diagnostic tool
+    iperf3
+    dnsutils # `dig` + `nslookup`
+    ldns # replacement of `dig`, it provide the command `drill`
+    wget
+    curl
+    aria2 # A lightweight multi-protocol & multi-source command-line download utility
+    socat # replacement of openbsd-netcat
+    nmap # A utility for network discovery and security auditing
+    ipcalc # it is a calculator for the IPv4/v6 addresses
+
+    # misc
+    file
+    findutils
+    which
+    tree
+    gnutar
+    rsync
+  ];
+
   users.users.${username} = {
     description = userfullname;
     # Public Keys that can be used to login to all my PCs, Macbooks, and servers.
diff --git a/modules/nixos/base/misc.nix b/modules/nixos/base/misc.nix
index d1484e7b..1858f8f6 100644
--- a/modules/nixos/base/misc.nix
+++ b/modules/nixos/base/misc.nix
@@ -62,22 +62,6 @@
   environment.systemPackages = with pkgs; [
     neofetch
     neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    git # used by nix flakes
-    git-lfs # used by huggingface models
-
-    # archives
-    zip
-    xz
-    zstd
-    unzip
-    p7zip
-
-    # Text Processing
-    # Docs: https://github.com/learnbyexample/Command-line-text-processing
-    gnugrep # GNU grep, provides `grep`/`egrep`/`fgrep`
-    gnused # GNU sed, very powerful(mainly for replacing text in files)
-    gawk # GNU awk, a pattern scanning and processing language
-    jq # A lightweight and flexible command-line JSON processor
 
     # system call monitoring
     strace # system call monitoring
@@ -103,14 +87,6 @@
     dmidecode # a tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard
     parted
 
-    # misc
-    file
-    findutils
-    which
-    tree
-    gnutar
-    rsync
-
     # create a fhs environment by command `fhs`, so we can run non-nixos packages in nixos!
     (
       let
diff --git a/modules/nixos/base/networking.nix b/modules/nixos/base/networking.nix
index 09e602c2..8667ca0c 100644
--- a/modules/nixos/base/networking.nix
+++ b/modules/nixos/base/networking.nix
@@ -1,23 +1,8 @@
 {
   lib,
-  pkgs,
   vars_networking,
   ...
 }: {
-  environment.systemPackages = with pkgs; [
-    # networking tools
-    mtr # A network diagnostic tool
-    iperf3
-    dnsutils # `dig` + `nslookup`
-    ldns # replacement of `dig`, it provide the command `drill`
-    wget
-    curl
-    aria2 # A lightweight multi-protocol & multi-source command-line download utility
-    socat # replacement of openbsd-netcat
-    nmap # A utility for network discovery and security auditing
-    ipcalc # it is a calculator for the IPv4/v6 addresses
-  ];
-
   # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.