devices.pc: use xcalib to load color profile

devices/nas/default.nix

@@ -47,7 +47,7 @@ inputs:
         networking.hostname = "nas";
         gui.preferred = false;
       };
-      hardware = { cpus = [ "intel" ]; gpus = [ "intel" ]; };
+      hardware = { cpus = [ "intel" ]; gpu.type = "intel"; };
       packages.packageSet = "desktop-fat";
       services =
       {

devices/pc/default.nix

@@ -60,7 +60,8 @@ inputs:
       hardware =
       {
         cpus = [ "amd" ];
-        gpus = [ "nvidia" ];
+        gpu = { type = "amd+nvidia"; prime.busId = { amd = "8:0:0"; nvidia = "1:0:0"; }; };
+        # gpu.type = "amd";
         bluetooth.enable = true;
         joystick.enable = true;
         printer.enable = true;
@@ -133,14 +134,19 @@ inputs:
           publicKey = "l1gFSDCeBxyf/BipXNvoEvVvLqPgdil84nmr5q6+EEw=";
           wireguardIp = "192.168.83.3";
         };
+        gamemode = { enable = true; drmDevice = 1; };
       };
       bugs = [ "xmunet" "backlight" "amdpstate" ];
     };
-    # use plasma-x11 as default, instead of plasma-wayland
-    services.xserver.displayManager.defaultSession = inputs.lib.mkForce "plasma";
     virtualisation.virtualbox.host = { enable = true; enableExtensionPack = true; };
-    hardware.nvidia.forceFullCompositionPipeline = true;
     home-manager.users.chn.config.programs.plasma.startup.autoStartScript.xcalib.text =
       "${inputs.pkgs.xcalib}/bin/xcalib -d :0 ${./color/TPLCD_161B_Default.icm}";
+    services.xserver.displayManager.defaultSession = inputs.lib.mkForce "plasma";
+    specialisation.nvidia.configuration =
+    {
+      system.nixos.tags = [ "discreate-graphic" ];
+      nixos.hardware.gpu.type = inputs.lib.mkForce "nvidia";
+      hardware.nvidia.forceFullCompositionPipeline = true;
+    };
   };
 }

devices/surface/default.nix

@@ -37,7 +37,7 @@ inputs:
       hardware =
       {
         cpus = [ "intel" ];
-        gpus = [ "intel" ];
+        gpu.type = "intel";
         bluetooth.enable = true;
         joystick.enable = true;
         printer.enable = true;

devices/xmupc1/default.nix

@@ -47,12 +47,12 @@ inputs:
       hardware =
       {
         cpus = [ "amd" ];
-        gpus = [ "nvidia" ];
+        # gpus = [ "nvidia" ];
         bluetooth.enable = true;
         joystick.enable = true;
         printer.enable = true;
         sound.enable = true;
-        gamemode.drmDevice = 1;
+        # gamemode.drmDevice = 1;
       };
       packages.packageSet = "workstation";
       virtualization = { docker.enable = true; kvmHost = { enable = true; gui = true; }; };

modules/hardware/default.nix

@@ -1,6 +1,6 @@
 inputs:
 {
-  imports = inputs.localLib.mkModules [ ./legion.nix ];
+  imports = inputs.localLib.mkModules [ ./gpu.nix ./legion.nix ];
   options.nixos.hardware = let inherit (inputs.lib) mkOption types; in
   {
     bluetooth.enable = mkOption { type = types.bool; default = false; };
@@ -8,14 +8,6 @@ inputs:
     printer.enable = mkOption { type = types.bool; default = false; };
     sound.enable = mkOption { type = types.bool; default = false; };
     cpus = mkOption { type = types.listOf (types.enum [ "intel" "amd" ]); default = []; };
-    gpus = mkOption { type = types.listOf (types.enum [ "intel" "nvidia" "amd" ]); default = []; };
-    prime =
-    {
-      enable = mkOption { type = types.bool; default = false; };
-      mode = mkOption { type = types.enum [ "offload" "sync" ]; default = "offload"; };
-      busId = mkOption { type = types.attrsOf types.str; default = {}; };
-    };
-    gamemode.drmDevice = mkOption { type = types.int; default = 0; };
     halo-keyboard.enable = mkOption { type = types.bool; default = false; };
   };
   config =
@@ -82,80 +74,6 @@ inputs:
               concatLists (map (cpu: modules.${cpu}) hardware.cpus);
         }
       )
