Merge branch 'master' into lenovo-legion-16irx8h-audio-fix

README.md

@@ -133,6 +133,7 @@ See code for all available configurations.
 | [Asus Zenbook Duo 14 UX481](asus/zenbook/ux481/nvidia/)                           | `<nixos-hardware/asus/zenbook/ux481/nvidia>`            | `asus-zenbook-ux481-nvidia`            |
 | [Asus Zenbook Flip S13 UX371](asus/zenbook/ux371/)                                | `<nixos-hardware/asus/zenbook/ux371>`                   | `asus-zenbook-ux371`                   |
 | [Asus Zenbook Pro 15 UX535](asus/zenbook/ux535/)                                  | `<nixos-hardware/asus/zenbook/ux535>`                   | `asus-zenbook-ux535`                   |
+| [Asus Zenbook Pro 17 UM6702](asus/zenbook/um6702/)                                | `<nixos-hardware/asus/zenbook/um6702>`                  | `asus-zenbook-um6702`                  |
 | [BeagleBoard PocketBeagle](beagleboard/pocketbeagle)                              | `<nixos-hardware/beagleboard/pocketbeagle>`             | `beagleboard-pocketbeagle`             |
 | [Chuwi MiniBook X](chuwi/minibook-x)                                              | `<nixos-hardware/chuwi/minibook-x>`                     | `chuwi-minibook-x`                     |
 | [Deciso DEC series](deciso/dec)                                                   | `<nixos-hardware/deciso/dec>`                           | `deciso-dec`                           |
@@ -445,4 +446,3 @@ See code for all available configurations.
 | [TUXEDO Pulse 15 - Gen2](tuxedo/pulse/15/gen2)                                    | `<nixos-hardware/tuxedo/pulse/15/gen2>`                 | `tuxedo-pulse-15-gen2`                 |
 | [Xiaomi Redmibook 15 Pro 2021](xiaomi/redmibook/15-pro-2021)                      | `<nixos-hardware/xiaomi/redmibook/15-pro-2021>`         | `xiaomi-redmibook-15-pro-2021`         |
 | [Xiaomi Redmibook 16 Pro 2024](xiaomi/redmibook/16-pro-2024)                      | `<nixos-hardware/xiaomi/redmibook/16-pro-2024>`         | `xiaomi-redmibook-16-pro-2024`         |
-

asus/battery.nix

@@ -31,10 +31,14 @@ in
       wantedBy = [
         "local-fs.target"
         "suspend.target"
+        "suspend-then-hibernate.target"
+        "hibernate.target"
       ];
       after = [
         "local-fs.target"
         "suspend.target"
+        "suspend-then-hibernate.target"
+        "hibernate.target"
       ];
       description = "Set the battery charge threshold to ${toString cfg.chargeUpto}%";
       startLimitBurst = 5;

asus/zenbook/um6702/default.nix

@@ -0,0 +1,36 @@
+{ lib, ... }:
+let
+  inherit (lib) mkDefault;
+in
+{
+  imports = [
+    ../../../common/cpu/amd
+    ../../../common/cpu/amd/pstate.nix
+
+    # iGPU
+    ../../../common/gpu/amd
+
+    # dGPU
+    ../../../common/gpu/nvidia/prime.nix
+    ../../../common/gpu/nvidia/ampere
+
+    ../../../common/pc/laptop
+    ../../../common/pc/ssd
+
+    ../../battery.nix
+  ];
+
+  hardware.nvidia = {
+    dynamicBoost.enable = mkDefault true;
+
+    powerManagement = {
+      enable = mkDefault true;
+      finegrained = mkDefault true;
+    };
+
+    prime = {
+      amdgpuBusId = "PCI:1:0:0";
+      nvidiaBusId = "PCI:101:0:0";
+    };
+  };
+}

flake.nix

@@ -50,6 +50,7 @@
           asus-rog-strix-g713ie = import ./asus/rog-strix/g713ie;
           asus-rog-strix-g733qs = import ./asus/rog-strix/g733qs;
           asus-rog-strix-x570e = import ./asus/rog-strix/x570e;
