Mirrors/home-manager
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

udiskie: use xsession.preferStatusNotifierItems

Browse source
This commit is contained in:
Robert Helgesson 2018-07-24 12:59:11 +02:00
parent a5a49c350d
commit 6694330bb2
No known key found for this signature in database
GPG key ID: 36BDAA14C2797E89
1 changed files with 11 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
modules/services/udiskie.nix
View file

@ -13,7 +13,7 @@ let
(if cfg.notify then "n" else "N") (if cfg.notify then "n" else "N")
({ always = "t"; auto = "s"; never = "T"; }.${cfg.tray}) ({ always = "t"; auto = "s"; never = "T"; }.${cfg.tray})
] ]
++ optional cfg.sni "--appindicator" ++ optional config.xsession.preferStatusNotifierItems "--appindicator"
); );
in in
@ -21,6 +21,16 @@ in
{ {
meta.maintainers = [ maintainers.rycee ]; meta.maintainers = [ maintainers.rycee ];
imports = [
(mkRemovedOptionModule [ "services" "udiskie" "sni" ] ''
Support for Status Notifier Items is now configured globally through the
xsession.preferStatusNotifierItems
option. Please change to use that instead.
'')
];
options = { options = {
services.udiskie = { services.udiskie = {
enable = mkEnableOption "udiskie mount daemon"; enable = mkEnableOption "udiskie mount daemon";
@ -37,12 +47,6 @@ in
description = "Whether to show pop-up notifications."; description = "Whether to show pop-up notifications.";
}; };
sni = mkOption {
type = types.bool;
default = false;
description = "Whether to enable sni (appindicator) support.";
};
tray = mkOption { tray = mkOption {
type = types.enum [ "always" "auto" "never" ]; type = types.enum [ "always" "auto" "never" ];
default = "auto"; default = "auto";