diff --git a/flake.lock b/flake.lock index 2af9003..0f2cc18 100644 --- a/flake.lock +++ b/flake.lock @@ -113,11 +113,11 @@ ] }, "locked": { - "lastModified": 1684321175, - "narHash": "sha256-V4EbM+jK7pvjKBaj0dgAiW9ultzDE27Nz5fRyu/ceMk=", + "lastModified": 1684484967, + "narHash": "sha256-P3ftCqeJmDYS9LSr2gGC4XGGcp5vv8TOasJX6fVHWsw=", "owner": "nix-community", "repo": "home-manager", - "rev": "59659243cd4ababda605e79b4a9c2e6d83e24c86", + "rev": "b9a52ad20e58ebd003444915e35e3dd2c18fc715", "type": "github" }, "original": { @@ -214,11 +214,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1684393889, - "narHash": "sha256-X4EP3TdpskELgOKGfm7UcLLGheqxYJZuNEEc0HkmrO0=", + "lastModified": 1684464849, + "narHash": "sha256-f8th/GWE9M2hePTMZc0YyFboigt9AG/ioEcyHcdFK2I=", "owner": "nixos", "repo": "nixpkgs", - "rev": "9f7d9a55cc9960c029b006444e64e8dfa54a578e", + "rev": "b969a89c3e84a121c9b3af2e4ef277cd822b988a", "type": "github" }, "original": { @@ -262,11 +262,11 @@ }, "nur": { "locked": { - "lastModified": 1684416496, - "narHash": "sha256-t1vPAJqbHaelwKBNEVNIYp434eLCtkBEXIR8s4ggl8I=", + "lastModified": 1684555660, + "narHash": "sha256-z5TvFQ5oqQm+d0RBHi8AEGVKRqOgRV6bnVBAIeDM06E=", "owner": "nix-community", "repo": "nur", - "rev": "2c8cb59b2703bd68c177c1085221eda9e2fe7db9", + "rev": "99d629e44e1229f35e1291e69d597d449bddc1df", "type": "github" }, "original": { diff --git a/machines/futomaki/default.nix b/machines/futomaki/default.nix index 25ae846..645f005 100644 --- a/machines/futomaki/default.nix +++ b/machines/futomaki/default.nix @@ -6,15 +6,6 @@ in { ../common/linux ]; - boot = { - kernelPackages = pkgs.linuxPackages_6_2; - kernelParams = ["quiet" "splash"]; - }; - - hardware = { - bluetooth.enable = true; - }; - networking = { hostName = "futomaki"; networkmanager.enable = true; diff --git a/machines/futomaki/hardware.nix b/machines/futomaki/hardware.nix index 3fa4ae0..408e289 100644 --- a/machines/futomaki/hardware.nix +++ b/machines/futomaki/hardware.nix @@ -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, lib, pkgs, modulesPath, ... -}: { +}: let + kernel = pkgs.linuxPackages_6_3; +in { imports = [ (modulesPath + "/installer/scan/not-detected.nix") ]; - boot.initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usb_storage" "sd_mod"]; - boot.initrd.kernelModules = ["dm-snapshot"]; - boot.kernelModules = ["kvm-amd"]; - boot.extraModulePackages = []; + boot = { + initrd.availableKernelModules = ["nvme" "xhci_pci" "ahci" "usbhid" "sd_mod"]; + initrd.kernelModules = ["dm-snapshot"]; + 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 = { luksroot = { @@ -61,13 +78,4 @@ nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux"; hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware; - hardware.opengl = { - enable = true; - extraPackages = with pkgs; [ - intel-media-driver - vaapiIntel - vaapiVdpau - libvdpau-va-gl - ]; - }; }