+          asus-zenbook-um6702 = import ./asus/zenbook/um6702;
           asus-zenbook-ux371 = import ./asus/zenbook/ux371;
           asus-zenbook-ux535 = import ./asus/zenbook/ux535;
           asus-zenbook-ux481-intelgpu = import ./asus/zenbook/ux481/intelgpu;

raspberry-pi/3/default.nix

@@ -5,7 +5,13 @@
 }:
 
 {
-  boot.kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi3;
+  boot = {
+    kernelPackages = lib.mkDefault pkgs.linuxKernel.packages.linux_rpi3;
+    initrd.availableKernelModules = [
+      "usbhid"
+      "usb_storage"
+    ];
+  };
 
   # fix the following error :
   # modprobe: FATAL: Module ahci not found in directory

raspberry-pi/4/audio.nix

@@ -11,9 +11,7 @@ in
 {
   options.hardware = {
     raspberry-pi."4".audio = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "configuration for audio";
-        configuration for audio
-      '';
     };
   };
 

raspberry-pi/4/backlight.nix

@@ -6,9 +6,7 @@ in
 {
   options.hardware = {
     raspberry-pi."4".backlight = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "the backlight support for the Raspberry Pi official Touch Display";
-        Enable the backlight support for the Raspberry Pi official Touch Display
-      '';
     };
   };
 

raspberry-pi/4/bluetooth.nix

@@ -6,9 +6,7 @@ in
 {
   options.hardware = {
     raspberry-pi."4".bluetooth = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "configuration for bluetooth";
-        configuration for bluetooth
-      '';
     };
   };
 

raspberry-pi/4/digi-amp-plus.nix

@@ -6,15 +6,13 @@ in
 {
   options.hardware = {
     raspberry-pi."4".digi-amp-plus = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "support for the IQaudIO DigiAMP+ Hat";
-        support for the IQaudIO DigiAMP+ Hat.
-      '';
 
       unmuteAmp = lib.mkOption {
         type = lib.types.bool;
         default = false;
         description = ''
-          "one-shot" unmute when kernel module first loads.
+          Whether to "one-shot" unmute when kernel module first loads.
         '';
       };
 

raspberry-pi/4/dwc2.nix

@@ -6,7 +6,11 @@ in
 {
   options.hardware = {
     raspberry-pi."4".dwc2 = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = false;
+        example = true;
+        description = ''
           Enable the UDC controller to support USB OTG gadget functions.
 
           In order to verify that this works, connect the Raspberry Pi with
@@ -24,6 +28,7 @@ in
           guides on how to test them, please refer to:
           https://www.kernel.org/doc/Documentation/usb/gadget-testing.txt
         '';
+      };
       dr_mode = lib.mkOption {
         type = lib.types.enum [
           "host"

raspberry-pi/4/i2c.nix

@@ -31,28 +31,32 @@ in
 {
   options.hardware.raspberry-pi."4" = {
     i2c0 = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "" // {
+        description = ''
           Turn on the VideoCore I2C bus (maps to /dev/i2c-22) and enable access from the i2c group.
           After a reboot, i2c-tools (e.g. i2cdetect -F 22) should work for root or any user in i2c.
         '';
+      };
       frequency = lib.mkOption {
         type = lib.types.nullOr lib.types.int;
         default = null;
         description = ''
-          interface clock-frequency
+          The interface clock-frequency to configure.
         '';
       };
     };
     i2c1 = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "" // {
+        description = ''
           Turn on the ARM I2C bus (/dev/i2c-1 on GPIO pins 3 and 5) and enable access from the i2c group.
           After a reboot, i2c-tools (e.g. i2cdetect -F 1) should work for root or any user in i2c.
         '';
+      };
       frequency = lib.mkOption {
         type = lib.types.nullOr lib.types.int;
         default = null;
         description = ''
-          interface clock-frequency
+          The interface clock-frequency to configure.
         '';
       };
     };

raspberry-pi/4/pkgs-overlays.nix

@@ -10,12 +10,14 @@ in
 {
   options.hardware = {
     raspberry-pi."4".apply-overlays-dtmerge = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "" // {
-        replace deviceTree.applyOverlays implementation to use dtmerge from libraspberrypi.
+        description = ''
-        this can resolve issues with applying dtbs for the pi.
+          Whether replace deviceTree.applyOverlays implementation to use dtmerge from libraspberrypi.
+          This can resolve issues with applying dtbs for the pi.
         '';
       };
     };
+  };
 
   config = lib.mkIf cfg.enable {
     nixpkgs.overlays = [ dt_ao_overlay ];

raspberry-pi/4/poe-hat.nix

@@ -6,9 +6,7 @@ in
 {
   options.hardware = {
     raspberry-pi."4".poe-hat = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "support for the Raspberry Pi POE Hat";
-        support for the Raspberry Pi POE Hat.
-      '';
     };
   };
 

raspberry-pi/4/poe-plus-hat.nix

@@ -6,9 +6,7 @@ in
 {
   options.hardware = {
     raspberry-pi."4".poe-plus-hat = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "support for the Raspberry Pi PoE+ HAT";
-        support for the Raspberry Pi PoE+ HAT.
-      '';
     };
   };
 

raspberry-pi/4/pwm0.nix

@@ -6,9 +6,7 @@ in
 {
   options.hardware = {
     raspberry-pi."4".pwm0 = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "support for the hardware pwm0 channel on GPIO_18";
-        Enable support for the hardware pwm0 channel on GPIO_18
-      '';
     };
   };
 

raspberry-pi/4/tc358743.nix

@@ -6,13 +6,15 @@ in
 {
   options.hardware = {
     raspberry-pi."4".tc358743 = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "" // {
+        description = ''
           Enable support for the Toshiba TC358743 HDMI-to-CSI-2 converter.
 
           This can be tested with a plugged in converter device and for example
           running ustreamer (which starts webservice providing a camera stream):
           ''${pkgs.ustreamer}/bin/ustreamer --persistent --dv-timings
         '';
+      };
       lanes = lib.mkOption {
         type = lib.types.enum [
           2
@@ -23,13 +25,15 @@ in
           Number of CSI lanes available
         '';
       };
-      media-controller = lib.mkEnableOption ''
+      media-controller = lib.mkEnableOption "" // {
+        description = ''
           Enable support for the Media Controller API.
 
           See https://forums.raspberrypi.com/viewtopic.php?t=322076 for details
         '';
       };
     };
+  };
 
   config = lib.mkIf cfg.enable {
     hardware.deviceTree.filter = "bcm2711-rpi-4*.dtb";

raspberry-pi/4/touch-ft5406.nix

@@ -6,7 +6,8 @@ in
 {
   options.hardware = {
     raspberry-pi."4".touch-ft5406 = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "" // {
+        description = ''
           Enable the touch controller of the official Raspberry Pi touch diplay.
 
           The overlay is taken from the official Raspberry Pi Linux fork, and
@@ -18,6 +19,7 @@ in
         '';
       };
     };
+  };
 
   config = lib.mkIf cfg.enable {
     hardware.deviceTree = {

raspberry-pi/4/tv-hat.nix

@@ -6,9 +6,7 @@ in
 {
   options.hardware = {
     raspberry-pi."4".tv-hat = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "support for the Raspberry Pi TV Hat";
-        support for the Raspberry Pi TV Hat.
-      '';
     };
   };
   config = lib.mkIf cfg.enable {

raspberry-pi/4/xhci.nix

@@ -9,9 +9,7 @@ in
 {
   options.hardware = {
     raspberry-pi."4".xhci = {
-      enable = lib.mkEnableOption ''
+      enable = lib.mkEnableOption "builtin XHCI controller for USB with otg_mode=1 in config.txt";
-        Enable builtin XHCI controller for USB with otg_mode=1 in config.txt
-      '';
     };
   };