more fixes

This commit is contained in:
elwrcl committed 2026-04-12 23:45:22 +03:00
1 parent 4f335e4e8b
commit 3379be92ae
18 files changed
+66 -71

No files matched your search

+8 -7
View File
@@ -2,7 +2,8 @@
let
driver = config.elars.hardware.graphics.driver;
in {
in
{
options.elars.hardware.graphics.driver = lib.mkOption {
type = lib.types.enum [ "intel" "amd" "nvidia" "hybrid-amd-nvidia" ];
default = "intel";
@@ -16,13 +17,13 @@ in {
};
}
(lib.mkIf (driver == "intel") (import ./intel.nix { inherit config lib pkgs; }))
(lib.mkIf (driver == "amd") (import ./amd.nix { inherit config lib pkgs; }))
(lib.mkIf (driver == "nvidia") (import ./nvidia.nix { inherit config lib pkgs; }))
(lib.mkIf (driver == "hybrid-amd-nvidia") (lib.mkMerge [
(import ./amd.nix { inherit config lib pkgs; })
(lib.mkIf (driver == "intel") (import ./intel.nix { inherit config lib pkgs; }))
(lib.mkIf (driver == "amd") (import ./amd.nix { inherit config lib pkgs; }))
(lib.mkIf (driver == "nvidia") (import ./nvidia.nix { inherit config lib pkgs; }))
(lib.mkIf (driver == "hybrid-amd-nvidia") (lib.mkMerge [
(import ./amd.nix { inherit config lib pkgs; })
(import ./nvidia.nix { inherit config lib pkgs; })
(import ./prime.nix { inherit config lib pkgs; })
(import ./prime.nix { inherit config lib pkgs; })
]))
];
}
+1 -1
View File
@@ -5,7 +5,7 @@
hardware.nvidia = {
modesetting.enable = true;
open = false; # for 20xx series make true for 30xx and newer
open = false; # for 20xx series make true for 30xx and newer
nvidiaSettings = true;
package = config.boot.kernelPackages.nvidiaPackages.stable;
};
+2 -2
View File
@@ -3,7 +3,7 @@
{
hardware.nvidia.prime = {
offload.enable = true;
amdgpuBusId = "PCI:X:X:X"; # TODO
nvidiaBusId = "PCI:X:X:X"; # TODO
amdgpuBusId = "PCI:X:X:X"; # TODO
nvidiaBusId = "PCI:X:X:X"; # TODO
};
}
+1 -4
View File
@@ -8,10 +8,7 @@
via
vial
];
users.groups.plugdev = {};
users.groups.plugdev = { };
environment.systemPackages = with pkgs; [
qmk
via