feat: kernel 6.3, v4l2loopback, intel driver

This commit is contained in:
winston 2023-05-20 08:27:25 +02:00
parent dbc472901e
commit 0b901b78a6
Signed by: winston
GPG key ID: 3786770EDBC2B481
3 changed files with 34 additions and 35 deletions

View file

@ -113,11 +113,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1684321175, "lastModified": 1684484967,
"narHash": "sha256-V4EbM+jK7pvjKBaj0dgAiW9ultzDE27Nz5fRyu/ceMk=", "narHash": "sha256-P3ftCqeJmDYS9LSr2gGC4XGGcp5vv8TOasJX6fVHWsw=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "59659243cd4ababda605e79b4a9c2e6d83e24c86", "rev": "b9a52ad20e58ebd003444915e35e3dd2c18fc715",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,11 +214,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1684393889, "lastModified": 1684464849,
"narHash": "sha256-X4EP3TdpskELgOKGfm7UcLLGheqxYJZuNEEc0HkmrO0=", "narHash": "sha256-f8th/GWE9M2hePTMZc0YyFboigt9AG/ioEcyHcdFK2I=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "9f7d9a55cc9960c029b006444e64e8dfa54a578e", "rev": "b969a89c3e84a121c9b3af2e4ef277cd822b988a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -262,11 +262,11 @@
}, },
"nur": { "nur": {
"locked": { "locked": {
"lastModified": 1684416496, "lastModified": 1684555660,
"narHash": "sha256-t1vPAJqbHaelwKBNEVNIYp434eLCtkBEXIR8s4ggl8I=", "narHash": "sha256-z5TvFQ5oqQm+d0RBHi8AEGVKRqOgRV6bnVBAIeDM06E=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nur", "repo": "nur",
"rev": "2c8cb59b2703bd68c177c1085221eda9e2fe7db9", "rev": "99d629e44e1229f35e1291e69d597d449bddc1df",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -6,15 +6,6 @@ in {
../common/linux ../common/linux
]; ];
boot = {
kernelPackages = pkgs.linuxPackages_6_2;
kernelParams = ["quiet" "splash"];
};
hardware = {
bluetooth.enable = true;
};
networking = { networking = {
hostName = "futomaki"; hostName = "futomaki";
networkmanager.enable = true; networkmanager.enable = true;

View file

@ -1,21 +1,38 @@
# Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead.
{ {
config, config,
lib, lib,
pkgs, pkgs,
modulesPath, modulesPath,
... ...
}: { }: let
kernel = pkgs.linuxPackages_6_3;
in {
imports = [ imports = [
(modulesPath + "/installer/scan/not-detected.nix") (modulesPath + "/installer/scan/not-detected.nix")
]; ];
boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod"]; boot = {
boot.initrd.kernelModules = ["dm-snapshot"]; initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod"];
boot.kernelModules = ["kvm-amd"]; initrd.kernelModules = ["dm-snapshot"];
boot.extraModulePackages = []; kernelPackages = kernel;
kernelModules = ["kvm-amd" "v4l2loopback"];
kernelParams = ["quiet" "splash"];
};
# Intel Arc A770
environment.sessionVariables.LIBVA_DRIVER_NAME = "iHD";
boot.extraModulePackages = [kernel.v4l2loopback];
hardware.opengl = {
enable = true;
extraPackages = with pkgs; [
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
};
hardware.bluetooth.enable = true;
boot.initrd.luks.devices = { boot.initrd.luks.devices = {
luksroot = { luksroot = {
@ -61,13 +78,4 @@
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
hardware.opengl = {
enable = true;
extraPackages = with pkgs; [
intel-media-driver
vaapiIntel
vaapiVdpau
libvdpau-va-gl
];
};
} }