nix/os: tidy up hw/boot handling

nix/os/profiles/common/boot.nix

@@ -11,7 +11,14 @@
     version = 2;
   };
 
+  boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
   boot.tmpOnTmpfs = true;
+
+  # Workaround for nm-pptp to enforce module load
+  boot.kernelModules = [
+      "nf_conntrack_proto_gre"
+      "nf_conntrack_pptp"
+  ];
 }
 

nix/os/profiles/common/configuration.nix

@@ -6,5 +6,6 @@
     ./pkg.nix
     ./user.nix
     ./system.nix
+    ./hw.nix
   ];
 }

nix/os/profiles/common/hw.nix

@@ -0,0 +1,14 @@
+{ ... }:
+
+{
+  hardware.trackpoint.emulateWheel = true;
+
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "usb_storage"
+    "sd_mod"
+    "rtsx_pci_sdmmc"
+    "cryptd"
+  ];
+}

nix/os/profiles/graphical/boot.nix

@@ -0,0 +1,7 @@
+
+{ lib
+, ...
+}:
+
+{
+}

nix/os/profiles/graphical/configuration.nix

@@ -1,9 +1,11 @@
 { pkgs
-, ... 
+, ...
 }:
 
 {
-  imports = [ 
+  imports = [
+    ./boot.nix
     ./system.nix
+    ./hw.nix
   ];
 }

nix/os/profiles/graphical/hw.nix

@@ -0,0 +1,7 @@
+{
+...
+}:
+
+{
+  hardware.enableAllFirmware = true;
+}

nix/os/profiles/removable-medium/boot.nix

@@ -5,33 +5,5 @@
 {
   boot.loader.grub.efiInstallAsRemovable = lib.mkForce true;
   boot.loader.efi.canTouchEfiVariables = lib.mkForce false; 
-
-  boot.initrd.availableKernelModules = [ 
-    "xhci_pci"
-    "ahci"
-    "usb_storage"
-    "sd_mod"
-    "rtsx_pci_sdmmc"
-    "aes_x86_64"
-    "aesni_intel"
-    "cryptd"
-  ];
-
-  boot.kernelModules = [ 
-    "kvm-intel"
-
-    # Workaround for nm-pptp to enforce module load
-    "nf_conntrack_proto_gre"
-    "nf_conntrack_pptp"
-  ];
-
-  boot.extraModprobeConfig = ''
-    options kvm-intel nested=1
-    options kvm-intel enable_shadow_vmcs=1
-    options kvm-intel enable_apicv=1
-    options kvm-intel ept=1
-  '';
   boot.extraModulePackages = [ ];
-
-  boot.loader.systemd-boot.enable = true;
 }

nix/os/profiles/removable-medium/hw.nix

@@ -3,5 +3,4 @@
 {
   hardware.encryptedDisk.enable = true;
   hardware.enableAllFirmware = true;
-  hardware.trackpoint.emulateWheel = true;
 }