From 8b95e6e0a092122d83f964b28b138cc766037a33 Mon Sep 17 00:00:00 2001
From: Simon Gardling <titaniumtown@proton.me>
Date: Mon, 7 Apr 2025 21:34:13 -0400
Subject: [PATCH] fix unified config

---
 flake.nix               | 38 ++++++++++++++++++++++----------------
 home-manager/no-gui.nix |  6 ------
 2 files changed, 22 insertions(+), 22 deletions(-)

diff --git a/flake.nix b/flake.nix
index f86e2ec..7c23d9d 100644
--- a/flake.nix
+++ b/flake.nix
@@ -66,21 +66,21 @@
         "yarn"
       ];
 
-      inputs.nixpkgs =
-        (import nixpkgs {
-        }).applyPatches
-          {
-            name = "nixpkgs";
-            src = inputs.nixpkgs;
-            patches = [
-              # https://github.com/NixOS/nixpkgs/pull/67576
-              # gimp 3.0
-              (builtins.fetchurl {
-                url = "https://github.com/NixOS/nixpkgs/pull/67576.diff";
-                sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia";
-              })
-            ];
-          };
+      # pkgs =
+      #   (import nixpkgs {
+      #   }).applyPatches
+      #     {
+      #       name = "nixpkgs";
+      #       src = inputs.nixpkgs;
+      #       patches = [
+      #         # https://github.com/NixOS/nixpkgs/pull/67576
+      #         # gimp 3.0
+      #         (builtins.fetchurl {
+      #           url = "https://github.com/NixOS/nixpkgs/pull/67576.diff";
+      #           sha256 = "1idkhfirjba6iywkddyhm980x44kfl9lmp51cyfqrpbq7wlzpnia";
+      #         })
+      #       ];
+      #     };
     in
     {
       formatter.${system} = nixpkgs.legacyPackages.${system}.nixfmt-rfc-style;
@@ -97,7 +97,13 @@
               (
                 { ... }:
                 {
-                  home-manager = import ./home-manager/home-${hostname}.nix { inherit inputs hostname username; };
+                  # home-manager.useGlobalPkgs = true;
+                  home-manager.useUserPackages = true;
+                  home-manager.extraSpecialArgs = {
+                    inherit inputs hostname username;
+                    homeDirectory = "/home/${username}";
+                  };
+                  home-manager.users.${username} = import ./home-manager/home-${hostname}.nix;
                 }
               )
               ./etcnixos/system-${hostname}.nix
diff --git a/home-manager/no-gui.nix b/home-manager/no-gui.nix
index d1abe5c..3363777 100644
--- a/home-manager/no-gui.nix
+++ b/home-manager/no-gui.nix
@@ -56,12 +56,6 @@ in
         nixpkgs.overlays = [
           inputs.rust-overlay.overlays.default
         ];
-
-        # home-manager stuff
-        home = {
-          inherit username;
-          homeDirectory = "/home/${username}";
-        };
       }
     )
   ];