switch away from hardware-configuration.nix

2 files changed, 79 insertions, 9 deletions

diff --git a/configuration.nix b/configuration.nix
index d181fd5..74cae68 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -6,7 +6,7 @@
 	in
 {
 	imports = [ 
-		./hardware-configuration.nix
+		./hardware/basesystem.nix
 		./env.nix
 		./nix.nix
 		./packages.nix
@@ -57,13 +57,5 @@
 
 	programs.ssh.startAgent = true;
 
-	boot = {
-		kernelPackages = pkgs.linuxPackages_latest;
-		loader = {
-			systemd-boot.enable = true;
-			efi.canTouchEfiVariables = true;
-		};
-	};
-
 	system.stateVersion = "23.05";
 }
diff --git a/hardware/basesystem.nix b/hardware/basesystem.nix
new file mode 100644
index 0000000..e2b6ca7
--- /dev/null
+++ b/hardware/basesystem.nix
@@ -0,0 +1,78 @@
+{ config, lib, pkgs, modulesPath, ... }:
+
+{
+	imports =
+	[ (modulesPath + "/installer/scan/not-detected.nix")
+	];
+
+	boot = {
+  		initrd = {
+			availableKernelModules = [ "xhci_pci" "nvme" "rtsx_pci_sdmmc" ];
+  			kernelModules = [ ];
+			luks.devices."cryptroot".device = "/dev/disk/by-uuid/6700d662-29a9-4ea5-8ca6-85d42550b3ab";
+		};
+  		kernelModules = [ "kvm-intel" ];
+  		extraModulePackages = [ ];
+                kernelPackages = pkgs.linuxPackages_latest;
+                loader = {
+                        systemd-boot.enable = true;
+                        efi.canTouchEfiVariables = true;
+                };
+	};
+
+	fileSystems = {
+		"/" = {
+			device = "tmpfs";
+			fsType = "tmpfs";
+			options = [ "defaults" "size=2G" "mode=755" ]; 
+		};
+		"/nix" = {
+			device = "/dev/disk/by-label/nixos-root";
+			fsType = "btrfs";
+			options = [ "subvol=nix" "compress=zstd" ];
+		};
+		"/etc/NetworkManager" = {
+			device = "/dev/disk/by-label/nixos-root";
+      			fsType = "btrfs";
+      			options = [ "subvol=networkmanagerconfig" "compress=zstd" ];
+		};
+		"/etc/nixos" = {
+			device = "/dev/disk/by-label/nixos-root";
+      			fsType = "btrfs";
+      			options = [ "subvol=nixconfig" "compress=zstd" ];
+		};
+		"/srv" = {
+			device = "/dev/disk/by-label/nixos-root";
+      			fsType = "btrfs";
+      			options = [ "subvol=srv" "compress=zstd" ];
+    		};
+		"/home" = {
+			device = "/dev/disk/by-label/nixos-root";
+      			fsType = "btrfs";
+      			options = [ "subvol=home" "compress=zstd" ];
+    		};
+		"/srv/snapshots" = {
+			device = "/dev/disk/by-label/nixos-root";
+      			fsType = "btrfs";
+      			options = [ "subvol=snapshots" "compress=zstd" ];
+    		};
+		"/boot" = {
+			device = "/dev/disk/by-uuid/4064-2D6C";
+      			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.enp0s31f6.useDHCP = lib.mkDefault true;
+  # networking.interfaces.wlp3s0.useDHCP = lib.mkDefault true;
+
+  nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
+  powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+}