Updated graphics to support intel and nvidia (laptop gpu without prime)
Added immich Updated cfile and smaller changes Updated transfer-sh password
This commit is contained in:
parent
dd504716d3
commit
c566589cc2
10 changed files with 419 additions and 46 deletions
|
|
@ -1,16 +0,0 @@
|
|||
{pkgs, ...}: {
|
||||
hardware.graphics = {
|
||||
enable = true;
|
||||
enable32Bit = true;
|
||||
|
||||
extraPackages = with pkgs; [
|
||||
libva
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
];
|
||||
extraPackages32 = with pkgs.pkgsi686Linux; [
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
];
|
||||
};
|
||||
}
|
||||
|
|
@ -3,7 +3,7 @@
|
|||
|
||||
imports = [
|
||||
./bluetooth.nix
|
||||
./commonGraphics.nix
|
||||
./graphics.nix
|
||||
./fingerprint.nix
|
||||
./fwupd.nix
|
||||
];
|
||||
|
|
|
|||
59
system/hardware/graphics.nix
Normal file
59
system/hardware/graphics.nix
Normal file
|
|
@ -0,0 +1,59 @@
|
|||
{
|
||||
config,
|
||||
pkgs,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
inherit (lib) optionals mkEnableOption mkDefault;
|
||||
|
||||
graphics = config.niksos.graphics;
|
||||
enable = graphics.enable;
|
||||
nvidia = graphics.enable && graphics.nvidia;
|
||||
intel = graphics.enable && graphics.intel;
|
||||
|
||||
in {
|
||||
options.niksos.graphics = {
|
||||
enable = mkEnableOption "core graphics";
|
||||
intel = mkEnableOption "additional intel drivers";
|
||||
nvidia = mkEnableOption "additoinal nvidia drivers";
|
||||
};
|
||||
|
||||
config = {
|
||||
niksos.graphics.enable = mkDefault true;
|
||||
|
||||
hardware.graphics = {
|
||||
inherit enable;
|
||||
enable32Bit = enable;
|
||||
extraPackages = with pkgs;
|
||||
[
|
||||
libva
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
]
|
||||
++ optionals intel [
|
||||
pkgs.intel-media-driver
|
||||
]
|
||||
++ optionals nvidia [
|
||||
nvidia-vaapi-driver
|
||||
];
|
||||
extraPackages32 = with pkgs.pkgsi686Linux;
|
||||
[
|
||||
libva
|
||||
vaapiVdpau
|
||||
libvdpau-va-gl
|
||||
]
|
||||
++ optionals intel [
|
||||
pkgs.pkgsi686Linux.intel-media-driver
|
||||
]
|
||||
++ optionals nvidia [
|
||||
pkgs.pkgsi686Linux.nvidia-vaapi-driver
|
||||
];
|
||||
};
|
||||
|
||||
hardware.nvidia = {
|
||||
modesetting.enable = nvidia;
|
||||
open = false;
|
||||
};
|
||||
services.xserver.videoDrivers = optionals nvidia ["nvidia"];
|
||||
};
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue