From 5ee73c1f44454f26fd63434de48cfb1d56642a09 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Tue, 10 Mar 2026 22:39:30 -0500
Subject: [PATCH] moved home manager modules

---
 modules/home-manager/profiles/base.nix          | 4 ++--
 modules/home-manager/profiles/desktop.nix       | 4 ++--
 modules/home-manager/profiles/shell-tools.nix   | 4 ++--
 modules/home-manager/programs/bash.nix          | 2 +-
 modules/home-manager/programs/eza.nix           | 2 +-
 modules/home-manager/programs/files.nix         | 2 +-
 modules/home-manager/programs/ghostty.nix       | 2 +-
 modules/home-manager/programs/git.nix           | 2 +-
 modules/home-manager/programs/onepassword.nix   | 2 +-
 modules/home-manager/programs/resticprofile.nix | 2 +-
 modules/home-manager/programs/sops.nix          | 4 ++--
 modules/home-manager/programs/ssh.nix           | 4 ++--
 modules/home-manager/programs/sublime.nix       | 2 +-
 modules/home-manager/programs/vscode.nix        | 2 +-
 modules/home-manager/programs/zsh.nix           | 2 +-
 modules/home-manager/rebuild.nix                | 2 +-
 modules/hosts/janus.nix                         | 2 +-
 modules/hosts/john-pc-ubuntu.nix                | 6 +++---
 modules/services/docker.nix                     | 4 ++--
 modules/users/john.nix                          | 8 ++++----
 20 files changed, 31 insertions(+), 31 deletions(-)

