diff --git a/hosts/global.nix b/hosts/global.nix
index f07bab8..f3e6d9e 100644
--- a/hosts/global.nix
+++ b/hosts/global.nix
@@ -46,9 +46,6 @@
           "docker"
           "video"
         ];
-        packages = with pkgs; [
-          home-manager
-        ];
       };
     };
   };
@@ -78,43 +75,9 @@
   };
 
   environment.systemPackages = with pkgs; [
-    age
-    bat
-    cairo
-    dconf
-    fastfetch
     git
-    home-manager
-    lego
-    libjpeg
-    libpng
-    libuuid
-    linux-manual
-    man
-    man-pages
-    man-pages-posix
-    networkmanager
-    openssl
-    pkg-config
     postgresql
-    protonup-ng
-    python3
-    python3Packages.pip
-    qFlipper
-    ripgrep
-    swaylock
-    swaylock-fancy
-    tmux
-    unzip
     vim
     wget
-    wl-clipboard
-    xclip
-    xdg-desktop-portal-hyprland
-    xsel
-    yarn
-    zsh
-  ] ++ [
-    inputs.agenix.packages.${pkgs.system}.agenix
   ];
 }
diff --git a/hosts/server/configuration.nix b/hosts/server/configuration.nix
index 755b146..9262381 100644
--- a/hosts/server/configuration.nix
+++ b/hosts/server/configuration.nix
@@ -89,6 +89,47 @@
     };
   };
 
+  environment.systemPackages = with pkgs; [
+    age
+    bat
+    cairo
+    dconf
+    fastfetch
+    git
+    home-manager
+    lego
+    libjpeg
+    libpng
+    libuuid
+    linux-manual
+    man
+    man-pages
+    man-pages-posix
+    networkmanager
+    openssl
+    pkg-config
+    postgresql
+    protonup-ng
+    python3
+    python3Packages.pip
+    qFlipper
+    ripgrep
+    swaylock
+    swaylock-fancy
+    tmux
+    unzip
+    vim
+    wget
+    wl-clipboard
+    xclip
+    xdg-desktop-portal-hyprland
+    xsel
+    yarn
+    zsh
+  ] ++ [
+    inputs.agenix.packages.${pkgs.system}.agenix
+  ];
+
   # Bootloader.
   boot.loader = {
     systemd-boot.enable = true;