From 4e97b393a43ba9d64ace37e467fdd625e536cb45 Mon Sep 17 00:00:00 2001 From: Hilton Chain Date: Thu, 5 Feb 2026 10:48:59 +0800 Subject: transformations: nvidia: Revise style. MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * nonguix/transformations.scm (nonguix-transformation-nvidia): Reorder arguments and revise docstring. [kernel-arguments]: Expand ‘string-append’. * README.org (System setup): Adjust accordingly. --- nonguix/transformations.scm | 27 ++++++++++++++------------- 1 file changed, 14 insertions(+), 13 deletions(-) (limited to 'nonguix/transformations.scm') diff --git a/nonguix/transformations.scm b/nonguix/transformations.scm index f31a42c..bb5b72a 100644 --- a/nonguix/transformations.scm +++ b/nonguix/transformations.scm @@ -100,20 +100,20 @@ and INITRD (default: microcode-initrd)." (initrd initrd)))) (define* (nonguix-transformation-nvidia #:key (driver nvda) + (open-source-kernel-module? #f) (kernel-mode-setting? #t) - (configure-xorg? #f) - (open-source-kernel-module? #f)) + (configure-xorg? #f)) "Return a procedure that transforms an operating system, setting up DRIVER (default: nvda) for NVIDIA graphics card. +OPEN-SOURCE-KERNEL-MODULE? (default: #f) only supports Turing and later +architectures and is expected to work with 'linux-lts'. + KERNEL-MODE-SETTING? (default: #t) is required for Wayland and rootless Xorg support. -CONFIGURE-XORG? (default: #f) is required for display managers that can start -the Xorg server (e.g. GDM). - -OPEN-SOURCE-KERNEL-MODULE? (default: #f) only supports Turing and later -architectures and is expected to work with 'linux-lts'. +CONFIGURE-XORG? (default: #f) is required for Xorg display managers. Currently +this argument configures the one used by '%desktop-services', GDM or SDDM. Use 'replace-mesa', for application setup out of the operating system declaration. @@ -141,12 +141,13 @@ TODO: Power management." (inherit os) (kernel-arguments (delete-duplicates - (cons* "modprobe.blacklist=nouveau" - (string-append - "nvidia_drm.modeset=" (if kernel-mode-setting? "1" "0")) - (remove - (cut string-prefix? "nvidia_drm.modeset=" <>) - (operating-system-user-kernel-arguments os))))) + `("modprobe.blacklist=nouveau" + ,(if kernel-mode-setting? + "nvidia_drm.modeset=1" + "nvidia_drm.modeset=0") + ,@(remove + (cut string-prefix? "nvidia_drm.modeset=" <>) + (operating-system-user-kernel-arguments os))))) (packages (replace-mesa (operating-system-packages os) #:driver driver)) (services -- cgit v1.2.3