diff --git a/modules/core/default.nix b/modules/core/default.nix
index 258d0e0..ceb39b5 100644
--- a/modules/core/default.nix
+++ b/modules/core/default.nix
@@ -5,7 +5,7 @@
     ./git.nix
     ./hjem.nix
     ./network.nix
-    ./packages.nix
+    ./packages
     ./timezone.nix
     ./nix.nix
     ./pipewire.nix
diff --git a/modules/core/packages/default.nix b/modules/core/packages/default.nix
new file mode 100644
index 0000000..be6d006
--- /dev/null
+++ b/modules/core/packages/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./user.nix
+    ./system.nix
+  ];
+}
diff --git a/modules/core/packages/system.nix b/modules/core/packages/system.nix
new file mode 100644
index 0000000..b25fb19
--- /dev/null
+++ b/modules/core/packages/system.nix
@@ -0,0 +1,7 @@
+{ pkgs, ... }:
+{
+  environment.systemPackages = with pkgs; [
+    zsh
+  ];
+
+}
diff --git a/modules/core/packages.nix b/modules/core/packages/user.nix
similarity index 65%
rename from modules/core/packages.nix
rename to modules/core/packages/user.nix
index b74f0b3..b8585a7 100644
--- a/modules/core/packages.nix
+++ b/modules/core/packages/user.nix
@@ -1,16 +1,11 @@
-{ pkgs, username, inputs, ... }:
+{ pkgs, username, ... }:
 {
-  environment.systemPackages = with pkgs; [
-    zsh
-  ];
-
   hjem.users.${username}.packages = with pkgs; [
     clang
     lld
+    nixfmt
     llvmPackages.bintools
     tlrc
-    rustc
-    cargo
     unzip
     neovim
     btop