diff --git a/flake.nix b/flake.nix
index 4a66abe..3a826e4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,7 +3,11 @@
 
   outputs = _: {
     nixosModules = {
-      bernstdh = import ./modules;
+      bernstdh = import ./modules/nixos.nix;
+    };
+
+    homeManagerModules = {
+      bernstdh = import ./modules/homeManager.nix;
     };
   };
 }
diff --git a/modules/default.nix b/modules/eclipse.nix
similarity index 77%
rename from modules/default.nix
rename to modules/eclipse.nix
index 71a41be..ea1b0aa 100644
--- a/modules/default.nix
+++ b/modules/eclipse.nix
@@ -1,6 +1,4 @@
 {
-  config,
-  lib,
   pkgs,
   ...
 }:
@@ -33,16 +31,6 @@ let
   };
 
 in
-with lib;
 {
-  options.programs.nix-jmu-cs345 = {
-    enable = mkEnableOption "nix-jmu-cs345";
-  };
-
-  config = mkIf config.programs.nix-jmu-cs345.enable {
-    environment.systemPackages = with pkgs; [
-      jdk21_headless
-      eclipse-cs345
-    ];
-  };
+  inherit eclipse-cs345;
 }
diff --git a/modules/homeManager.nix b/modules/homeManager.nix
new file mode 100644
index 0000000..954189b
--- /dev/null
+++ b/modules/homeManager.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  eclipse = import ./eclipse.nix { inherit pkgs; };
+  inherit (eclipse) eclipse-cs345;
+in
+with lib;
+{
+  options.programs.nix-jmu-cs345 = {
+    enable = mkEnableOption "nix-jmu-cs345";
+  };
+
+  config = mkIf config.programs.nix-jmu-cs345.enable {
+    home.packages = with pkgs; [
+      jdk21_headless
+      eclipse-cs345
+    ];
+  };
+}
diff --git a/modules/nixos.nix b/modules/nixos.nix
new file mode 100644
index 0000000..e8ee640
--- /dev/null
+++ b/modules/nixos.nix
@@ -0,0 +1,23 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  eclipse = import ./eclipse.nix { inherit pkgs; };
+  inherit (eclipse) eclipse-cs345;
+in
+with lib;
+{
+  options.programs.nix-jmu-cs345 = {
+    enable = mkEnableOption "nix-jmu-cs345";
+  };
+
+  config = mkIf config.programs.nix-jmu-cs345.enable {
+    environment.systemPackages = with pkgs; [
+      jdk21_headless
+      eclipse-cs345
+    ];
+  };
+}