improve: only set nvidia power management for nvidia laptop images

2025-11-02 03:18:00 +00:00 · 2024-01-25 23:00:00 -08:00
parent c2a437c2ac
commit 5dc1f9198f
16 changed files with 26 additions and 3 deletions
--- a/config/common/nvidia-laptop-scripts.yml
+++ b/config/common/nvidia-laptop-scripts.yml
@@ -0,0 +1,3 @@
+type: script
+scripts:
+  - nvidiaoptimuspowermanagement.sh
--- a/config/files/usr/etc/modprobe.d/nvidia.conf
+++ b/config/files/usr/etc/modprobe.d/nvidia.conf
@@ -1,3 +0,0 @@
-# Enable DynamicPowerManagement
-# http://download.nvidia.com/XFree86/Linux-x86_64/440.31/README/dynamicpowermanagement.html
-options nvidia NVreg_DynamicPowerManagement=0x02
--- a/config/recipes/laptop/recipe-bluefin-dx-nvidia-laptop-userns.yml
+++ b/config/recipes/laptop/recipe-bluefin-dx-nvidia-laptop-userns.yml
@@ -20,4 +20,5 @@ modules:
  - from-file: common/gui-scripts.yml
  - from-file: common/bluefin-scripts.yml
  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-bluefin-nvidia-laptop-userns.yml
+++ b/config/recipes/laptop/recipe-bluefin-nvidia-laptop-userns.yml
@@ -20,4 +20,5 @@ modules:
  - from-file: common/gui-scripts.yml
  - from-file: common/bluefin-scripts.yml
  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-bluefin-nvidia-laptop.yml
+++ b/config/recipes/laptop/recipe-bluefin-nvidia-laptop.yml
@@ -22,4 +22,5 @@ modules:
  - from-file: common/disableuserns-packages.yml
  - from-file: common/disableuserns-scripts.yml
  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-cinnamon-nvidia-laptop-userns.yml
+++ b/config/recipes/laptop/recipe-cinnamon-nvidia-laptop-userns.yml
@@ -19,4 +19,5 @@ modules:
  - from-file: common/gui-scripts.yml
  - from-file: common/cinnamon-scripts.yml
  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-cinnamon-nvidia-laptop.yml
+++ b/config/recipes/laptop/recipe-cinnamon-nvidia-laptop.yml
@@ -21,4 +21,5 @@ modules:
  - from-file: common/disableuserns-scripts.yml
  - from-file: common/cinnamon-scripts.yml
  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-kinoite-nvidia-laptop-userns.yml
+++ b/config/recipes/laptop/recipe-kinoite-nvidia-laptop-userns.yml
@@ -20,4 +20,5 @@ modules:
  - from-file: recipes/laptop/laptop-bling.yml
  - from-file: common/common-scripts.yml
  - from-file: common/gui-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-kinoite-nvidia-laptop.yml
+++ b/config/recipes/laptop/recipe-kinoite-nvidia-laptop.yml
@@ -22,4 +22,5 @@ modules:
  - from-file: common/gui-scripts.yml
  - from-file: common/disableuserns-packages.yml
  - from-file: common/disableuserns-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-sericea-nvidia-laptop-userns.yml
+++ b/config/recipes/laptop/recipe-sericea-nvidia-laptop-userns.yml
@@ -18,4 +18,5 @@ modules:
  - from-file: recipes/laptop/laptop-bling.yml
  - from-file: common/common-scripts.yml
  - from-file: common/gui-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-sericea-nvidia-laptop.yml
+++ b/config/recipes/laptop/recipe-sericea-nvidia-laptop.yml
@@ -20,4 +20,5 @@ modules:
  - from-file: common/gui-scripts.yml
  - from-file: common/disableuserns-packages.yml
  - from-file: common/disableuserns-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-silverblue-nvidia-laptop-userns.yml
+++ b/config/recipes/laptop/recipe-silverblue-nvidia-laptop-userns.yml
@@ -20,4 +20,5 @@ modules:
  - from-file: common/common-scripts.yml
  - from-file: common/gui-scripts.yml
  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-silverblue-nvidia-laptop.yml
+++ b/config/recipes/laptop/recipe-silverblue-nvidia-laptop.yml
@@ -22,4 +22,5 @@ modules:
  - from-file: common/disableuserns-packages.yml
  - from-file: common/disableuserns-scripts.yml
  - from-file: common/nvidia-laptop-gnome-cinnamon-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop-userns.yml
+++ b/config/recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop-userns.yml
@@ -19,4 +19,5 @@ modules:
  - from-file: common/common-scripts.yml
  - from-file: common/gui-scripts.yml
  - from-file: common/wayfire-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop.yml
+++ b/config/recipes/laptop/recipe-wayblue-wayfire-nvidia-laptop.yml
@@ -21,4 +21,5 @@ modules:
  - from-file: common/wayfire-scripts.yml
  - from-file: common/disableuserns-packages.yml
  - from-file: common/disableuserns-scripts.yml
+  - from-file: common/nvidia-laptop-scripts.yml
  - type: yafti 
--- a/config/scripts/nvidiaoptimuspowermanagement.sh
+++ b/config/scripts/nvidiaoptimuspowermanagement.sh
@@ -0,0 +1,10 @@
+#!/usr/bin/env bash
+
+# Tell build process to exit if there are any errors.
+set -oue pipefail
+
+echo "
+# Enable Fine-Grained DynamicPowerManagement
+# https://download.nvidia.com/XFree86/Linux-x86_64/545.29.06/README/dynamicpowermanagement.html
+options nvidia NVreg_DynamicPowerManagement=0x02
+" >> /usr/etc/modprobe.d/nvidia.conf