From 18899163981717000f85d82f866802756d0e9950 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <alyraffauf@gmail.com>
Date: Tue, 12 Mar 2024 23:11:10 -0400
Subject: [PATCH] simplified home-mamager config in flake

---
 flake.nix             | 40 +++++++++++++++++-----------------------
 system/default.nix    |  3 +++
 users/aly/default.nix |  2 ++
 3 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/flake.nix b/flake.nix
index 9e1b7d7d..1b593964 100644
--- a/flake.nix
+++ b/flake.nix
@@ -39,6 +39,20 @@
   outputs = inputs@{ nixpkgs, home-manager, nixpkgs-unstable, home-manager-unstable, nixos-hardware, ... }: {
 
     nixosConfigurations = {
+
+      # # Framework 13 with AMD Ryzen 7640U and 32GB RAM.
+      # lavaridge = nixpkgs-unstable.lib.nixosSystem {
+      #   system = "x86_64-linux";
+      #   modules = [
+      #     ./hosts/lavaridge
+      #     ./desktop/gnome
+
+      #     # Add home-manager nixos module so home-manager config deploys on nixos-rebuild.
+      #     home-manager-unstable.nixosModules.home-manager
+      #     # nixos-hardware configuration for fw13-amd.
+      #     nixos-hardware.nixosModules.framework-13-7040-amd
+      #   ];
+      # };
       
       # T440p with i5-4210M and 16GB RAM.
       rustboro = nixpkgs-unstable.lib.nixosSystem {
@@ -46,15 +60,7 @@
         modules = [
           ./hosts/rustboro
           ./desktop/kde
-
-          # Add home-manager nixos module so home-manager config deploys on nixos-rebuild.
-          home-manager-unstable.nixosModules.home-manager {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.aly = import ./home/aly;
-          }
-
-          # nixos-hardware configuration for t440p
+          home-manager-unstable.nixosModules.home-manager
           nixos-hardware.nixosModules.lenovo-thinkpad-t440p
         ];
       };
@@ -65,13 +71,7 @@
         modules = [
           ./hosts/petalburg
           ./desktop/gnome
-
-          # Add home-manager nixos module so home-manager config deploys on nixos-rebuild.
-          home-manager-unstable.nixosModules.home-manager {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.aly = import ./home/aly;
-          }
+          home-manager-unstable.nixosModules.home-manager
           nixos-hardware.nixosModules.common-pc-laptop-ssd
           nixos-hardware.nixosModules.common-cpu-intel
         ];
@@ -85,13 +85,7 @@
           ./desktop/gnome
           ./modules/homelab
           ./modules/steam
-
-          # Add home-manager nixos module so home-manager config deploys on nixos-rebuild.
-          home-manager-unstable.nixosModules.home-manager {
-            home-manager.useGlobalPkgs = true;
-            home-manager.useUserPackages = true;
-            home-manager.users.aly = import ./home/aly;
-          }
+          home-manager-unstable.nixosModules.home-manager
         ];
       };
     };
diff --git a/system/default.nix b/system/default.nix
index e994d5a9..7316c6c4 100644
--- a/system/default.nix
+++ b/system/default.nix
@@ -63,4 +63,7 @@
   '';
 
   nix.settings.experimental-features = [ "nix-command" "flakes" ];
+
+  home-manager.useGlobalPkgs = true;
+  home-manager.useUserPackages = true;
 }
diff --git a/users/aly/default.nix b/users/aly/default.nix
index 0ceedd10..e0e72f25 100644
--- a/users/aly/default.nix
+++ b/users/aly/default.nix
@@ -7,4 +7,6 @@
     description = "Aly Raffauf";
     extraGroups = [ "networkmanager" "wheel" "docker" "libvirtd" ];
   };
+
+  home-manager.users.aly = import ../../home/aly;
 }