diff --git a/flake.nix b/flake.nix
index d1134f8..cf6dc17 100644
--- a/flake.nix
+++ b/flake.nix
@@ -41,6 +41,7 @@
         ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
         ./systems/server/configuration.nix
         ### Modules ###
+        ./modules/cli-tools.nix
         ./modules/static-ip.nix
         ./modules/hdd-spindown.nix
         ./modules/firewall.nix
@@ -107,6 +108,7 @@
           #./modules/hardware/scheduler.nix
           # use latest kernel
           ./modules/kernel.nix
+          ./modules/cli-tools.nix
           ./modules/nix/settings.nix
           ./modules/nix/index.nix
           ./modules/nix/ld.nix
@@ -138,6 +140,7 @@
           ./modules/graphical/hyprland.nix
           ./modules/graphical/shared.nix
           ./laptop/configuration.nix
+          ./modules/cli-tools.nix
           ./modules/virt-manager.nix
           ./modules/ssh.nix
           #./modules/static-ip.nix
@@ -164,6 +167,7 @@
           ({ config, pkgs, ... }: { nixpkgs.overlays = [ overlay-unstable ]; })
           ./laptop/configuration.nix
           ./modules/graphical/shared.nix
+          ./modules/cli-tools.nix
           ./modules/virt-manager.nix
           ./modules/ssh.nix
           ./modules/wake-on-lan.nix
diff --git a/modules/cli-tools.nix b/modules/cli-tools.nix
new file mode 100644
index 0000000..fdd1063
--- /dev/null
+++ b/modules/cli-tools.nix
@@ -0,0 +1,20 @@
+{ config, pkgs, inputs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    wget
+    nixos-option
+    btop
+    git
+    killall
+    xclip
+    usbutils
+    inputs.agenix.packages."x86_64-linux".default
+    neofetch
+    pdfgrep
+    ncdu
+    glxinfo
+    vulkan-tools
+    ffmpeg
+    nethogs
+  ];
+}
diff --git a/modules/graphical/shared.nix b/modules/graphical/shared.nix
index 48fdd60..17e2375 100644
--- a/modules/graphical/shared.nix
+++ b/modules/graphical/shared.nix
@@ -36,31 +36,17 @@ in
   # List packages installed in system profile. To search, run:
   # $ nix search wget
   environment.systemPackages = with pkgs; [
-    wget
-    nixos-option
     kate
     keepassxc
     jetbrains.idea-ultimate
     jetbrains.rider
-    neovim
-    btop
-    git
     xfce.thunar
-    killall
-    xclip
-    usbutils
-    inputs.agenix.packages."x86_64-linux".default
     insomnia
     remmina
     nextcloud-client
-    #podman-compose
-    #arion # docker
-    neofetch
     thunderbird
     rofi
-    pdfgrep
     taisei
-    ncdu
     localsend
     element-desktop
     tetrio-desktop
@@ -68,12 +54,9 @@ in
     unstable.libreoffice-fresh
     mangohud
     screenshot
-    glxinfo
-    vulkan-tools
     anki
     obs-studio
     mpv
-    ffmpeg
     p7zip
     qbittorrent
     (wrapOBS {