From 507da92a6ea3dab22718d4197a2453efa5a86dc8 Mon Sep 17 00:00:00 2001
From: ElnuDev <elnu@elnu.com>
Date: Sun, 16 Oct 2022 11:41:45 -0700
Subject: [PATCH] Make home-manager declarations more clean

---
 hosts/default.nix | 52 +++++++++++++++++++++++++----------------------
 1 file changed, 28 insertions(+), 24 deletions(-)

diff --git a/hosts/default.nix b/hosts/default.nix
index 8aa0b1d..f3eed93 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -24,14 +24,16 @@ in
         networking.hostName = "x220";
       }
       home-manager.nixosModules.home-manager {
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = { inherit user; };
-        home-manager.users.${user} = {
-          imports = [
-            (import ./home.nix)
-            (import ./thinkpads/home.nix)
-          ];
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          extraSpecialArgs = { inherit user; };
+          users.${user} = {
+            imports = [
+              (import ./home.nix)
+              (import ./thinkpads/home.nix)
+            ];
+          };
         };
       }
     ];
@@ -51,14 +53,14 @@ in
       home-manager.nixosModules.home-manager {
         home-manager = {
           useGlobalPkgs = true;
-        };
-        home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = { inherit user; };
-        home-manager.users.${user} = {
-          imports = [
-            (import ./home.nix)
-            (import ./thinkpads/home.nix)
-          ];
+          useUserPackages = true;
+          extraSpecialArgs = { inherit user; };
+          users.${user} = {
+            imports = [
+              (import ./home.nix)
+              (import ./thinkpads/home.nix)
+            ];
+          };
         };
       }
     ];
@@ -75,14 +77,16 @@ in
         networking.hostName = "virtualbox";
       }
       home-manager.nixosModules.home-manager {
-        home-manager.useGlobalPkgs = true;
-        home-manager.useUserPackages = true;
-        home-manager.extraSpecialArgs = { inherit user; };
-        home-manager.users.${user} = {
-          imports = [
-            (import ./home.nix)
-            (import ./virtualbox/home.nix)
-          ];
+        home-manager = {
+          useGlobalPkgs = true;
+          useUserPackages = true;
+          extraSpecialArgs = { inherit user; };
+          users.${user} = {
+            imports = [
+              (import ./home.nix)
+              (import ./virtualbox/home.nix)
+            ];
+          };
         };
       }
     ];