diff --git a/modules/nixos/base/packages.nix b/modules/nixos/base/packages.nix
index 5a04763b..b3058208 100644
--- a/modules/nixos/base/packages.nix
+++ b/modules/nixos/base/packages.nix
@@ -28,21 +28,6 @@
     hdparm # for disk performance, command
     dmidecode # a tool that reads information about your system's hardware from the BIOS according to the SMBIOS/DMI standard
     parted
-
-    # create a fhs environment by command `fhs`, so we can run non-nixos packages in nixos!
-    (
-      let
-        base = pkgs.appimageTools.defaultFhsEnvArgs;
-      in
-        pkgs.buildFHSUserEnv (base
-          // {
-            name = "fhs";
-            targetPkgs = pkgs: (base.targetPkgs pkgs) ++ [pkgs.pkg-config];
-            profile = "export FHS=1";
-            runScript = "bash";
-            extraOutputsToInstall = ["dev"];
-          })
-    )
   ];
 
   # replace default editor with neovim
diff --git a/modules/nixos/server/server-aarch64.nix b/modules/nixos/server/server-aarch64.nix
index edef7f4b..0e7dd8dd 100644
--- a/modules/nixos/server/server-aarch64.nix
+++ b/modules/nixos/server/server-aarch64.nix
@@ -8,6 +8,7 @@
     ../base/i18n.nix
     ../base/monitoring.nix
     ../base/nix.nix
+    ../base/packages.nix
     ../base/ssh.nix
     ../base/user-group.nix
 
diff --git a/modules/nixos/server/server-riscv64.nix b/modules/nixos/server/server-riscv64.nix
index 4b655b00..8796e440 100644
--- a/modules/nixos/server/server-riscv64.nix
+++ b/modules/nixos/server/server-riscv64.nix
@@ -8,45 +8,10 @@
     ../base/i18n.nix
     ../base/monitoring.nix
     ../base/nix.nix
+    ../base/packages.nix
     ../base/ssh.nix
     ../base/user-group.nix
 
     ../../base.nix
   ];
-
-  environment.systemPackages = with pkgs; [
-    neovim
-
-    # networking
-    mtr # A network diagnostic tool
-    iperf3 # A tool for measuring TCP and UDP bandwidth performance
-    nmap # A utility for network discovery and security auditing
-    ldns # replacement of dig, it provide the command `drill`
-    socat # replacement of openbsd-netcat
-    tcpdump # A powerful command-line packet analyzer
-
-    # archives
-    zip
-    xz
-    unzip
-    p7zip
-    zstd
-    gnutar
-
-    # misc
-    file
-    which
-    tree
-    gnused
-    gawk
-    zellij
-    docker-compose
-  ];
-
-  virtualisation.docker = {
-    enable = true;
-    # start dockerd on boot.
-    # This is required for containers which are created with the `--restart=always` flag to work.
-    enableOnBoot = true;
-  };
 }