-      # gpus
-      (
-        mkIf (hardware.gpus != [])
-        {
-          boot.initrd.availableKernelModules =
-            let
-              modules =
-              {
-                intel = [ "i915" ];
-                nvidia = [ "nvidia" "nvidia_drm" "nvidia_modeset" "nvidia_uvm" ];
-                amd = [ "amdgpu" ];
-              };
-            in
-              concatLists (map (gpu: modules.${gpu}) hardware.gpus);
-          hardware =
-          {
-            opengl =
-            {
-              enable = true;
-              driSupport = true;
-              extraPackages =
-                with inputs.pkgs;
-                let
-                  packages =
-                  {
-                    intel = [ intel-compute-runtime intel-media-driver libvdpau-va-gl ]; # intel-vaapi-driver
-                    nvidia = [ vaapiVdpau ];
-                    amd = [ amdvlk rocmPackages.clr rocmPackages.clr.icd ];
-                  };
-                in
-                  concatLists (map (gpu: packages.${gpu}) hardware.gpus);
-              driSupport32Bit = true;
-            };
-            nvidia = mkIf (builtins.elem "nvidia" hardware.gpus)
-            {
-              modesetting.enable = true;
-              powerManagement.enable = true;
-              dynamicBoost.enable = true;
-              nvidiaSettings = true;
-              # package = inputs.config.boot.kernelPackages.nvidiaPackages.production;
-            };
-          };
-        }
-      )
-      (mkIf (builtins.elem "intel" hardware.gpus) { services.xserver.videoDrivers = [ "modesetting" ]; })
-      (mkIf (builtins.elem "amd" hardware.gpus) { services.xserver.videoDrivers = [ "modesetting" ]; })
-      # prime
-      (
-        mkIf hardware.prime.enable
-        {
-          hardware.nvidia = mkMerge
-          [
-            (
-              mkIf (hardware.prime.mode == "offload")
-              {
-                prime.offload = { enable = true; enableOffloadCmd = true; };
-                powerManagement = { finegrained = true; enable = true; };
-              }
-            )
-            (
-              mkIf (hardware.prime.mode == "sync")
-              {
-                prime = { sync.enable = true; };
-                # prime.forceFullCompositionPipeline = true;
-              }
-            )
-            {
-              prime = listToAttrs
-                (map (gpu: { inherit (gpu) value; name = "${gpu.name}BusId"; }) (attrsToList hardware.prime.busId));
-            }
-          ];
-        }
-      )
-      { programs.gamemode.settings.gpu.gpu_device = "${toString hardware.gamemode.drmDevice}"; }
       # halo-keyboard
       (mkIf hardware.halo-keyboard.enable
       (

modules/hardware/gpu.nix

@@ -0,0 +1,80 @@
+inputs:
+{
+  options.nixos.hardware.gpu = let inherit (inputs.lib) mkOption types; in
+  {
+    type = mkOption
+    {
+      type = types.nullOr (types.enum
+      [
+        # single gpu
+        "intel" "nvidia" "amd"
+        # hibrid gpu: use nvidia prime offload mode
+        "intel+nvidia" "amd+nvidia"
+      ]);
+      default = null;
+    };
+    prime.busId = mkOption { type = types.attrsOf types.nonEmptyStr; default = {}; };
+  };
+  config = let inherit (inputs.config.nixos.hardware) gpu; in inputs.lib.mkIf (gpu.type != null) (inputs.lib.mkMerge
+  [
+    # generic settings
+    (
+      let gpus = inputs.lib.strings.splitString "+" gpu.type; in
+      {
+        boot.initrd.availableKernelModules =
+          let modules =
+          {
+            intel = [ "i915" ];
+            nvidia = [ "nvidia" "nvidia_drm" "nvidia_modeset" "nvidia_uvm" ];
+            amd = [ "amdgpu" ];
+          };
+          in builtins.concatLists (builtins.map (gpu: modules.${gpu}) gpus);
+        hardware =
+        {
+          opengl =
+          {
+            enable = true;
+            driSupport = true;
+            driSupport32Bit = true;
+            extraPackages =
+              let packages = with inputs.pkgs;
+              {
+                intel = [ intel-vaapi-driver libvdpau-va-gl intel-media-driver ];
+                nvidia = [ vaapiVdpau ];
+                amd = [ amdvlk rocmPackages.clr rocmPackages.clr.icd ];
+              };
+              in builtins.concatLists (builtins.map (gpu: packages.${gpu}) gpus);
+            extraPackages32 =
+              let packages = { intel = []; nvidia = []; amd = [ inputs.pkgs.driversi686Linux.amdvlk ]; };
+              in builtins.concatLists (builtins.map (gpu: packages.${gpu}) gpus);
+          };
+          nvidia = inputs.lib.mkIf (builtins.elem "nvidia" gpus)
+          {
+            modesetting.enable = true;
+            powerManagement.enable = true;
+            dynamicBoost.enable = true;
+            nvidiaSettings = true;
+            # package = inputs.config.boot.kernelPackages.nvidiaPackages.production;
+          };
+        };
+        boot.kernelParams = inputs.lib.mkIf (builtins.elem "amd" gpus)
+          [ "radeon.cik_support=0" "amdgpu.cik_support=1" "radeon.si_support=0" "amdgpu.si_support=1" "iommu=pt" ];
+        environment.variables.VDPAU_DRIVER = inputs.lib.mkIf (builtins.elem "intel" gpus) "va_gl";
+        services.xserver.videoDrivers =
+          let driver = { intel = "modesetting"; amd = "amdgpu"; nvidia = "nvidia"; };
+          in builtins.map (gpu: driver.${gpu}) gpus;
+      }
+    )
+    # nvidia prime offload
+    (
+      inputs.lib.mkIf (inputs.lib.strings.hasSuffix "+nvidia" gpu.type) { hardware.nvidia =
+      {
+        prime = { offload = { enable = true; enableOffloadCmd = true; }; }
+          // builtins.listToAttrs (builtins.map
+            (gpu: { name = "${if gpu.name == "amd" then "amdgpu" else gpu.name}BusId"; value = "PCI:${gpu.value}"; })
+            (inputs.localLib.attrsToList gpu.prime.busId));
+        powerManagement.finegrained = true;
+      };}
+    )
+  ]);
+}

modules/packages/workstation/default.nix

@@ -68,29 +68,7 @@ inputs:
         anime-game-launcher = { enable = true; package = inputs.pkgs.anime-game-launcher; };
         honkers-railway-launcher = { enable = true; package = inputs.pkgs.honkers-railway-launcher; };
         nix-ld.enable = true;
-        gamemode =
-        {
-          enable = true;
-          settings =
-          {
-            general.renice = 10;
-            gpu =
-            {
-              apply_gpu_optimisations = "accept-responsibility";
-              nv_powermizer_mode = 1;
-            };
-            custom = let notify-send = "${inputs.pkgs.libnotify}/bin/notify-send"; in
-            {
-              start = "${notify-send} 'GameMode started'";
-              end = "${notify-send} 'GameMode ended'";
-            };
-          };
-        };
-        chromium =
-        {
-          enable = true;
-          extraOpts.PasswordManagerEnabled = false;
-        };
+        chromium = { enable = true; extraOpts.PasswordManagerEnabled = false; };
       };
     };
 }

