Merge branch 'main' of gh:greg-hellings/nixos-config

hosts/default.nix

@@ -1,14 +1,18 @@
 { inputs, overlays, ... }:
 let
 	wsl = args: (unstable (args // { extraMods = [ inputs.wsl.nixosModules.wsl ]; }));
-	unstable = args: (machine (args // { channel = inputs.nixunstable; }));
+	unstable = args: (machine (args // {
+		channel = inputs.nixunstable;
+		hm = inputs.hmunstable;
+	}));
 	machine = {
 		channel ? inputs.nixstable,
 		extraMods ? [],
 		gnome ? false,
 		gui ? false,
 		name,
-		system ? "x86_64-linux"
+		system ? "x86_64-linux",
+		hm ? inputs.hm
 	}:
 	let
 		nixpkgs = import channel {
@@ -30,7 +34,7 @@ let
 				};
 			}
 			inputs.agenix.nixosModules.default
-			inputs.hm.nixosModules.home-manager
+			hm.nixosModules.home-manager
 			../modules-all
 			../modules-linux
 			./${name}

hosts/jude/boot.nix

@@ -2,7 +2,6 @@
 
 {
 	# Use the systemd-boot EFI boot loader.
-	#boot.loader.systemd-boot.enable = true;
 	boot = {
 		supportedFilesystems = [ "ntfs" ];
 		loader = {
@@ -31,5 +30,4 @@
 			#efi.canTouchEfiVariables = true;
 		};
 	};
-	networking.interfaces.enp4s0.useDHCP = true;
 }

hosts/jude/default.nix

@@ -16,8 +16,8 @@
 	networking = {
 		hostName = "jude";
 		enableIPv6 = false;
+		interfaces.enp37s0.useDHCP = true;
 	};
-	#systemd.oomd.enable = false;
 	greg = {
 		tailscale.enable = true;
 		gnome.enable = true;