diff --git a/modules/software/default.nix b/modules/software/default.nix
index 2ffa239..f7f8664 100644
--- a/modules/software/default.nix
+++ b/modules/software/default.nix
@@ -8,7 +8,7 @@
     #./mpv.nix
     ./neovim.nix
     ./obs-studio.nix
-    ./packages.nix
+    ./packages
     ./programs.nix
     ./virt.nix
   ];
diff --git a/modules/software/packages/core.nix b/modules/software/packages/core.nix
new file mode 100644
index 0000000..6e620a0
--- /dev/null
+++ b/modules/software/packages/core.nix
@@ -0,0 +1,13 @@
+{pkgs, ...}: {
+  environment.systemPackages = with pkgs; [
+    file
+    git
+    htop
+    ncdu
+    p7zip
+    ripgrep
+    tmux
+    unzip
+    wget
+  ];
+}
diff --git a/modules/software/packages/default.nix b/modules/software/packages/default.nix
new file mode 100644
index 0000000..1941358
--- /dev/null
+++ b/modules/software/packages/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./core.nix
+    ./extended.nix
+  ];
+}
diff --git a/modules/software/packages.nix b/modules/software/packages/extended.nix
similarity index 90%
rename from modules/software/packages.nix
rename to modules/software/packages/extended.nix
index 8e7ea71..7e1b447 100644
--- a/modules/software/packages.nix
+++ b/modules/software/packages/extended.nix
@@ -16,7 +16,6 @@
 
     unstable.neovim
 
-    git
     gitui
     lazygit
 
@@ -31,21 +30,13 @@
     rustc
 
     # tooling
-    htop
     btop
-    ncdu
-    wget
     unstable.yt-dlp
     miniserve
-    file
-    unzip
-    tmux
     fzf
-    ripgrep
     qemu
     home-manager
     dfc
-    p7zip
     sops
 
     # move to homemanager?
diff --git a/system_profiles/server.nix b/system_profiles/server.nix
index f39d030..b242b27 100644
--- a/system_profiles/server.nix
+++ b/system_profiles/server.nix
@@ -1,18 +1,11 @@
 {
-  imports = let
-    packages = {pkgs, ...}: {
-      environment.systemPackages = with pkgs; [
-        tmux
-        wget
-      ];
-    };
-  in [
+  imports = [
     ./defaults.nix
     ./mini.nix
 
     ../modules/customisation.nix
     ../modules/software/neovim.nix
+    ../modules/software/packages/core.nix
 
-    packages
   ];
 }