chn/nixos
1
0
Fork 0
mirror of https://github.com/CHN-beta/nixos.git synced 2024-10-23 07:08:45 +08:00
Code Issues Packages Projects Releases Wiki Activity

pc: use prime

Browse Source
This commit is contained in:
陈浩南 2024-01-15 18:55:50 +08:00
parent 2d1df77bc3
commit 98f9bfd1e5
3 changed files with 11 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
flake.nix
View File

@ -135,6 +135,12 @@
printer.enable = true; printer.enable = true;
sound.enable = true; sound.enable = true;
legion.enable = true; legion.enable = true;
prime =
{
enable = true;
mode = "sync";
busId = { amdgpu = "PCI:8:0:0"; nvidia = "PCI:1:0:0"; };
};
}; };
packages.packageSet = "workstation"; packages.packageSet = "workstation";
virtualization = virtualization =
@ -204,7 +210,7 @@
wireguardIp = "192.168.83.3"; wireguardIp = "192.168.83.3";
}; };
}; };
bugs = [ "xmunet" "suspend-hibernate-waydroid" "backlight" ]; bugs = [ "xmunet" "suspend-hibernate-waydroid" "backlight" "amdpstate" ];
}; };
vps6 = vps6 =
{ {

1
modules/bugs/default.nix
View File

@ -80,6 +80,7 @@ inputs:
firefox.programs.firefox.enable = inputs.lib.mkForce false; firefox.programs.firefox.enable = inputs.lib.mkForce false;
power.boot.kernelParams = [ "cpufreq.default_governor=powersave" ]; power.boot.kernelParams = [ "cpufreq.default_governor=powersave" ];
backlight.boot.kernelParams = [ "nvidia.NVreg_RegistryDwords=EnableBrightnessControl=1" ]; backlight.boot.kernelParams = [ "nvidia.NVreg_RegistryDwords=EnableBrightnessControl=1" ];
amdpstate.boot.kernelParams = [ "amd_pstate=active" ];
}; };
in in
{ {

6
modules/hardware/default.nix
View File

@ -109,7 +109,7 @@ inputs:
{ {
intel = [ intel-compute-runtime intel-media-driver libvdpau-va-gl ]; # intel-vaapi-driver intel = [ intel-compute-runtime intel-media-driver libvdpau-va-gl ]; # intel-vaapi-driver
nvidia = [ vaapiVdpau ]; nvidia = [ vaapiVdpau ];
amd = []; amd = [ amdvlk rocmPackages.clr rocmPackages.clr.icd ];
}; };
in in
concatLists (map (gpu: packages.${gpu}) hardware.gpus); concatLists (map (gpu: packages.${gpu}) hardware.gpus);
@ -126,7 +126,8 @@ inputs:
}; };
} }
) )
(mkIf (builtins.elem "intel" hardware.gpus) { services.xserver.deviceSection = ''Driver "modesetting"''; }) (mkIf (builtins.elem "intel" hardware.gpus) { services.xserver.videoDrivers = [ "modesetting" ]; })
(mkIf (builtins.elem "amd" hardware.gpus) { services.xserver.videoDrivers = [ "modesetting" ]; })
# prime # prime
( (
mkIf hardware.prime.enable mkIf hardware.prime.enable
@ -151,7 +152,6 @@ inputs:
prime = listToAttrs prime = listToAttrs
(map (gpu: { inherit (gpu) value; name = "${gpu.name}BusId"; }) (attrsToList hardware.prime.busId)); (map (gpu: { inherit (gpu) value; name = "${gpu.name}BusId"; }) (attrsToList hardware.prime.busId));
} }
]; ];
} }
) )