From c8697a67cad70842218e39d8cfaedba2036db3c9 Mon Sep 17 00:00:00 2001
From: roxwize <rae@roxwize.xyz>
Date: Tue, 17 Dec 2024 17:06:47 -0500
Subject: [PATCH] yay

---
 nixos/base.nix                     |  2 --
 nixos/flake.lock                   | 15 ++++++++-------
 nixos/flake.nix                    | 19 ++++++++-----------
 nixos/home.nix                     |  1 +
 nixos/hosts/qemu/configuration.nix |  1 -
 nixos/packages.nix                 |  1 +
 6 files changed, 18 insertions(+), 21 deletions(-)

diff --git a/nixos/base.nix b/nixos/base.nix
index c946927..da50be9 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -77,6 +77,4 @@
         hashedPassword = "$y$j9T$YPq.Kl8rss1JmJ5Vg6cHE/$2kdfzCkkhaO.I4u714EQnS/ZFert5byisiRVxtC.9G2";
         shell = pkgs.fish;
     };
-
-    system.copySystemConfiguration = true;
 }
diff --git a/nixos/flake.lock b/nixos/flake.lock
index 0c367ec..4db5986 100644
--- a/nixos/flake.lock
+++ b/nixos/flake.lock
@@ -7,31 +7,32 @@
         ]
       },
       "locked": {
-        "lastModified": 1734344598,
-        "narHash": "sha256-wNX3hsScqDdqKWOO87wETUEi7a/QlPVgpC/Lh5rFOuA=",
+        "lastModified": 1734366194,
+        "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "83ecd50915a09dca928971139d3a102377a8d242",
+        "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f",
         "type": "github"
       },
       "original": {
         "owner": "nix-community",
+        "ref": "release-24.11",
         "repo": "home-manager",
         "type": "github"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1734469883,
-        "narHash": "sha256-VILvYFwvFbW040V1QECCT+FuwRN14xjtDUcIrod3n2E=",
+        "lastModified": 1734323986,
+        "narHash": "sha256-m/lh6hYMIWDYHCAsn81CDAiXoT3gmxXI9J987W5tZrE=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "d2ac8a404cf537ec5cfc96f4388d7031e6aeb94f",
+        "rev": "394571358ce82dff7411395829aa6a3aad45b907",
         "type": "github"
       },
       "original": {
         "owner": "nixos",
-        "ref": "release-24.11",
+        "ref": "nixos-24.11",
         "repo": "nixpkgs",
         "type": "github"
       }
diff --git a/nixos/flake.nix b/nixos/flake.nix
index f381730..1193fce 100644
--- a/nixos/flake.nix
+++ b/nixos/flake.nix
@@ -2,9 +2,9 @@
     description = "rae's nixOS config flake";
 
     inputs = {
-        nixpkgs.url = "github:nixos/nixpkgs/release-24.11";
+        nixpkgs.url = "github:nixos/nixpkgs/nixos-24.11";
         home-manager = {
-            url = "github:nix-community/home-manager";
+            url = "github:nix-community/home-manager/release-24.11";
             inputs.nixpkgs.follows = "nixpkgs";
         };
     };
@@ -16,17 +16,14 @@
                 specialArgs = { inherit inputs; };
                 modules = [
                     ./hosts/qemu/configuration.nix
-                    home-manager.nixosModules.home-manager
-                    {
-                        home-manager = {
-                            useGlobalPkgs = true;
-                            useUserPackages = true;
-                            extraSpecialArgs = { inherit inputs; };
-                            users.rae = import ./home.nix;
-                        };
-                    }
                 ];
             };
         };
+
+        homeConfigurations.rae = home-manager.lib.homeManagerConfiguration {
+            pkgs = nixpkgs.legacyPackages.x86_64-linux;
+            extraSpecialArgs = { inherit inputs; };
+            modules = [ ./home.nix ];
+        };
     };
 }
diff --git a/nixos/home.nix b/nixos/home.nix
index 83152c1..d645b56 100644
--- a/nixos/home.nix
+++ b/nixos/home.nix
@@ -2,6 +2,7 @@
 {
     home = {
         stateVersion = "24.11";
+        username = "rae";
         sessionVariables = {
             BROWSER = "firefox";
             TERM = "kitty";
diff --git a/nixos/hosts/qemu/configuration.nix b/nixos/hosts/qemu/configuration.nix
index 83ef0d5..5512cd9 100644
--- a/nixos/hosts/qemu/configuration.nix
+++ b/nixos/hosts/qemu/configuration.nix
@@ -3,7 +3,6 @@
     imports = [
         ./hardware-configuration.nix
         ../../base.nix
-        ../../home.nix
     ];
 
     boot.loader = {
diff --git a/nixos/packages.nix b/nixos/packages.nix
index 6a36979..d5e47e3 100644
--- a/nixos/packages.nix
+++ b/nixos/packages.nix
@@ -8,6 +8,7 @@
         ffmpeg
         git
         gparted
+        home-manager
         hyfetch
         imagemagick
         kitty