diff --git a/assets/srgb_to_gamma2p2_400_mhc2.icm b/assets/srgb_to_gamma2p2_400_mhc2.icm new file mode 100644 index 0000000..cf9ffb5 Binary files /dev/null and b/assets/srgb_to_gamma2p2_400_mhc2.icm differ 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"; }; }; };