diff --git a/flake.lock b/flake.lock index a58fe6d..7bfa9ec 100644 --- a/flake.lock +++ b/flake.lock @@ -1780,11 +1780,11 @@ "xdph": "xdph" }, "locked": { - "lastModified": 1776187484, - "narHash": "sha256-gpm/WZCBcvITN0pQbhVvlEIqqhma8OHKiO5NGpFygkc=", + "lastModified": 1776291620, + "narHash": "sha256-Swx58lo1ZS/8Y7iMJEtgwas9JQNWhJ+UQylqIMmXI9Y=", "owner": "hyprwm", "repo": "Hyprland", - "rev": "88f3e7e9d519ae704cab78548c6f6bf02a0b0841", + "rev": "e6c5040f417001fc3cf20e21f971f926626a0f6f", "type": "github" }, "original": { diff --git a/home/apps/mpv.nix b/home/apps/mpv.nix index 276f885..2d7eaaa 100644 --- a/home/apps/mpv.nix +++ b/home/apps/mpv.nix @@ -4,24 +4,31 @@ config = { vo = "gpu-next"; gpu-api = "vulkan"; + target-colorspace-hint = "auto"; + hwdec = "auto"; loop-file = "inf"; loop-playlist = "inf"; }; profiles = { - # hdr = { - # vo = "gpu-next"; - # gpu-api = "vulkan"; - # hdr-compute-peak = "yes"; - # hdr-peak-detect = "yes"; - # target-peak = 400; - # target-prim = "bt.2020"; - # target-trc = "pq"; - # inverse-tone-mapping = "yes"; - # tone-mapping = "spline"; - # tone-mapping-mode = "auto"; - # target-colorspace-hint = "auto"; - # gamut-mapping = "desaturate"; - # }; + HDR = { + profile-cond = ''p["video-params/primaries"] == "bt.2020"''; + hdr-compute-peak = "yes"; + hdr-peak-percentile = 99.8; + hdr-peak-decay-rate = 20; + hdr-contrast-recovery = 0.5; + target-peak = 400; + tone-mapping = "spline"; + target-trc = "pq"; + target-contrast = 2500; + }; + SDR = { + profile-cond = ''p["video-params/primaries"] and p["video-params/primaries"] ~= "bt.2020"''; + inverse-tone-mapping = "yes"; + target-peak = 203; + tone-mapping = "auto"; + target-trc = "auto"; + target-contrast = "auto"; + }; }; }; } diff --git a/home/services/hyprland.nix b/home/services/hyprland.nix index 7025a5e..b58e666 100644 --- a/home/services/hyprland.nix +++ b/home/services/hyprland.nix @@ -32,15 +32,15 @@ wayland.windowManager.hyprland = { enable = device.is "ryu"; systemd.enable = true; - package = pkgs.hyprland; - portalPackage = pkgs.xdph; + # package = pkgs.hyprland; + # portalPackage = pkgs.xdph; settings = { # source = "${pkgs.catppuccinThemes.hyprland}/themes/mocha.conf"; render = { cm_enabled = true; - direct_scanout = 1; # 0 - off; 1 - on; 2 - auto based on `game` - cm_fs_passthrough = 2; # 0 - off; 1 - always; 2 - hdr only + direct_scanout = 2; # 0 - off; 1 - on; 2 - auto based on `game` + cm_fs_passthrough = 0; # 0 - off; 1 - always; 2 - hdr only (2 broken on nvidia) send_content_type = true; # automatic monitor mode switch cm_auto_hdr = 2; # 0 - off; 1 - switch to cm,hdr 2; 2 - switch to cm,hdredid non_shader_cm = 2; diff --git a/nixos/ryu/programs/hyprland.nix b/nixos/ryu/programs/hyprland.nix index 71cef64..9ca37bc 100644 --- a/nixos/ryu/programs/hyprland.nix +++ b/nixos/ryu/programs/hyprland.nix @@ -11,8 +11,8 @@ enable = true; withUWSM = true; xwayland.enable = true; - package = pkgs.hyprland; - portalPackage = pkgs.xdph; + # package = pkgs.hyprland; + # portalPackage = pkgs.xdph; }; uwsm.enable = true; }; diff --git a/overlays.nix b/overlays.nix index 3bbf24b..fcb73bf 100644 --- a/overlays.nix +++ b/overlays.nix @@ -84,9 +84,9 @@ applications = final: prev: { iamb = inputs.iamb.packages.${prev.stdenv.hostPlatform.system}.default; - hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland; - xdg-desktop-portal-hyprland = prev.enableDebugging inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; - xdph = inputs.nixpkgs-master.legacyPackages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + # hyprland = inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.hyprland; + # xdg-desktop-portal-hyprland = prev.enableDebugging inputs.hyprland.packages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; + # xdph = inputs.nixpkgs-master.legacyPackages.${prev.stdenv.hostPlatform.system}.xdg-desktop-portal-hyprland; opencode = inputs.nixpkgs-master.legacyPackages.${prev.stdenv.hostPlatform.system}.opencode; ironclaw = (cratesNix prev).buildCrate "ironclaw" { nativeBuildInputs = [prev.pkg-config]; @@ -175,5 +175,7 @@ in inputs.nix-minecraft.overlay inputs.nur.overlays.default inputs.vicinae.overlays.default + inputs.hyprland.overlays.hyprland-packages + inputs.hyprland.overlays.hyprland-extras ] ++ (import ./neovim/overlays.nix {inherit inputs;})