wip

flake.nix

@@ -2,7 +2,7 @@
   description = "A very basic flake";
 
   inputs = {
-    nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
+    nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
 
     home-manager = {
       url = "github:nix-community/home-manager";
@@ -25,28 +25,24 @@
     nixosConfigurations.z790prors-nix = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
-      modules = [ ./machines/z790prors/configuration.nix ];
+      modules = [ 
+        ./machines/z790prors/configuration.nix 
+      ];
     };
 
     nixosConfigurations.nix-book = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       specialArgs = { inherit inputs; };
-      modules = [ ./machines/nix-book/configuration.nix ];
-    };
-
-    homeConfigurations = let
-      system = "x86_64-linux";
-      pkgs = nixpkgs.legacyPackages.${system};
-    in {
-      "johno@nix-book" = inputs.home-manager.lib.homeManagerConfiguration {
-        inherit pkgs;
-
-        extraSpecialArgs = { inherit inputs; };
-        modules = [
-          inputs.hyprland.homeManagerModules.default
-          /home/johno/.config/home-manager/home-nix-book.nix
-        ];
-      };
+      modules = [
+        ./machines/nix-book/configuration.nix
+	inputs.hyprland.homeManagerModules.default
+        inputs.home-manager.nixosModules.home-manager
+        {
+          inputs.home-manager.useGlobalPkgs = true;
+          inputs.home-manager.useUserPackages = true;
+          inputs.home-manager.extraSpecialArgs = { inherit inputs; };
+        }
+      ];
     };
   };
 }