Make home-manager declarations more clean

hosts/default.nix

@@ -24,15 +24,17 @@ in
         networking.hostName = "x220";
       }
       home-manager.nixosModules.home-manager {
-        home-manager.useGlobalPkgs = true;
+        home-manager = {
-        home-manager.useUserPackages = true;
+          useGlobalPkgs = true;
-        home-manager.extraSpecialArgs = { inherit user; };
+          useUserPackages = true;
-        home-manager.users.${user} = {
+          extraSpecialArgs = { inherit user; };
+          users.${user} = {
             imports = [
               (import ./home.nix)
               (import ./thinkpads/home.nix)
             ];
           };
+        };
       }
     ];
   };
@@ -51,15 +53,15 @@ in
       home-manager.nixosModules.home-manager {
         home-manager = {
           useGlobalPkgs = true;
-        };
+          useUserPackages = true;
-        home-manager.useUserPackages = true;
+          extraSpecialArgs = { inherit user; };
-        home-manager.extraSpecialArgs = { inherit user; };
+          users.${user} = {
-        home-manager.users.${user} = {
             imports = [
               (import ./home.nix)
               (import ./thinkpads/home.nix)
             ];
           };
+        };
       }
     ];
   };
@@ -75,15 +77,17 @@ in
         networking.hostName = "virtualbox";
       }
       home-manager.nixosModules.home-manager {
-        home-manager.useGlobalPkgs = true;
+        home-manager = {
-        home-manager.useUserPackages = true;
+          useGlobalPkgs = true;
-        home-manager.extraSpecialArgs = { inherit user; };
+          useUserPackages = true;
-        home-manager.users.${user} = {
+          extraSpecialArgs = { inherit user; };
+          users.${user} = {
             imports = [
               (import ./home.nix)
               (import ./virtualbox/home.nix)
             ];
           };
+        };
       }
     ];
   };