From af5148cf2ead4abc2cfb8a4f489dc45e0ddb19f7 Mon Sep 17 00:00:00 2001
From: blake <me@blakedheld.xyz>
Date: Sun, 5 Oct 2025 10:14:51 -0500
Subject: [PATCH] restructure home manager now that I understand it kinda:

---
 flake.nix             | 28 ++++++----------------------
 users/blake/blake.nix | 13 ++++++++++++-
 2 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index b30039b..036e682 100644
--- a/flake.nix
+++ b/flake.nix
@@ -19,34 +19,18 @@
     {
       nixosConfigurations = { 
         snowbelle = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
+          extraSpecialArgs = { inherit inputs; };
           modules = [
             ./hosts/snowbelle/configuration.nix
-            home-manager.nixosModules.home-manager
-            {
-              home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users.blake = import ./users/blake/home.nix;
-              backupFileExtension = "hmbak";
-              };
-             }
-          ];
+            inputs.home-manager.nixosModules.default
+         ];
         };
         vaniville = nixpkgs.lib.nixosSystem {
-          specialArgs = { inherit inputs; };
+          extraSpecialArgs = { inherit inputs; };
           modules = [
             ./hosts/vaniville/configuration.nix
-            home-manager.nixosModules.home-manager
-            {
-              home-manager = {
-              useGlobalPkgs = true;
-              useUserPackages = true;
-              users.blake = import ./users/blake/home.nix;
-              backupFileExtension = "hmbak";
-              };
-             }
-          ];
+            inputs.home-manager.nixosModules.default
+         ];
         };
 
       };
diff --git a/users/blake/blake.nix b/users/blake/blake.nix
index 97a1911..1b39f0d 100644
--- a/users/blake/blake.nix
+++ b/users/blake/blake.nix
@@ -1,9 +1,12 @@
-{ config, lib, pkgs, ... }:
+{ config, lib, pkgs, inputs, ... }:
+
 
 let
   cfg = config.users.blake;
 in
 {
+  imports = [ inputs.home-manager.nixosModules.default];
+
   options.users.blake = {
     enable = lib.mkEnableOption "enable blake user";
     username = lib.mkOption {
@@ -29,6 +32,14 @@ in
       ];
     };
 
+    # define home-manager user
+    home-manager = {
+      extraSpecialArgs = { inherit inputs; };
+      users = {
+        "blake" = import ./home.nix;
+      };
+    };
+
     # define blake group
     users.groups.blake = {
       gid = 1000;