migrate fallarbor, lavaridge, petalburg, and rustboro to nixhw

flake.lock

@@ -125,11 +125,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719877454,
+        "lastModified": 1719994518,
-        "narHash": "sha256-g5N1yyOSsPNiOlFfkuI/wcUjmtah+nxdImJqrSATjOU=",
+        "narHash": "sha256-pQMhCCHyQGRzdfAkdJ4cIWiw+JNuWsTX7f0ZYSyz0VY=",
         "owner": "hercules-ci",
         "repo": "flake-parts",
-        "rev": "4e3583423212f9303aa1a6337f8dffb415920e4f",
+        "rev": "9227223f6d922fee3c7b190b2cc238a99527bbb7",
         "type": "github"
       },
       "original": {
@@ -255,11 +255,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1719827385,
+        "lastModified": 1720042825,
-        "narHash": "sha256-qs+nU20Sm8czHg3bhGCqiH+8e13BJyRrKONW34g3i50=",
+        "narHash": "sha256-A0vrUB6x82/jvf17qPCpxaM+ulJnD8YZwH9Ci0BsAzE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "391ca6e950c2525b4f853cbe29922452c14eda82",
+        "rev": "e1391fb22e18a36f57e6999c7a9f966dc80ac073",
         "type": "github"
       },
       "original": {
@@ -479,11 +479,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720299715,
+        "lastModified": 1720302727,
-        "narHash": "sha256-VezUOQZnluy6lahyxOo2W55kGsyh7AhfiF1/NAwdYgM=",
+        "narHash": "sha256-yVm+9LDzFpZNJIS0fuvm4Xjhn4o0gQjTlxWz+NZs4bQ=",
         "owner": "alyraffauf",
         "repo": "nixhw",
-        "rev": "03c553f3acd2339f034dc67e8d37505b2e32925e",
+        "rev": "a63a1fa3443b8ba62a0db5bd2830717ac09d182e",
         "type": "github"
       },
       "original": {
@@ -554,11 +554,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1719923896,
+        "lastModified": 1720296628,
-        "narHash": "sha256-/hfE2x9NbT13d53o9uq6MuMipV19pJUQzpsZIhlvsiM=",
+        "narHash": "sha256-v42XPTrP7oJSAFhn9zJVvPc1DbPVW/Id6J8/eKCY9oo=",
         "owner": "nix-community",
         "repo": "nixvim",
-        "rev": "d384cf656cb1b21d90eee1b007a6ade6f90768f5",
+        "rev": "a53fa82a0564d3fe94a89c1dd53b703c3c67d1cd",
         "type": "github"
       },
       "original": {
@@ -570,11 +570,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1720245926,
+        "lastModified": 1720302358,
-        "narHash": "sha256-V0J4nanRArnepOZePr8PgyDFTz/rFeFPUi3chY1SOdM=",
+        "narHash": "sha256-rTjqY94L6eQqQczKx2glCa8HlEQeoueCRCCB2gO3Vxc=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "024869c9b63a7641ff5431de390a4d3a4383aefe",
+        "rev": "673d935e914752452d4d87f37311be32ce5475c5",
         "type": "github"
       },
       "original": {
@@ -707,11 +707,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1720239911,
+        "lastModified": 1720302688,
-        "narHash": "sha256-5jo6v4d4y0dcxdBHqlSOKhvQszvLomANgE1rRYN9/D0=",
+        "narHash": "sha256-L/ezqZZDhRr1I8joLH6Yk1yf0AU6/RbYgo9Cscrdck8=",
         "owner": "alyraffauf",
         "repo": "wallpapers",
-        "rev": "91b46bd86441e3c1c07c48b641a15b3203d6d971",
+        "rev": "7f5523f88b88a4c4b99891b19983e91fb317767a",
         "type": "github"
       },
       "original": {

hosts/fallarbor/default.nix

@@ -13,11 +13,6 @@
     inputs.nixhw.nixosModules.framework-13-intel-11th
   ];
 
