[altair] Cleans up hardware config

system/hosts/altair/hardware-configuration.nix

@@ -13,38 +13,46 @@
     (modulesPath + "/installer/scan/not-detected.nix")
   ];
   # Bootloader.
-  boot.loader.systemd-boot.enable = true;
+  boot = {
-  boot.loader.efi.canTouchEfiVariables = true;
+    loader = {
+      systemd-boot.enable = true;
+      efi.canTouchEfiVariables = true;
+    };
 
-  boot.initrd.availableKernelModules = [
+    initrd = {
-    "xhci_pci"
+      availableKernelModules = [
-    "ahci"
+        "xhci_pci"
-    "nvme"
+        "ahci"
-    "usbhid"
+        "nvme"
-    "usb_storage"
+        "usbhid"
-    "sd_mod"
+        "usb_storage"
-  ];
+        "sd_mod"
-  boot.initrd.kernelModules = [ ];
+      ];
-  boot.kernelModules = [ "kvm-intel" ];
+      kernelModules = [ ];
-  boot.extraModulePackages = [ ];
+    };
-
+    kernelModules = [ "kvm-intel" ];
-  fileSystems."/" = {
+    extraModulePackages = [ ];
-    device = "/dev/disk/by-uuid/343c0ac5-3973-49b3-964a-6ad90c36b89c";
-    fsType = "ext4";
   };
 
-  fileSystems."/boot" = {
+  fileSystems = {
-    device = "/dev/disk/by-uuid/5F99-043D";
+    "/" = {
-    fsType = "vfat";
+      device = "/dev/disk/by-uuid/343c0ac5-3973-49b3-964a-6ad90c36b89c";
-    options = [
+      fsType = "ext4";
-      "fmask=0077"
+    };
-      "dmask=0077"
-    ];
-  };
 
-  fileSystems."/home" = {
+    "/boot" = {
-    device = "/dev/disk/by-uuid/28f4fb41-9414-4504-a767-c2e8bf5eb2c8";
+      device = "/dev/disk/by-uuid/5F99-043D";
-    fsType = "ext4";
+      fsType = "vfat";
+      options = [
+        "fmask=0077"
+        "dmask=0077"
+      ];
+    };
+
+    "/home" = {
+      device = "/dev/disk/by-uuid/28f4fb41-9414-4504-a767-c2e8bf5eb2c8";
+      fsType = "ext4";
+    };
   };
 
   swapDevices = [ ];
@@ -58,47 +66,47 @@
   # networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
 
   nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  # Graphics settings
-  hardware.graphics = {
-    enable = true;
-    enable32Bit = true;
-  };
 
   services.xserver.videoDrivers = [ "nvidia" ];
 
-  hardware.nvidia = {
+  hardware = {
-    # Other options include:
+    cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-    # stable - Current stable
+    graphics = {
-    # production - Same as stable
+      enable = true;
-    # latest - Bleeding edge
+      enable32Bit = true;
-    # beta - latest beta
+    };
-    #
+    nvidia = {
-    # See https://nixos.wiki/wiki/Nvidia
+      # Other options include:
-    #
+      # stable - Current stable
-    # Current versions can be found in https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/os-specific/linux/nvidia-x11/default.nix
+      # production - Same as stable
-    #
+      # latest - Bleeding edge
-    package = config.boot.kernelPackages.nvidiaPackages.production;
+      # beta - latest beta
+      #
+      # See https://nixos.wiki/wiki/Nvidia
+      #
+      # Current versions can be found in https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/os-specific/linux/nvidia-x11/default.nix
+      #
+      package = config.boot.kernelPackages.nvidiaPackages.beta;
 
-    modesetting.enable = true;
+      modesetting.enable = true;
 
-    # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
+      # Nvidia power management. Experimental, and can cause sleep/suspend to fail.
-    # Enable this if you have graphical corruption issues or application crashes after waking
+      # Enable this if you have graphical corruption issues or application crashes after waking
-    # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
+      # up from sleep. This fixes it by saving the entire VRAM memory to /tmp/ instead
-    # of just the bare essentials.
+      # of just the bare essentials.
-    powerManagement.enable = true;
+      powerManagement.enable = true;
 
-    # Fine-grained power management for PRIME. Turns off GPU when not in use.
+      # Fine-grained power management for PRIME. Turns off GPU when not in use.
-    # Experimental and only works on modern Nvidia GPUs (Turing or newer).
+      # Experimental and only works on modern Nvidia GPUs (Turing or newer).
-    # Requires offload to be enabled.
+      # Requires offload to be enabled.
-    # powerManagement.finegrained = false;
+      # powerManagement.finegrained = false;
 
-    # Use the open-source driver?
+      # Use the open-source driver?
-    open = false;
+      open = false;
 
-    # Enable the nvidia-settings menu?
+      # Enable the nvidia-settings menu?
-    nvidiaSettings = true;
+      nvidiaSettings = true;
+    };
   };
 
   # Add a udev rule to prevent the mouse from waking the system.  Note that it