update intel config

This commit is contained in:
jacekpoz 2024-09-01 23:40:43 +02:00
parent 0861077bba
commit 43e3f57bed
Signed by: poz
SSH key fingerprint: SHA256:JyLeVWE4bF3tDnFeUpUaJsPsNlJyBldDGV/dIKSLyN8
7 changed files with 39 additions and 77 deletions

View file

@ -0,0 +1,34 @@
{
lib,
pkgs,
...
}: let
inherit (lib.attrsets) attrValues;
in {
# https://github.com/NixOS/nixos-hardware/blob/master/common/gpu/intel/default.nix
boot.initrd.kernelModules = [ "i915" ];
hardware.graphics = {
enable = true;
enable32Bit = true;
extraPackages = attrValues {
inherit (pkgs)
mesa
libdrm
libva
vaapiVdpau
libvdpau-va-gl
intel-vaapi-driver
intel-media-driver
;
};
extraPackages32 = attrValues {
inherit (pkgs.driversi686Linux)
mesa
libvdpau-va-gl
intel-vaapi-driver
intel-media-driver
;
};
};
}

View file

@ -5,7 +5,6 @@
pkgs, pkgs,
... ...
}: let }: let
inherit (lib.attrsets) attrValues;
inherit (lib.meta) getExe getExe'; inherit (lib.meta) getExe getExe';
inherit (lib.modules) mkForce; inherit (lib.modules) mkForce;
@ -36,25 +35,6 @@ in {
# enable = true; # enable = true;
# platform = "ipu6"; # platform = "ipu6";
# }; # };
graphics = {
enable = true;
enable32Bit = true;
extraPackages = attrValues {
inherit (pkgs)
mesa
libdrm
libva
vaapiVdpau
libvdpau-va-gl
;
};
extraPackages32 = attrValues {
inherit (pkgs.driversi686Linux)
mesa
libvdpau-va-gl
;
};
};
}; };
services = { services = {

View file

@ -8,6 +8,7 @@ in {
imports = map (append ../common/optional) [ imports = map (append ../common/optional) [
"adb.nix" "adb.nix"
"cpu/intel.nix" "cpu/intel.nix"
"gpu/intel.nix"
"mullvad-vpn.nix" "mullvad-vpn.nix"
"opentabletdriver.nix" "opentabletdriver.nix"
"power-supply.nix" "power-supply.nix"

View file

@ -1,37 +1,13 @@
{ {
config, config,
lib,
pkgs,
... ...
}: let }: {
inherit (lib.attrsets) attrValues;
in {
services = { services = {
pcscd.enable = true; pcscd.enable = true;
udisks2.enable = true; udisks2.enable = true;
}; };
hardware.graphics = {
enable = true;
enable32Bit = true;
extraPackages = attrValues {
inherit (pkgs)
mesa
libdrm
libva
vaapiVdpau
libvdpau-va-gl
;
};
extraPackages32 = attrValues {
inherit (pkgs.driversi686Linux)
mesa
libvdpau-va-gl
;
};
};
services.journald = { services.journald = {
extraConfig = '' extraConfig = ''
SystemMaxUse=100M SystemMaxUse=100M

View file

@ -8,8 +8,8 @@ in {
imports = map (append ../common/optional) [ imports = map (append ../common/optional) [
"adb.nix" "adb.nix"
"asusd.nix" "asusd.nix"
"cpu/amd.nix" "cpu/intel.nix"
"gpu/amd.nix" "gpu/intel.nix"
"mullvad-vpn.nix" "mullvad-vpn.nix"
"opentabletdriver.nix" "opentabletdriver.nix"
"power-supply.nix" "power-supply.nix"

View file

@ -1,12 +1,9 @@
{ {
config, config,
inputs, inputs,
lib,
pkgs, pkgs,
... ...
}: let }: let
inherit (lib.attrsets) attrValues;
inherit (config.poz.other.system) username; inherit (config.poz.other.system) username;
in { in {
nix.settings = { nix.settings = {
@ -32,33 +29,6 @@ in {
extraGroups = [ "docker" ]; extraGroups = [ "docker" ];
}; };
hardware = {
sensor.iio.enable = true;
# ipu6 = {
# enable = true;
# platform = "ipu6";
# };
graphics = {
enable = true;
enable32Bit = true;
extraPackages = attrValues {
inherit (pkgs)
mesa
libdrm
libva
vaapiVdpau
libvdpau-va-gl
;
};
extraPackages32 = attrValues {
inherit (pkgs.driversi686Linux)
mesa
libvdpau-va-gl
;
};
};
};
services = { services = {
pcscd.enable = true; pcscd.enable = true;

View file

@ -8,6 +8,7 @@ in {
imports = map (append ../common/optional) [ imports = map (append ../common/optional) [
"cpu/intel.nix" "cpu/intel.nix"
"displaylink.nix" "displaylink.nix"
"gpu/intel.nix"
"suspend.nix" "suspend.nix"
"v4l2.nix" "v4l2.nix"
"wayland.nix" "wayland.nix"