From 7d4f997c184ae62d080a261026ec41340cf2ba79 Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Sun, 8 Mar 2026 11:07:12 -0500
Subject: [PATCH] WIP started reorg for absorbing john-pc-ubuntu

---
 modules/home-manager/home.nix                 |  5 ++++
 modules/home-manager/onepassword.nix          |  5 ++++
 modules/home-manager/sublime.nix              |  5 ++++
 .../home-manager/{user.nix => users/john.nix} |  0
 modules/home-manager/users/sydney.nix         |  5 ++++
 modules/hosts/john-pc-ubuntu.nix              | 24 +++++++++++++++++++
 6 files changed, 44 insertions(+)
 create mode 100644 modules/home-manager/home.nix
 create mode 100644 modules/home-manager/onepassword.nix
 create mode 100644 modules/home-manager/sublime.nix
 rename modules/home-manager/{user.nix => users/john.nix} (100%)
 create mode 100644 modules/home-manager/users/sydney.nix
 create mode 100644 modules/hosts/john-pc-ubuntu.nix

diff --git a/modules/home-manager/home.nix b/modules/home-manager/home.nix
new file mode 100644
index 0000000..836bbad
--- /dev/null
+++ b/modules/home-manager/home.nix
@@ -0,0 +1,5 @@
+{
+  flake.homeModules.home = {
+    # TODO: Port custom settings from the old top-level ./home.nix into here.
+  };
+}
\ No newline at end of file
diff --git a/modules/home-manager/onepassword.nix b/modules/home-manager/onepassword.nix
new file mode 100644
index 0000000..327052c
--- /dev/null
+++ b/modules/home-manager/onepassword.nix
@@ -0,0 +1,5 @@
+{
+  flake.homeModules.onepassword = {
+    # TODO: Port `_1password = true` behavior into an explicit Home Manager module.
+  };
+}
\ No newline at end of file
diff --git a/modules/home-manager/sublime.nix b/modules/home-manager/sublime.nix
new file mode 100644
index 0000000..fd2ea86
--- /dev/null
+++ b/modules/home-manager/sublime.nix
@@ -0,0 +1,5 @@
+{
+  flake.homeModules.sublime = {
+    # TODO: Port `graphical.sublime = true` into an explicit Home Manager module.
+  };
+}
\ No newline at end of file
diff --git a/modules/home-manager/user.nix b/modules/home-manager/users/john.nix
similarity index 100%
rename from modules/home-manager/user.nix
rename to modules/home-manager/users/john.nix
diff --git a/modules/home-manager/users/sydney.nix b/modules/home-manager/users/sydney.nix
new file mode 100644
index 0000000..327052c
--- /dev/null
+++ b/modules/home-manager/users/sydney.nix
@@ -0,0 +1,5 @@
+{
+  flake.homeModules.onepassword = {
+    # TODO: Port `_1password = true` behavior into an explicit Home Manager module.
+  };
+}
\ No newline at end of file
diff --git a/modules/hosts/john-pc-ubuntu.nix b/modules/hosts/john-pc-ubuntu.nix
new file mode 100644
index 0000000..9429044
--- /dev/null
+++ b/modules/hosts/john-pc-ubuntu.nix
@@ -0,0 +1,24 @@
+{ inputs, ... }:
+{
+	flake.homeModules."john-pc-ubuntu" = {
+		imports = with inputs.self.homeModules; [
+			desktop
+			home
+			onepassword
+			sublime
+			# resticprofile
+		];
+
+		# TODO: Add host-specific settings here:
+		# - sops secret for `restic_password/john_ubuntu`
+		# - resticprofile profile definition
+		# - zsh RESTIC* session variables
+	};
+
+	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"
+		];
+	};
+}