diff --git a/config/home-manager/home.nix b/config/home-manager/home.nix
index 4af4a7c..adea78c 100644
--- a/config/home-manager/home.nix
+++ b/config/home-manager/home.nix
@@ -1,10 +1,7 @@
 { config, pkgs, ... }:
 {
   imports = [
-    ./packages/vscode.nix
-    ./packages/go.nix
-    ./packages/kitty.nix
-    ./packages/zed-editor.nix
+    ./packages/default.nix
     ./fonts.nix
     ./gnome-extensions.nix
     ./dconf.nix
diff --git a/config/home-manager/packages/default.nix b/config/home-manager/packages/default.nix
new file mode 100644
index 0000000..7ee986b
--- /dev/null
+++ b/config/home-manager/packages/default.nix
@@ -0,0 +1,12 @@
+{ config, pkgs, ... }:
+
+let
+  files = builtins.removeAttrs (builtins.readDir ./.) [ "default.nix" ];
+
+  # Import all other .nix files as modules
+  moduleFiles = builtins.map (fname: ./. + "/${fname}") (builtins.attrNames files);
+in
+{
+  # Import all the package modules
+  imports = moduleFiles;
+}