diff options
author | José Romildo Malaquias <malaquias@gmail.com> | 2017-12-24 11:21:18 -0200 |
---|---|---|
committer | Orivej Desh <orivej@gmx.fr> | 2018-01-06 02:20:53 +0000 |
commit | d0eb40b311e7e6b474ac34c9b981cbdb09f1aa30 (patch) | |
tree | 3f8ab6c42111494c5b46e13de43d9b6ea1657bba /nixos | |
parent | 1658da7e5b375d31690722433bb55ec6e17b0f99 (diff) | |
download | nixlib-d0eb40b311e7e6b474ac34c9b981cbdb09f1aa30.tar nixlib-d0eb40b311e7e6b474ac34c9b981cbdb09f1aa30.tar.gz nixlib-d0eb40b311e7e6b474ac34c9b981cbdb09f1aa30.tar.bz2 nixlib-d0eb40b311e7e6b474ac34c9b981cbdb09f1aa30.tar.lz nixlib-d0eb40b311e7e6b474ac34c9b981cbdb09f1aa30.tar.xz nixlib-d0eb40b311e7e6b474ac34c9b981cbdb09f1aa30.tar.zst nixlib-d0eb40b311e7e6b474ac34c9b981cbdb09f1aa30.zip |
lightdm-gtk-greater: add configuration options for clock format and indicators
Diffstat (limited to 'nixos')
-rw-r--r-- | nixos/doc/manual/release-notes/rl-1803.xml | 45 | ||||
-rw-r--r-- | nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix | 31 |
2 files changed, 76 insertions, 0 deletions
diff --git a/nixos/doc/manual/release-notes/rl-1803.xml b/nixos/doc/manual/release-notes/rl-1803.xml index 0ab119232eeb..c8549e7c4adc 100644 --- a/nixos/doc/manual/release-notes/rl-1803.xml +++ b/nixos/doc/manual/release-notes/rl-1803.xml @@ -189,6 +189,51 @@ following incompatible changes:</para> corrupted blocks. </para> </listitem> + <listitem> + <para> + <literal>displayManager.lightdm.greeters.gtk.clock-format.</literal> + has been added, the clock format string (as expected by + strftime, e.g. <literal>%H:%M</literal>) to use with the lightdm + gtk greeter panel. + </para> + <para> + If set to null the default clock format is used. + </para> + </listitem> + <listitem> + <para> + <literal>displayManager.lightdm.greeters.gtk.indicators</literal> + has been added, a list of allowed indicator modules to use with + the lightdm gtk greeter panel. + </para> + <para> + Built-in indicators include <literal>~a11y</literal>, + <literal>~language</literal>, <literal>~session</literal>, + <literal>~power</literal>, <literal>~clock</literal>, + <literal>~host</literal>, <literal>~spacer</literal>. Unity + indicators can be represented by short name + (e.g. <literal>sound</literal>, <literal>power</literal>), + service file name, or absolute path. + </para> + <para> + If set to <literal>null</literal> the default indicators are + used. + </para> + <para> + In order to have the previous default configuration add +<programlisting> + services.xserver.displayManager.lightdm.greeters.gtk.indicators = [ + "~host" "~spacer" + "~clock" "~spacer" + "~session" + "~language" + "~a11y" + "~power" + ]; +</programlisting> + to your <literal>configuration.nix</literal>. + </para> + </listitem> </itemizedlist> </section> diff --git a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix index 1d5dcb2c7cbe..35b715b98fcd 100644 --- a/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix +++ b/nixos/modules/services/x11/display-managers/lightdm-greeters/gtk.nix @@ -45,6 +45,8 @@ let theme-name = ${cfg.theme.name} icon-theme-name = ${cfg.iconTheme.name} background = ${ldmcfg.background} + ${optionalString (cfg.clock-format != null) "clock-format = ${cfg.clock-format}"} + ${optionalString (cfg.indicators != null) "indicators = ${concatStringsSep ";" cfg.indicators}"} ${cfg.extraConfig} ''; @@ -104,6 +106,35 @@ in }; + clock-format = mkOption { + type = types.nullOr types.str; + default = null; + example = "%F"; + description = '' + Clock format string (as expected by strftime, e.g. "%H:%M") + to use with the lightdm gtk greeter panel. + + If set to null the default clock format is used. + ''; + }; + + indicators = mkOption { + type = types.nullOr (types.listOf types.str); + default = null; + example = [ "~host" "~spacer" "~clock" "~spacer" "~session" "~language" "~a11y" "~power" ]; + description = '' + List of allowed indicator modules to use for the lightdm gtk + greeter panel. + + Built-in indicators include "~a11y", "~language", "~session", + "~power", "~clock", "~host", "~spacer". Unity indicators can be + represented by short name (e.g. "sound", "power"), service file name, + or absolute path. + + If set to null the default indicators are used. + ''; + }; + extraConfig = mkOption { type = types.lines; default = ""; |