make some shared boot/hardware settings universal

machines/desko/default.nix

@@ -8,7 +8,6 @@
   sane.services.duplicity.enable = true;
   sane.impermanence.enable = true;
 
-  boot.loader.generic-extlinux-compatible.enable = true;
   boot.loader.efi.canTouchEfiVariables = false;
   sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
 

machines/lappy/default.nix

@@ -7,7 +7,6 @@
   # sane.users.guest.enable = true;
   sane.gui.sway.enable = true;
   sane.impermanence.enable = true;
-  boot.loader.generic-extlinux-compatible.enable = true;
   boot.loader.efi.canTouchEfiVariables = false;
   sane.image.extraBootFiles = [ pkgs.bootpart-uefi-x86_64 ];
 

machines/servo/default.nix

@@ -27,7 +27,7 @@
   sane.impermanence.enable = true;
   sane.services.duplicity.enable = true;
 
-  # TODO: validate this
+  # TODO: look into the EFI stuff
   boot.loader.grub.enable = false;
   boot.loader.generic-extlinux-compatible.enable = true;
   boot.loader.efi.canTouchEfiVariables = false;

machines/servo/hardware.nix

@@ -3,9 +3,6 @@
 { pkgs, ... }:
 
 {
-  # enables non-free firmware
-  hardware.enableRedistributableFirmware = true;
-
   # i changed this becuse linux 5.10 didn't have rpi-400 device tree blob.
   # nixos-22.05 linux 5.15 DOES have these now.
   # it should be possible to remove this if desired, but i'm not sure how the rpi-specific kernel differs.
@@ -38,16 +35,6 @@
     "xhci_pci_renesas"
   ];
   # boot.initrd.compressor = "gzip";  # defaults to zstd
-  # hack in the `boot.shell_on_fail` arg since it doesn't seem to work otherwise
-  boot.initrd.preFailCommands = "allowShell=1";
-  # default: 4 (warn). 7 is debug
-  boot.consoleLogLevel = 7;
-  # boot.kernelParams = [
-  #   "boot.shell_on_fail"
-  #   # "boot.trace"
-  #   # "systemd.log_level=debug"
-  #   # "systemd.log_target=console"
-  # ];
 
   # ondemand power scaling keeps the cpu at low frequency when idle, and sets to max frequency
   # when load is detected. (v.s. the "performance" default, which always uses the max frequency)

modules/hardware/all.nix

@@ -0,0 +1,40 @@
+{ lib, pkgs, ... }:
+
+{
+  boot.initrd.supportedFilesystems = [ "ext4" "btrfs" "ext2" "ext3" "vfat" ];
+  # useful emergency utils
+  boot.initrd.extraUtilsCommands = ''
+    copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfstune
+  '';
+  boot.kernelParams = [ "boot.shell_on_fail" ];
+  # other kernelParams:
+  #   "boot.trace"
+  #   "systemd.log_level=debug"
+  #   "systemd.log_target=console"
+
+  # hack in the `boot.shell_on_fail` arg since that doesn't always seem to work.
+  boot.initrd.preFailCommands = "allowShell=1";
+
+  # default: 4 (warn). 7 is debug
+  boot.consoleLogLevel = 7;
+
+  boot.loader.grub.enable = lib.mkDefault false;
+  boot.loader.generic-extlinux-compatible.enable = lib.mkDefault true;
+
+  # non-free firmware
+  hardware.enableRedistributableFirmware = true;
+  services.fwupd.enable = true;
+
+  # powertop will default to putting USB devices -- including HID -- to sleep after TWO SECONDS
+  powerManagement.powertop.enable = false;
+
+  # services.snapper.configs = {
+  #   root = {
+  #     subvolume = "/";
+  #     extraConfig = {
+  #       ALLOW_USERS = "colin";
+  #     };
+  #   };
+  # };
+  # services.snapper.snapshotInterval = "daily";
+}

modules/hardware/default.nix

@@ -2,6 +2,7 @@
 
 {
   imports = [
+    ./all.nix
     ./x86_64.nix
   ];
 }

modules/hardware/x86_64.nix

@@ -1,7 +1,8 @@
-{ lib, pkgs, config, ... }:
+{ lib, pkgs, ... }:
 
 with lib;
 {
+  # TODO: some of this might generalize beyond just x86
   config = mkIf (pkgs.system == "x86_64-linux") { 
     boot.initrd.availableKernelModules = [
       "xhci_pci" "ahci" "sd_mod" "sdhci_pci"  # nixos-generate-config defaults
@@ -10,42 +11,18 @@ with lib;
       # efi_pstore evivars
     ];
     boot.initrd.kernelModules = [ ];
-    boot.initrd.supportedFilesystems = [ "ext4" "btrfs" "ext2" "ext3" "vfat" ];
-    # useful emergency utils
-    boot.initrd.extraUtilsCommands = ''
-      copy_bin_and_libs ${pkgs.btrfs-progs}/bin/btrfstune
-    '';
     boot.extraModulePackages = [ ];
-    boot.kernelParams = [ "boot.shell_on_fail" ];
-    boot.consoleLogLevel = 7;
-
-    boot.loader.grub.enable = false;
-    # boot.loader.generic-extlinux-compatible.enable = true;
 
     # enable cross compilation
     boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
     # nixpkgs.crossSystem.system = "aarch64-linux";
 
     powerManagement.cpuFreqGovernor = "powersave";
-    hardware.enableRedistributableFirmware = true;
     hardware.cpu.amd.updateMicrocode = true;    # desktop
     hardware.cpu.intel.updateMicrocode = true;  # laptop
-    services.fwupd.enable = true;
-    # powertop will default to putting USB devices -- including HID -- to sleep after TWO SECONDS
-    powerManagement.powertop.enable = false;
 
     hardware.opengl.driSupport = true;
     # For 32 bit applications
     hardware.opengl.driSupport32Bit = true;
-
-    # services.snapper.configs = {
-    #   root = {
-    #     subvolume = "/";
-    #     extraConfig = {
-    #       ALLOW_USERS = "colin";
-    #     };
-    #   };
-    # };
-    # services.snapper.snapshotInterval = "daily";
   };
 }