modules/services/default.nix

@@ -40,6 +40,7 @@ inputs:
     ./fail2ban.nix
     ./wireguard.nix
     ./akkoma.nix
+    ./gamemode.nix
   ];
   options.nixos.services = let inherit (inputs.lib) mkOption types; in
   {

modules/services/gamemode.nix

@@ -0,0 +1,30 @@
+inputs:
+{
+  options.nixos.services.gamemode = let inherit (inputs.lib) mkOption types; in
+  {
+    enable = mkOption { type = types.bool; default = false; };
+    drmDevice = mkOption { type = types.int; };
+  };
+  config = let inherit (inputs.config.nixos.services) gamemode; in inputs.lib.mkIf gamemode.enable
+  {
+    programs.gamemode =
+    {
+      enable = true;
+      settings =
+      {
+        general.renice = 10;
+        gpu =
+        {
+          apply_gpu_optimisations = "accept-responsibility";
+          nv_powermizer_mode = 1;
+          gpu_device = builtins.toString gamemode.drmDevice;
+        };
+        custom = let notify-send = "${inputs.pkgs.libnotify}/bin/notify-send"; in
+        {
+          start = "${notify-send} 'GameMode started'";
+          end = "${notify-send} 'GameMode ended'";
+        };
+      };
+    };
+  };
+}

modules/system/gui.nix

@@ -19,7 +19,6 @@ inputs:
         enable = true;
         displayManager = { sddm.enable = true; defaultSession = "plasmawayland"; };
         desktopManager.plasma5.enable = true;
-        videoDrivers = inputs.config.nixos.hardware.gpus;
       };
       systemd.services.display-manager = { after = [ "network-online.target" ]; enable = gui.autoStart; };
       environment =

modules/virtualization/default.nix

@@ -37,7 +37,7 @@ inputs:
             setSocketVariable = true;
             daemon.settings = { features.buildkit = true; dns = [ "1.1.1.1" ]; storage-driver = "overlay2"; };
           };
-          enableNvidia = builtins.elem "nvidia" inputs.config.nixos.hardware.gpus;
+          enableNvidia = inputs.lib.strings.hasInfix "nvidia" inputs.config.nixos.hardware.gpu.type;
           storageDriver = "overlay2";
         };
         nixos.services.firewall.trustedInterfaces = [ "docker0" ];