diff --git a/configuration.nix b/configuration.nix index 448428a..b52dcea 100644 --- a/configuration.nix +++ b/configuration.nix @@ -9,6 +9,8 @@ [ # Include the results of the hardware scan. ./hardware-configurations/laptop.nix ]; + + # boot.kernelPackages = pkgs.linuxPackages_zen; # Use the systemd-boot EFI boot loader. # NOT! Let's use GRUB instead @@ -118,6 +120,13 @@ enable = true; driSupport = true; driSupport32Bit = true; + # These extrapackages I added later but it didn't help + extraPackages = with pkgs; [ + intel-media-driver # LIBVA_DRIVER_NAME=iHD + vaapiIntel # LIBVA_DRIVER_NAME=i965 (older but works better for Firefox/Chromium) + vaapiVdpau + libvdpau-va-gl + ]; }; # Tell Xorg to use the nvidia driver (also valid for Wayland) services.xserver.videoDrivers = ["nvidia"]; @@ -149,6 +158,7 @@ # VirtualBox virtualisation.docker.enable = true; + virtualisation.waydroid.enable = true; virtualisation.virtualbox.host.enable = true; virtualisation.virtualbox.host.package = pkgs.locked.virtualbox; virtualisation.virtualbox.host.enableExtensionPack = true; diff --git a/flake.lock b/flake.lock index 3f2dec7..a18bfaa 100644 --- a/flake.lock +++ b/flake.lock @@ -1,23 +1,5 @@ { "nodes": { - "flake-parts": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib" - }, - "locked": { - "lastModified": 1698579227, - "narHash": "sha256-KVWjFZky+gRuWennKsbo6cWyo7c/z/VgCte5pR9pEKg=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "f76e870d64779109e41370848074ac4eaa1606ec", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, "home-manager": { "inputs": { "nixpkgs": [ @@ -25,11 +7,11 @@ ] }, "locked": { - "lastModified": 1701071203, - "narHash": "sha256-lQywA7QU/vzTdZ1apI0PfgCWNyQobXUYghVrR5zuIeM=", + "lastModified": 1701433070, + "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=", "owner": "nix-community", "repo": "home-manager", - "rev": "db1878f013b52ba5e4034db7c1b63e8d04173a86", + "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57", "type": "github" }, "original": { @@ -41,18 +23,16 @@ }, "nh": { "inputs": { - "flake-parts": "flake-parts", - "nix-filter": "nix-filter", "nixpkgs": [ "nixpkgs" ] }, "locked": { - "lastModified": 1700997049, - "narHash": "sha256-2dZsKz6CeKTx76krMp9WV4t+lRs2xDWw0aYNUFgnJKI=", + "lastModified": 1701344951, + "narHash": "sha256-F0jd1tbSFreIpxNGtqVCxzUHKdSxjKLl2XFZPiz83zY=", "owner": "viperML", "repo": "nh", - "rev": "4298c924bb6b52607207691af30ebeccdbfa359d", + "rev": "c192a4a937ed3ab974e14c09b90092b226188281", "type": "github" }, "original": { @@ -61,28 +41,13 @@ "type": "github" } }, - "nix-filter": { - "locked": { - "lastModified": 1694857738, - "narHash": "sha256-bxxNyLHjhu0N8T3REINXQ2ZkJco0ABFPn6PIe2QUfqo=", - "owner": "numtide", - "repo": "nix-filter", - "rev": "41fd48e00c22b4ced525af521ead8792402de0ea", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "nix-filter", - "type": "github" - } - }, "nixpkgs": { "locked": { - "lastModified": 1701068326, - "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -94,11 +59,11 @@ }, "nixpkgs-fresh": { "locked": { - "lastModified": 1701068326, - "narHash": "sha256-vmMceA+q6hG1yrjb+MP8T0YFDQIrW3bl45e7z24IEts=", + "lastModified": 1701253981, + "narHash": "sha256-ztaDIyZ7HrTAfEEUt9AtTDNoCYxUdSd6NrRHaYOIxtk=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "8cfef6986adfb599ba379ae53c9f5631ecd2fd9c", + "rev": "e92039b55bcd58469325ded85d4f58dd5a4eaf58", "type": "github" }, "original": { @@ -108,24 +73,6 @@ "type": "github" } }, - "nixpkgs-lib": { - "locked": { - "dir": "lib", - "lastModified": 1696019113, - "narHash": "sha256-X3+DKYWJm93DRSdC5M6K5hLqzSya9BjibtBsuARoPco=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "f5892ddac112a1e9b3612c39af1b72987ee5783a", - "type": "github" - }, - "original": { - "dir": "lib", - "owner": "NixOS", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-locked": { "locked": { "lastModified": 1701068326, @@ -144,11 +91,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1701053011, - "narHash": "sha256-8QQ7rFbKFqgKgLoaXVJRh7Ik5LtI3pyBBCfOnNOGkF0=", + "lastModified": 1701268161, + "narHash": "sha256-hL4jGGwMHHmyx6G9wi6IrYa8RLkoEtzCb4zWITH1B40=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "5b528f99f73c4fad127118a8c1126b5e003b01a9", + "rev": "67be70a859530f6f7c358568eaa6ab0d84b36b01", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 91e4a98..3c2c744 100644 --- a/flake.nix +++ b/flake.nix @@ -58,10 +58,19 @@ config.allowUnfree = true; }; }; + overlay-vaapiIntel = final: prev: { + vaapiIntel = prev.vaapiIntel.override { enableHybridCodec = true; }; + }; + # overlay-gl = final: prev: { + # libGL = final.stable.libGL; + # glfw = final.stable.glfw; + # }; my-overlays = [ overlay-locked overlay-fresh overlay-stable + overlay-vaapiIntel + # overlay-gl ]; in {