Unverified Commit 5d500e3d authored by Jörg Thalheim's avatar Jörg Thalheim Committed by GitHub
Browse files

Merge pull request #335283 from Enzime/fix/regreet 

regreet: fix theming options not under GTK header
parents 3f400780 3ffc982b

nixos/modules/programs/regreet.nix

+3 −5
Original line number Diff line number Diff line
@@ -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
@@ -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;
@@ -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