diff --git a/home/base/core/core.nix b/home/base/core/core.nix
index dce4e191..68f1a63a 100644
--- a/home/base/core/core.nix
+++ b/home/base/core/core.nix
@@ -1,34 +1,6 @@
 { pkgs, ... }:
 {
   home.packages = with pkgs; [
-    # Misc
-    cowsay
-    gnupg
-    gnumake
-
-    # Modern cli tools, replacement of grep/sed/...
-
-    # Interactively filter its input using fuzzy searching, not limit to filenames.
-    fzf
-    # search for files by name, faster than find
-    fd
-    # search for files by its content, replacement of grep
-    (ripgrep.override { withPCRE2 = true; })
-
-    # A fast and polyglot tool for code searching, linting, rewriting at large scale
-    # supported languages: only some mainstream languages currently(do not support nix/nginx/yaml/toml/...)
-    ast-grep
-
-    sad # CLI search and replace, just like sed, but with diff preview.
-    yq-go # yaml processor https://github.com/mikefarah/yq
-    just # a command runner like make, but simpler
-    hyperfine # command-line benchmarking tool
-    gping # ping, but with a graph(TUI)
-    doggo # DNS client for humans
-    duf # Disk Usage/Free Utility - a better 'df' alternative
-    du-dust # A more intuitive version of `du` in rust
-    gdu # disk usage analyzer(replacement of `du`)
-
     # nix related
     #
     # it provides the command `nom` works just like `nix
@@ -42,10 +14,15 @@
     # https://github.com/utdemir/nix-tree
     nix-tree # A TUI to visualize the dependency graph of a nix derivation
 
-    # productivity
+    # misc
+    cowsay
+    gnupg
     caddy # A webserver with automatic HTTPS via Let's Encrypt(replacement of nginx)
-    croc # File transfer between computers securely and easily
-    ncdu # analyzer your disk usage Interactively, via TUI(replacement of `du`)
+    # A fast and polyglot tool for code searching, linting, rewriting at large scale
+    # supported languages: only some mainstream languages currently(do not support nix/nginx/yaml/toml/...)
+    ast-grep
+
+    # other core cli tools are installed at system-level
   ];
 
   # A modern replacement for ‘ls’
diff --git a/modules/base/system-packages.nix b/modules/base/packages.nix
similarity index 56%
rename from modules/base/system-packages.nix
rename to modules/base/packages.nix
index a4a6ed0a..a973fcf6 100644
--- a/modules/base/system-packages.nix
+++ b/modules/base/packages.nix
@@ -6,14 +6,17 @@
 
   environment.systemPackages = with pkgs; [
     # core tools
-    tealdeer # a very fast version of tldr
+    nushell # nushell
     fastfetch
     neovim # Do not forget to add an editor to edit configuration.nix! The Nano editor is also installed by default.
-    just # justfile
-    nushell # nushell
+    gnumake # Makefile
+    just # a command runner like gnumake, but simpler
     git # used by nix flakes
     git-lfs # used by huggingface models
-    procs
+
+    # system monitoring
+    procs # a moreden ps
+    btop
 
     # archives
     zip
@@ -25,21 +28,48 @@
     # 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
+    gnutar
+    gnused # GNU sed, very powerful(mainly for replacing text in files)
+    sad # CLI search and replace, just like sed, but with diff preview.
+
     jq # A lightweight and flexible command-line JSON processor
+    yq-go # yaml processor https://github.com/mikefarah/yq
+
+    # Interactively filter its input using fuzzy searching, not limit to filenames.
+    fzf
+    # search for files by name, faster than find
+    fd
+    findutils
+    # search for files by its content, replacement of grep
+    (ripgrep.override { withPCRE2 = true; })
+
+    duf # Disk Usage/Free Utility - a better 'df' alternative
+    du-dust # A more intuitive version of `du` in rust
+    gdu # disk usage analyzer(replacement of `du`)
+    ncdu # analyzer your disk usage Interactively, via TUI(replacement of `du`)
 
     # networking tools
-    mtr # A network diagnostic tool
-    iperf3
+    mtr # A network diagnostic tool(traceroute)
+    gping # ping, but with a graph(TUI)
     dnsutils # `dig` + `nslookup`
     ldns # replacement of `dig`, it provide the command `drill`
+    doggo # DNS client for humans
     wget
     curl
+    curlie # curl with httpie
+    httpie
     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
+    iperf3 # network performance test
+    hyperfine # command-line benchmarking tool
+    tcpdump # network sniffer
+
+    # file transfer
+    rsync
+    croc # File transfer between computers securely and easily
 
     # security
     libargon2
@@ -47,10 +77,8 @@
 
     # misc
     file
-    findutils
     which
     tree
-    gnutar
-    rsync
+    tealdeer # a very fast version of tldr
   ];
 }
diff --git a/modules/darwin/apps.nix b/modules/darwin/apps.nix
index 07a8fe89..9e28441c 100644
--- a/modules/darwin/apps.nix
+++ b/modules/darwin/apps.nix
@@ -130,7 +130,6 @@ in
       "wget" # download tool
       "curl" # no not install curl via nixpkgs, it's not working well on macOS!
       "aria2" # download tool
-      "httpie" # http client
       "wireguard-tools" # wireguard
 
       # Usage:
diff --git a/modules/nixos/base/packages.nix b/modules/nixos/base/packages.nix
index 5a39b608..278dc560 100644
--- a/modules/nixos/base/packages.nix
+++ b/modules/nixos/base/packages.nix
@@ -6,7 +6,6 @@
     # system call monitoring
     strace # system call monitoring
     ltrace # library call monitoring
-    tcpdump # network sniffer
     lsof # list open files
 
     # ebpf related tools
@@ -19,7 +18,6 @@
     sysstat
     iotop-c
     iftop
-    btop
     nmon
     sysbench
     systemctl-tui