diff --git a/home.nix b/home.nix index 545948d..70f81a3 100644 --- a/home.nix +++ b/home.nix @@ -1,10 +1,5 @@ - - -{ 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 -{ +# Matt home.nix +{ pkgs, ... }: { home.username = "matt"; home.homeDirectory = "/home/matt"; @@ -22,7 +17,6 @@ in home.packages = [ # Other packages - vulkan-hdr-layer ]; # custom systemd services diff --git a/vulkan-hdr-layer.nix b/vulkan-hdr-layer.nix deleted file mode 100644 index 94b73b7..0000000 --- a/vulkan-hdr-layer.nix +++ /dev/null @@ -1,34 +0,0 @@ -{ 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