From 5ee778d42408dac493338b2e5e761443c88d5ae7 Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 17 Aug 2024 14:29:45 +1000 Subject: [PATCH 1/2] regreet: fix theming options not under GTK header Fixes #335082 --- nixos/modules/programs/regreet.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix index cec3e0bf5046..8a6cfc1b5f40 100644 --- a/nixos/modules/programs/regreet.nix +++ b/nixos/modules/programs/regreet.nix @@ -141,7 +141,7 @@ in fonts.packages = [ cfg.font.package ]; - programs.regreet.settings = { + programs.regreet.settings.GTK = { cursor_theme_name = cfg.cursorTheme.name; font_name = "${cfg.font.name} ${toString cfg.font.size}"; icon_theme_name = cfg.iconTheme.name; From 3ffc982bfa26ef6272cb6a169bf94638b3dd269d Mon Sep 17 00:00:00 2001 From: Michael Hoang Date: Sat, 17 Aug 2024 14:32:49 +1000 Subject: [PATCH 2/2] regreet: don't allow settings to be a path --- nixos/modules/programs/regreet.nix | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/nixos/modules/programs/regreet.nix b/nixos/modules/programs/regreet.nix index 8a6cfc1b5f40..1f83f610dbf1 100644 --- a/nixos/modules/programs/regreet.nix +++ b/nixos/modules/programs/regreet.nix @@ -27,7 +27,7 @@ in package = lib.mkPackageOption pkgs [ "greetd" "regreet" ] { }; settings = lib.mkOption { - type = lib.types.either lib.types.path settingsFormat.type; + type = settingsFormat.type; default = { }; description = '' ReGreet configuration file. Refer @@ -160,9 +160,7 @@ in else {text = cfg.extraCss;}; "greetd/regreet.toml".source = - if lib.isPath cfg.settings - then cfg.settings - else settingsFormat.generate "regreet.toml" cfg.settings; + settingsFormat.generate "regreet.toml" cfg.settings; }; systemd.tmpfiles.settings."10-regreet" = let