From 1be064468c729659e1f957073d1707432c79471e Mon Sep 17 00:00:00 2001 From: Asaki Yuki Date: Sat, 18 Apr 2026 02:37:26 +0700 Subject: [PATCH] add icc profile --- assets/srgb_to_gamma2p2_400_mhc2.icm | Bin 0 -> 13084 bytes host/desktop/device.nix | 45 ++++++------------ .../programs/hyprland/settings/default.nix | 3 +- options/system/environment.nix | 11 ++++- 4 files changed, 26 insertions(+), 33 deletions(-) create mode 100644 assets/srgb_to_gamma2p2_400_mhc2.icm diff --git a/assets/srgb_to_gamma2p2_400_mhc2.icm b/assets/srgb_to_gamma2p2_400_mhc2.icm new file mode 100644 index 0000000000000000000000000000000000000000..cf9ffb5216c5ed8fac5d26b6e66ce3e3bf8b6baf GIT binary patch literal 13084 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 literal 0 HcmV?d00001 diff --git a/host/desktop/device.nix b/host/desktop/device.nix index 7cd7215..4044c07 100644 --- a/host/desktop/device.nix +++ b/host/desktop/device.nix @@ -1,10 +1,8 @@ { - lib, + libs, pkgs, ... -}: let - ENABLE_HDR = false; -in { +}: { device = { flake-name = "ideapad-slim-5"; cursors = "aemeath"; @@ -18,33 +16,20 @@ in { wm.niri.enable = false; wm.hyprland.enable = true; wm.hyprland.monitors = [ - ( - { - output = "eDP-1"; - mode = "1920x1200@60"; - position = "0x0"; - scale = 1; - } - // lib.optionalAttrs ENABLE_HDR { - bitdepth = 10; - cm = "hdr"; - supports_wide_color = 1; - supports_hdr = 1; - - sdrbrightness = 1.0; - sdrsaturation = 1.0; - - sdr_min_luminance = 0.005; - sdr_max_luminance = 200; - - min_luminance = 0.0005; - max_luminance = 400; - max_avg_luminance = 250; - - sdr_eotf = 2; - } - ) + "eDP-1, 1920x1200@60, 0x0, 1, bitdepth, 10, cm, hdr, icc, ${libs.root "/assets/srgb_to_gamma2p2_400_mhc2.icm"}" ]; + # wm.hyprland.monitorsv2 = [ + # { + # output = "eDP-1"; + # mode = "1920x1200@60"; + # position = "0x0"; + # scale = 1; + + # bitdepth = 10; + # cm = "hdr"; + # icc = builtins.toString (libs.root "/assets/srgb_to_gamma2p2_400_mhc2.icm"); + # } + # ]; bluetooth.enable = true; flatpak.enable = true; diff --git a/modules/programs/hyprland/settings/default.nix b/modules/programs/hyprland/settings/default.nix index 9047bd8..81cf2bb 100644 --- a/modules/programs/hyprland/settings/default.nix +++ b/modules/programs/hyprland/settings/default.nix @@ -8,6 +8,7 @@ ]; wayland.windowManager.hyprland.settings = { - monitorv2 = osconfig.device.wm.hyprland.monitors; + monitorv2 = osconfig.device.wm.hyprland.monitorsv2; + monitor = osconfig.device.wm.hyprland.monitors; }; } diff --git a/options/system/environment.nix b/options/system/environment.nix index ca2bb8a..9918bb2 100644 --- a/options/system/environment.nix +++ b/options/system/environment.nix @@ -22,10 +22,17 @@ niri.enable = lib.mkEnableOption "niri"; hyprland = { enable = lib.mkEnableOption "hyprland"; - monitors = lib.mkOption { + + monitor = lib.mkOption { + type = lib.types.listOf lib.types.str; + default = []; + description = "Monitors vs settings"; + }; + + monitorsv2 = lib.mkOption { type = lib.types.listOf lib.types.attrs; default = []; - description = "Monitors settings"; + description = "Monitors vs settings"; }; }; };