diff --git a/modules/home-manager/profiles/base.nix b/modules/home-manager/profiles/base.nix
index e979354..f20a369 100644
--- a/modules/home-manager/profiles/base.nix
+++ b/modules/home-manager/profiles/base.nix
@@ -1,8 +1,8 @@
 { inputs, pkgs, ... }:
 {
-  flake.homeModules.base = { pkgs, ... }:
+  flake.modules.homeManager.base = { pkgs, ... }:
   {
-    imports = with inputs.self.homeModules; [
+    imports = with inputs.self.modules.homeManager; [
       rebuild
       git
       shell-tools
diff --git a/modules/home-manager/profiles/desktop.nix b/modules/home-manager/profiles/desktop.nix
index a2d9062..6934501 100644
--- a/modules/home-manager/profiles/desktop.nix
+++ b/modules/home-manager/profiles/desktop.nix
@@ -1,9 +1,9 @@
 # This module is for programs with GUIs that run in a desktop environment
 { inputs, ... }:
 {
-  flake.homeModules.desktop = 
+  flake.modules.homeManager.desktop = 
     {
-      imports = with inputs.self.homeModules; [
+      imports = with inputs.self.modules.homeManager; [
         onepassword
         ghostty
         sublime
diff --git a/modules/home-manager/profiles/shell-tools.nix b/modules/home-manager/profiles/shell-tools.nix
index 669c84d..1c7c710 100644
--- a/modules/home-manager/profiles/shell-tools.nix
+++ b/modules/home-manager/profiles/shell-tools.nix
@@ -1,14 +1,14 @@
 # This module provides all the shell options
 { inputs, lib, ... }:
 {
-  flake.homeModules.shell-tools = { config, pkgs, ... }: {
+  flake.modules.homeManager.shell-tools = { config, pkgs, ... }: {
     options.shell.program = lib.mkOption {
       type = lib.types.enum [ "bash" "zsh" ];
       default = "zsh";
       description = "Which interactive shell configuration to enable.";
     };
 
-    imports = with inputs.self.homeModules; [
+    imports = with inputs.self.modules.homeManager; [
       bash
       zsh
 
diff --git a/modules/home-manager/programs/bash.nix b/modules/home-manager/programs/bash.nix
index 1b3a6bb..897939b 100644
--- a/modules/home-manager/programs/bash.nix
+++ b/modules/home-manager/programs/bash.nix
@@ -1,5 +1,5 @@
 {
-  flake.homeModules.bash = { pkgs, ... }:
+  flake.modules.homeManager.bash = { pkgs, ... }:
   {
     programs.bash = {
       enable = true;
diff --git a/modules/home-manager/programs/eza.nix b/modules/home-manager/programs/eza.nix
index 89df6bf..8419e7c 100644
--- a/modules/home-manager/programs/eza.nix
+++ b/modules/home-manager/programs/eza.nix
@@ -1,6 +1,6 @@
 { inputs, pkgs, lib, ... }:
 {
-  flake.homeModules.eza = { pkgs, lib, ... }: {
+  flake.modules.homeManager.eza = { pkgs, lib, ... }: {
     programs.eza = {
       enable = true;
       package = pkgs.eza;
diff --git a/modules/home-manager/programs/files.nix b/modules/home-manager/programs/files.nix
index 4d2f2ca..8cf7b83 100644
--- a/modules/home-manager/programs/files.nix
+++ b/modules/home-manager/programs/files.nix
@@ -1,5 +1,5 @@
 {
-  flake.homeModules.files = { pkgs, ... }:
+  flake.modules.homeManager.files = { pkgs, ... }:
   {
     programs.lf.enable = true;
     programs.lf.cmdKeybindings = {
diff --git a/modules/home-manager/programs/ghostty.nix b/modules/home-manager/programs/ghostty.nix
index 782cb1b..9594303 100644
--- a/modules/home-manager/programs/ghostty.nix
+++ b/modules/home-manager/programs/ghostty.nix
@@ -7,7 +7,7 @@
     };
   };
 
-  flake.homeModules.ghostty = { config, pkgs, lib, ... }:
+  flake.modules.homeManager.ghostty = { config, pkgs, lib, ... }:
   {
     home.sessionVariables = {
       TERMINAL = "ghostty";
diff --git a/modules/home-manager/programs/git.nix b/modules/home-manager/programs/git.nix
index 4ffd3a7..1dd7a97 100644
--- a/modules/home-manager/programs/git.nix
+++ b/modules/home-manager/programs/git.nix
@@ -1,5 +1,5 @@
 {
-  flake.homeModules.git = { config, lib, ... }:
+  flake.modules.homeManager.git = { config, lib, ... }:
   {
     programs.git = {
         enable = true;
diff --git a/modules/home-manager/programs/onepassword.nix b/modules/home-manager/programs/onepassword.nix
index 327052c..d51dee4 100644
--- a/modules/home-manager/programs/onepassword.nix
+++ b/modules/home-manager/programs/onepassword.nix
@@ -1,5 +1,5 @@
 {
-  flake.homeModules.onepassword = {
+  flake.modules.homeManager.onepassword = {
     # TODO: Port `_1password = true` behavior into an explicit Home Manager module.
   };
 }
\ No newline at end of file
diff --git a/modules/home-manager/programs/resticprofile.nix b/modules/home-manager/programs/resticprofile.nix
index a8dc4c6..7fabfa0 100644
--- a/modules/home-manager/programs/resticprofile.nix
+++ b/modules/home-manager/programs/resticprofile.nix
@@ -29,7 +29,7 @@
       };
     };
 
-  flake.homeModules.resticprofile = { config, lib, pkgs, ... }:
+  flake.modules.homeManager.resticprofile = { config, lib, pkgs, ... }:
     let
       cfg = config.programs.resticprofile;
       yamlFormat = pkgs.formats.yaml { };
diff --git a/modules/home-manager/programs/sops.nix b/modules/home-manager/programs/sops.nix
index 3b8ed41..620947e 100644
--- a/modules/home-manager/programs/sops.nix
+++ b/modules/home-manager/programs/sops.nix
@@ -11,8 +11,8 @@ in
   };
   
   # Define the homeModules that are used by flake-parts
-  # https://flake.parts/options/home-manager.html#opt-flake.homeModules
-  flake.homeModules.sops = { inputs, config, pkgs, lib, ... }:
+  # https://flake.parts/options/home-manager.html#opt-flake.modules.homeManager
+  flake.modules.homeManager.sops = { inputs, config, pkgs, lib, ... }:
   let
     sopsBin = lib.getExe pkgs.sops;
     sopsConfigPath = ../../../.sops.yaml;
diff --git a/modules/home-manager/programs/ssh.nix b/modules/home-manager/programs/ssh.nix
index d0f6ec7..cf1e858 100644
--- a/modules/home-manager/programs/ssh.nix
+++ b/modules/home-manager/programs/ssh.nix
@@ -11,12 +11,12 @@ in
       settings.KbdInteractiveAuthentication = false;
     };
 
-    home-manager.sharedModules = with inputs.self.homeModules; [
+    home-manager.sharedModules = with inputs.self.modules.homeManager; [
       ssh
     ];
   };
 
-  flake.homeModules.ssh = { pkgs, config, lib, ... }:
+  flake.modules.homeManager.ssh = { pkgs, config, lib, ... }:
   {
     options.ssh = {
       IdentityFile = lib.mkOption {
diff --git a/modules/home-manager/programs/sublime.nix b/modules/home-manager/programs/sublime.nix
index d79e36f..8929b7e 100644
--- a/modules/home-manager/programs/sublime.nix
+++ b/modules/home-manager/programs/sublime.nix
@@ -1,6 +1,6 @@
 { inputs, pkgs, ... }:
 {
-  flake.homeModules.sublime = { pkgs, lib, ... }: {
+  flake.modules.homeManager.sublime = { pkgs, lib, ... }: {
     home.packages = with pkgs; [
       sublime4
     ];
diff --git a/modules/home-manager/programs/vscode.nix b/modules/home-manager/programs/vscode.nix
index ac4642f..7d2c46b 100644
--- a/modules/home-manager/programs/vscode.nix
+++ b/modules/home-manager/programs/vscode.nix
@@ -1,5 +1,5 @@
 {
-  flake.homeModules.vscode = { pkgs, ... }:
+  flake.modules.homeManager.vscode = { pkgs, ... }:
   {
     programs.vscode = {
       enable = true;
diff --git a/modules/home-manager/programs/zsh.nix b/modules/home-manager/programs/zsh.nix
index 965b6e2..ec9133a 100644
--- a/modules/home-manager/programs/zsh.nix
+++ b/modules/home-manager/programs/zsh.nix
@@ -1,5 +1,5 @@
 {
-  flake.homeModules.zsh = { pkgs, config, ... }:
+  flake.modules.homeManager.zsh = { pkgs, config, ... }:
   {
     programs.zsh = {
       enable = true;
diff --git a/modules/home-manager/rebuild.nix b/modules/home-manager/rebuild.nix
index c12f976..5e5f90d 100644
--- a/modules/home-manager/rebuild.nix
+++ b/modules/home-manager/rebuild.nix
@@ -1,6 +1,6 @@
 { inputs, ... }:
 {
-  flake.homeModules.rebuild =
+  flake.modules.homeManager.rebuild =
     { pkgs, lib, config, ... }:
     {
       options = {
diff --git a/modules/hosts/janus.nix b/modules/hosts/janus.nix
index 8190c25..ccb7d84 100644
--- a/modules/hosts/janus.nix
+++ b/modules/hosts/janus.nix
@@ -13,7 +13,7 @@ in
       inputs.self.modules.nixos.docker
     ];
     home-manager.users."${username}" = {
-      imports = with inputs.self.homeModules; [
+      imports = with inputs.self.modules.homeManager; [
       ];
       docker.enable = true;
       ssh.matchSets = {
diff --git a/modules/hosts/john-pc-ubuntu.nix b/modules/hosts/john-pc-ubuntu.nix
index f2b6c74..88d23fb 100644
--- a/modules/hosts/john-pc-ubuntu.nix
+++ b/modules/hosts/john-pc-ubuntu.nix
@@ -1,7 +1,7 @@
 { inputs, ... }:
 {
-	flake.homeModules."john-pc-ubuntu" = { pkgs, config, ... }: {
-		imports = with inputs.self.homeModules; [
+	flake.modules.homeManager."john-pc-ubuntu" = { pkgs, config, ... }: {
+		imports = with inputs.self.modules.homeManager; [
 			john
 			desktop
 			docker
@@ -26,7 +26,7 @@
 	flake.homeConfigurations."john-pc-ubuntu" = inputs.home-manager.lib.homeManagerConfiguration {
 		pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
 		modules = [
-			inputs.self.homeModules."john-pc-ubuntu"
+			inputs.self.modules.homeManager."john-pc-ubuntu"
 
       # Include another inline module to set the options created through the jsl-home modules
       ({ config, ... }: {
diff --git a/modules/services/docker.nix b/modules/services/docker.nix
index aa7dfc4..75498b8 100644
--- a/modules/services/docker.nix
+++ b/modules/services/docker.nix
@@ -5,14 +5,14 @@
       enable = true;
     };
     home-manager.sharedModules = [
-      inputs.self.homeModules.docker
+      inputs.self.modules.homeManager.docker
     ];
     # users.users.john = {
     #   extraGroups = [ "docker" ];
     # };
   };
 
-  flake.homeModules.docker = { config, lib, pkgs, ... }:
+  flake.modules.homeManager.docker = { config, lib, pkgs, ... }:
   {
     options.docker = {
       enable = lib.mkEnableOption "Docker tools and utilities";
diff --git a/modules/users/john.nix b/modules/users/john.nix
index d6957bb..394f480 100644
--- a/modules/users/john.nix
+++ b/modules/users/john.nix
@@ -11,7 +11,7 @@ in
   flake.modules.nixos."${username}" = { pkgs, ... }: {
     home-manager.users."${username}" = {
       imports = [
-        inputs.self.homeModules."${username}"
+        inputs.self.modules.homeManager."${username}"
       ];
     };
     users.users."${username}" = {
@@ -26,7 +26,7 @@ in
     programs.zsh.enable = true;
   };
 
-  flake.homeModules."${username}" = {
+  flake.modules.homeManager."${username}" = {
     home.username = "${username}";
     home.homeDirectory = "/home/${username}";
     home.stateVersion = "25.11";
@@ -35,7 +35,7 @@ in
     programs.git.settings.user.name = "John Lancaster";
     programs.git.settings.user.email = "32917998+jsl12@users.noreply.github.com";
 
-    imports = with inputs.self.homeModules; [
+    imports = with inputs.self.modules.homeManager; [
       base
       # docker
 			# resticprofile
@@ -46,7 +46,7 @@ in
   flake.homeConfigurations."${username}" = inputs.home-manager.lib.homeManagerConfiguration {
 		pkgs = import inputs.nixpkgs { system = "x86_64-linux"; };
 		modules = [
-			inputs.self.homeModules."${username}"
+			inputs.self.modules.homeManager."${username}"
 
       # Include another inline module to set the options created through the jsl-home modules
       {