-  ar.hardware = {
-    enable = true;
-    sound = true;
-  };
-
   boot.loader = {
     efi.canTouchEfiVariables = true;
     systemd-boot.enable = true;

hosts/lavaridge/default.nix

@@ -13,11 +13,6 @@
     inputs.nixhw.nixosModules.framework-13-amd-7000
   ];
 
-  ar.hardware = {
-    enable = true;
-    sound = true;
-  };
-
   boot.loader = {
     efi.canTouchEfiVariables = true;
     systemd-boot.enable = true;

hosts/petalburg/default.nix

@@ -9,8 +9,8 @@
 }: {
   imports = [
     ./disko.nix
-    ./hardware.nix
     ./home.nix
+    inputs.nixhw.nixosModules.lenovo-yoga-9i-intel-13th
   ];
 
   boot.loader = {

hosts/petalburg/hardware.nix

@@ -1,27 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  pkgs,
-  ...
-}: {
-  boot = {
-    initrd.availableKernelModules = ["nvme" "sd_mod" "thunderbolt" "usb_storage" "xhci_pci"];
-
-    kernelPackages = pkgs.linuxPackages_latest;
-  };
-
-  hardware = {
-    enableAllFirmware = true;
-    sensor.iio.enable = true; # Enable auto-rotate and tablet mode.
-  };
-
-  ar.hardware = {
-    enable = true;
-    cpu.intel = true;
-    gpu.intel = true;
-    laptop = true;
-    ssd = true;
-    sound = true;
-  };
-}

hosts/rustboro/default.nix

@@ -9,8 +9,8 @@
 }: {
   imports = [
     ./disko.nix
-    ./hardware.nix
     ./home.nix
+    inputs.nixhw.nixosModules.thinkpad-t440p
   ];
 
   boot.loader = {

hosts/rustboro/hardware.nix

@@ -1,46 +0,0 @@
-{
-  config,
-  inputs,
-  lib,
-  pkgs,
-  ...
-}: {
-  boot = {
-    extraModprobeConfig = ''
-      options bbswitch use_acpi_to_detect_card_state=1
-      options thinkpad_acpi force_load=1 fan_control=1
-    '';
-
-    initrd.availableKernelModules = [
-      "ahci"
-      "ehci_pci"
-      "rtsx_pci_sdmmc"
-      "sd_mod"
-      "sr_mod"
-      "usb_storage"
-      "xhci_pci"
-    ];
-  };
-
-  hardware = {
-    enableAllFirmware = true;
-
-    trackpoint = {
-      enable = true;
-      emulateWheel = true;
-    };
-  };
-
-  powerManagement.cpuFreqGovernor = "ondemand";
-
-  services.fwupd.enable = true;
-
-  ar.hardware = {
-    enable = true;
-    cpu.intel = true;
-    gpu.intel = true;
-    laptop = true;
-    ssd = true;
-    sound = true;
-  };
-}

nixosModules/apps/steam/default.nix

@@ -9,6 +9,8 @@
       config.ar.apps.steam.enable
       || config.ar.desktop.steam.enable
     ) {
+      hardware.steam-hardware.enable = true;
+
       programs = {
         gamescope.enable = config.ar.desktop.steam.enable;
 

nixosModules/base/default.nix

@@ -46,6 +46,14 @@
       rtkit.enable = true;
     };
 
+    hardware.keyboard.qmk.enable = true;
+
+    services.logind.extraConfig = ''
+      # Don't shutdown when power button is short-pressed
+      HandlePowerKey=suspend
+      HandlePowerKeyLongPress=poweroff
+    '';
+
     system.autoUpgrade = {
       allowReboot = true;
       dates = "04:00";

nixosModules/desktop/default.nix

@@ -34,11 +34,28 @@
         nerdfonts
       ];
 
+      hardware.logitech.wireless = {
+        enable = true;
+        enableGraphical = true;
+      };
+
       programs.system-config-printer.enable = true;
 
       services = {
         gnome.gnome-keyring.enable = true;
         gvfs.enable = true; # Mount, trash, etc.
+
+        pipewire = {
+          enable = true;
+
+          alsa = {
+            enable = true;
+            support32Bit = true;
+          };
+
+          pulse.enable = true;
+        };
+
         xserver = {
           enable = true;
           xkb = {