From 2f755c315314e43e1ba705ba298c584c1577a594 Mon Sep 17 00:00:00 2001 From: dot-file Date: Thu, 25 Sep 2025 21:37:26 +0300 Subject: [PATCH 1/3] nixos/ly: add types.nullOr in settings Some options in ly's config.ini can have null as their value (for example, session_log), but the settings option in the NixOS module accepted only str, int and bool types. --- nixos/modules/services/display-managers/ly.nix | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 3dded8ed0624..1141e4f5dfac 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -67,11 +67,13 @@ in settings = mkOption { type = with lib.types; - attrsOf (oneOf [ - str - int - bool - ]); + attrsOf ( + nullOr (oneOf [ + str + int + bool + ]) + ); default = { }; example = { load = false; From 60ba321180b07a92b9fc65cdd5ccf00ab18976ce Mon Sep 17 00:00:00 2001 From: dot-file Date: Sat, 18 Oct 2025 20:06:42 +0300 Subject: [PATCH 2/3] nixos/ly: use iniFmt.lib.types.atom in settings Co-authored-by: h7x4 --- nixos/modules/services/display-managers/ly.nix | 8 +------- 1 file changed, 1 insertion(+), 7 deletions(-) diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 1141e4f5dfac..07e3dd25dd5b 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -67,13 +67,7 @@ in settings = mkOption { type = with lib.types; - attrsOf ( - nullOr (oneOf [ - str - int - bool - ]) - ); + attrsOf iniFmt.lib.types.atom; default = { }; example = { load = false; From a0fd4f4de8834d6b240fe4bc32a07e97b55b2f48 Mon Sep 17 00:00:00 2001 From: dot-file Date: Sat, 25 Oct 2025 16:31:51 +0300 Subject: [PATCH 3/3] nixos/ly: reformat --- nixos/modules/services/display-managers/ly.nix | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/nixos/modules/services/display-managers/ly.nix b/nixos/modules/services/display-managers/ly.nix index 07e3dd25dd5b..d9505c440a43 100644 --- a/nixos/modules/services/display-managers/ly.nix +++ b/nixos/modules/services/display-managers/ly.nix @@ -65,9 +65,7 @@ in package = mkPackageOption pkgs [ "ly" ] { }; settings = mkOption { - type = - with lib.types; - attrsOf iniFmt.lib.types.atom; + type = with lib.types; attrsOf iniFmt.lib.types.atom; default = { }; example = { load = false;