From 5e1eaac35cacd2f474f156c8c1c3dc7c1707a427 Mon Sep 17 00:00:00 2001
From: Greg Hellings <greg.hellings@gmail.com>
Date: Wed, 25 May 2022 01:32:08 -0500
Subject: [PATCH] Tidy up flake args

---
 flake.nix | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/flake.nix b/flake.nix
index 77a65e6..c114d0a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -15,28 +15,29 @@
 		nur.url = "github:nix-community/NUR";
 	};
 
-	outputs = inputs:
+	outputs = {nixpkgs, nixunstable, agenix, home-manager, nur, self}@inputs:
 	let
 		local_overlay = import ./overlays;
 
 		mods = hostname: [
-			{ nixpkgs.overlays = [ inputs.nur.overlay local_overlay ]; }
-			inputs.agenix.nixosModule
+			{ nixpkgs.overlays = [ nur.overlay local_overlay ]; }
+			agenix.nixosModule
 			./modules
 			./profiles/base
 			./hosts/${hostname}
-			inputs.home-manager.nixosModules.home-manager {
+			home-manager.nixosModules.home-manager {
 				home-manager.useGlobalPkgs = true;
+				home-manager.useUserPackages = true;
 				home-manager.users.greg = import ./home/home.nix  "greg";
 				home-manager.users.root = import ./home/home.nix  "root";
 				home-manager.extraSpecialArgs = {
-					nixunstable = inputs.nixunstable;
+					inherit nixunstable;
 				};
 			}
 		];
 
-		machine = system: name: inputs.nixpkgs.lib.nixosSystem {
-			system = system;
+		machine = system: name: nixpkgs.lib.nixosSystem {
+			inherit system;
 			specialArgs = inputs;
 			modules = mods name;
 		};