flake update 2026-05-22

This commit is contained in:
elwrcl committed 2026-05-22 00:44:44 +03:00
1 parent edceefd595
commit 71a3df098d
45 files changed
+188 -323

No files matched your search

+4 -1
View File
@@ -1,4 +1,7 @@
{ pkgs, ... }:
{
pkgs,
...
}:
{
hardware.graphics.extraPackages = with pkgs; [
+19 -7
View File
@@ -1,11 +1,21 @@
{ config, lib, pkgs, ... }:
{
config,
lib,
pkgs,
...
}:
let
driver = config.elars.hardware.graphics.driver;
in
{
options.elars.hardware.graphics.driver = lib.mkOption {
type = lib.types.enum [ "intel" "amd" "nvidia" "hybrid-amd-nvidia" ];
type = lib.types.enum [
"intel"
"amd"
"nvidia"
"hybrid-amd-nvidia"
];
default = "intel";
};
@@ -20,10 +30,12 @@ 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; })
(import ./nvidia.nix { inherit config lib pkgs; })
(import ./prime.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; })
]
))
];
}
+4 -1
View File
@@ -1,4 +1,7 @@
{ pkgs, ... }:
{
pkgs,
...
}:
let
wayland-intel-vaapi-driver = pkgs.intel-vaapi-driver.overrideAttrs (oldAttrs: {
+5 -2
View File
@@ -1,11 +1,14 @@
{ config, ... }:
{
config,
...
}:
{
services.xserver.videoDrivers = [ "nvidia" ];
hardware.nvidia = {
modesetting.enable = true;
open = false; # for 20xx series make true for 30xx and newer
open = false;
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"; # change to your AMD GPU's bus ID, e.g. "PCI:1:0:0"
nvidiaBusId = "PCI:X:X:X"; # change to your NVIDIA GPU's bus ID, e.g. "PCI:2:0:0"
};
}