[Mesa+Hardware] move Mesa specific options to a dedicated files

This commit is contained in:
Antoine Viallon 2023-04-27 23:55:08 +02:00
parent 250820cb82
commit d3e80fda86
Signed by: aviallon
GPG key ID: 186FC35EDEB25716
7 changed files with 58 additions and 13 deletions

View file

@ -4,7 +4,6 @@ let
cfg = config.aviallon.hardware.amd;
devCfg = config.aviallon.developer;
generalCfg = config.aviallon.general;
myMesa = if generalCfg.unsafeOptimizations then pkgs.mesaOptimized else pkgs.mesa;
in {
config = mkIf (cfg.enable && cfg.kernelDriver == "amdgpu") {
boot.initrd.kernelModules = [ "amdgpu" ];

View file

@ -2,9 +2,7 @@
with lib;
let
cfg = config.aviallon.hardware.amd;
devCfg = config.aviallon.developer;
generalCfg = config.aviallon.general;
myMesa = if generalCfg.unsafeOptimizations then pkgs.mesaOptimized else pkgs.mesa;
in {
options.aviallon.hardware.amd = {
enable = mkEnableOption "AMD gpus";
@ -28,18 +26,11 @@ in {
];
config = mkIf cfg.enable {
programs.corectrl.enable = mkIf generalCfg.unsafeOptimizations true;
hardware.opengl = {
enable = true;
package = with pkgs; myMesa.drivers;
package32 = with pkgs; myMesa.drivers;
extraPackages = with pkgs; mkIf (!cfg.useProprietary) (mkAfter [
(hiPrio myMesa)
]);
extraPackages32 = with pkgs.driversi686Linux; mkIf (!cfg.useProprietary) [
(hiPrio myMesa)
];
};
aviallon.hardware.mesa.enable = mkDefault (!cfg.useProprietary);
};
}

View file

@ -4,7 +4,6 @@ let
cfg = config.aviallon.hardware.amd;
devCfg = config.aviallon.developer;
generalCfg = config.aviallon.general;
myMesa = if generalCfg.unsafeOptimizations then pkgs.mesaOptimized else pkgs.mesa;
in {
config = mkIf (cfg.enable && cfg.kernelDriver == "radeon") {
boot.initrd.kernelModules = [ "radeon" ];