diff --git a/configuration.nix b/configuration.nix index cdf7a5d..f5785fa 100644 --- a/configuration.nix +++ b/configuration.nix @@ -162,6 +162,12 @@ in hardware.opengl.extraPackages32 = [ pkgs.driversi686Linux.amdvlk ]; + hardware.opengl.enable = true; + + # For etcher + nixpkgs.config.permittedInsecurePackages = [ + "electron-19.1.9" + ]; # Enable touchpad support (enabled default in most desktopManager). # services.xserver.libinput.enable = true; @@ -178,6 +184,7 @@ in tree lm_sensors vmware-horizon-client + etcher ]; }; @@ -195,6 +202,16 @@ in discover-wrapped pciutils papirus-icon-theme + vulkan-tools + aspell + aspellDicts.en + aspellDicts.en-computers + aspellDicts.en-science + aha + clinfo + # eglinfo + # glxinfo + # wayland-info neofetch gamescope diff --git a/flake.lock b/flake.lock index cf01ee7..c27ecde 100644 --- a/flake.lock +++ b/flake.lock @@ -173,11 +173,11 @@ ] }, "locked": { - "lastModified": 1707175763, - "narHash": "sha256-0MKHC6tQ4KEuM5rui6DjKZ/VNiSANB4E+DJ/+wPS1PU=", + "lastModified": 1707683400, + "narHash": "sha256-Zc+J3UO1Xpx+NL8UB6woPHyttEy9cXXtm+0uWwzuYDc=", "owner": "nix-community", "repo": "home-manager", - "rev": "f99eace7c167b8a6a0871849493b1c613d0f1b80", + "rev": "21b078306a2ab68748abf72650db313d646cf2ca", "type": "github" }, "original": { @@ -235,11 +235,11 @@ }, "nix-flatpak": { "locked": { - "lastModified": 1706716715, - "narHash": "sha256-aoUh0585v3mMkqGV+aggvs9uZQdZWSqMEGGVUT1jX38=", + "lastModified": 1707731066, + "narHash": "sha256-8eK9mny6I3B1eMOYu9iDhKTY6jXfvrxJoH7jMqIm/hs=", "owner": "gmodena", "repo": "nix-flatpak", - "rev": "30f6cb66a1be2a350b08b13e820122b0f3d4bd81", + "rev": "8d8da0b127b6dbb4ce5256e5708eca2efe2409f6", "type": "github" }, "original": { @@ -298,11 +298,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1707092692, - "narHash": "sha256-ZbHsm+mGk/izkWtT4xwwqz38fdlwu7nUUKXTOmm4SyE=", + "lastModified": 1707689078, + "narHash": "sha256-UUGmRa84ZJHpGZ1WZEBEUOzaPOWG8LZ0yPg1pdDF/yM=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "faf912b086576fd1a15fca610166c98d47bc667e", + "rev": "f9d39fb9aff0efee4a3d5f4a6d7c17701d38a1d8", "type": "github" }, "original": { diff --git a/home.nix b/home.nix index e8bde4e..545948d 100644 --- a/home.nix +++ b/home.nix @@ -1,4 +1,10 @@ -{ pkgs, ... }: { + + +{ pkgs, ... }: +let + vulkan-hdr-layer = import ./vulkan-hdr-layer.nix { inherit (pkgs) lib stdenv fetchFromGitHub meson pkg-config vulkan-loader ninja writeText vulkan-headers vulkan-utility-libraries jq wayland; libX11 = pkgs.xorg.libX11; libXrandr = pkgs.xorg.libXrandr; libxcb = pkgs.xorg.libxcb; }; +in +{ home.username = "matt"; home.homeDirectory = "/home/matt"; @@ -14,6 +20,11 @@ userEmail = "matt.l.jallen@gmail.com"; }; + home.packages = [ + # Other packages + vulkan-hdr-layer + ]; + # custom systemd services systemd.user.services.fix-wifi = { Unit = { diff --git a/vulkan-hdr-layer.nix b/vulkan-hdr-layer.nix new file mode 100644 index 0000000..94b73b7 --- /dev/null +++ b/vulkan-hdr-layer.nix @@ -0,0 +1,34 @@ +{ lib, stdenv, fetchFromGitHub, meson, pkg-config, vulkan-loader, ninja, writeText, vulkan-headers, vulkan-utility-libraries, jq, libX11, libXrandr, libxcb, wayland }: + +stdenv.mkDerivation rec { + pname = "vulkan-hdr-layer"; + version = "63d2eec"; + + src = (fetchFromGitHub { + owner = "Zamundaaa"; + repo = "VK_hdr_layer"; + rev = "869199cd2746e7f69cf19955153080842b6dacfc"; + fetchSubmodules = true; + hash = "sha256-xfVYI+Aajmnf3BTaY2Ysg5fyDO6SwDFGyU0L+F+E3is="; + }).overrideAttrs (_: { + GIT_CONFIG_COUNT = 1; + GIT_CONFIG_KEY_0 = "url.https://github.com/.insteadOf"; + GIT_CONFIG_VALUE_0 = "git@github.com:"; + }); + + nativeBuildInputs = [ vulkan-headers meson ninja pkg-config jq ]; + + buildInputs = [ vulkan-headers vulkan-loader vulkan-utility-libraries libX11 libXrandr libxcb wayland ]; + + # Help vulkan-loader find the validation layers + setupHook = writeText "setup-hook" '' + addToSearchPath XDG_DATA_DIRS @out@/share + ''; + + meta = with lib; { + description = "Layers providing Vulkan HDR"; + homepage = "https://github.com/Zamundaaa/VK_hdr_layer"; + platforms = platforms.linux; + license = licenses.mit; + }; +} \ No newline at end of file