merge files from new install

5 files changed, 64 insertions, 2 deletions

diff --git a/hosts/common/users.nix b/hosts/common/users.nix
index e2e845e..406a91f 100644
--- a/hosts/common/users.nix
+++ b/hosts/common/users.nix
@@ -13,7 +13,7 @@
 				home = "/root";
 				uid = config.ids.uids.root;
 				group = "root";
-				initialHashedPassword = lib.mkDefault "!";
+				initialHashedPassword = "***REMOVED***";
 			};
 		};
 	};
diff --git a/hosts/glados/boot.nix b/hosts/glados/boot.nix
index e856fb1..b56de59 100644
--- a/hosts/glados/boot.nix
+++ b/hosts/glados/boot.nix
@@ -19,5 +19,6 @@
 			enable = true;
 			pkiBundle = "/etc/secureboot";
 		};
+		supportedFilesystems = ["zfs" "ntfs"];
 	};
 }
diff --git a/hosts/glados/default.nix b/hosts/glados/default.nix
index 3a5e2a0..63bcdc0 100644
--- a/hosts/glados/default.nix
+++ b/hosts/glados/default.nix
@@ -3,6 +3,7 @@ _: {
 		../common/desktop/gnome.nix
 		../common/hardware/nvidia.nix
 		./boot.nix
+		./hardware-configuration.nix
 		./network.nix
 		./packages.nix
 		./services.nix
diff --git a/hosts/glados/hardware-configuration.nix b/hosts/glados/hardware-configuration.nix
new file mode 100644
index 0000000..9b000ba
--- /dev/null
+++ b/hosts/glados/hardware-configuration.nix
@@ -0,0 +1,60 @@
+# Do not modify this file!  It was generated by ‘nixos-generate-config’
+# and may be overwritten by future invocations.  Please make changes
+# to /etc/nixos/configuration.nix instead.
+{
+	config,
+	lib,
+	pkgs,
+	modulesPath,
+	...
+}: {
+	imports = [
+		(modulesPath + "/installer/scan/not-detected.nix")
+	];
+
+	boot.initrd.availableKernelModules = ["xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod"];
+	boot.initrd.kernelModules = [];
+	boot.kernelModules = ["kvm-amd"];
+	boot.extraModulePackages = [];
+
+	fileSystems."/" = {
+		device = "rpool/nixos/root";
+		fsType = "zfs";
+		options = ["zfsutil" "X-mount.mkdir"];
+	};
+
+	fileSystems."/home" = {
+		device = "rpool/nixos/home";
+		fsType = "zfs";
+		options = ["zfsutil" "X-mount.mkdir"];
+	};
+
+	fileSystems."/nix" = {
+		device = "rpool/nixos/nixstore";
+		fsType = "zfs";
+		options = ["zfsutil" "X-mount.mkdir"];
+	};
+
+	fileSystems."/var/log" = {
+		device = "rpool/nixos/var/log";
+		fsType = "zfs";
+		options = ["zfsutil" "X-mount.mkdir"];
+	};
+
+	fileSystems."/boot" = {
+		device = "/dev/disk/by-uuid/5B1B-6423";
+		fsType = "vfat";
+	};
+
+	swapDevices = [];
+
+	# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
+	# (the default) this is the recommended approach. When using systemd-networkd it's
+	# still possible to use this option, but it's recommended to use it in conjunction
+	# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
+	networking.useDHCP = lib.mkDefault true;
+	# networking.interfaces.enp4s0.useDHCP = lib.mkDefault true;
+
+	nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+	hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}
diff --git a/hosts/glados/network.nix b/hosts/glados/network.nix
index 021a1e9..aef7253 100644
--- a/hosts/glados/network.nix
+++ b/hosts/glados/network.nix
@@ -1,6 +1,6 @@
 _: {
 	networking = {
-		hostId = "replace_me";
+		hostId = "2bf6e602";
 		networkmanager = {
 			enable = true;
 			dns = "systemd-resolved";