udiskie: use xsession.preferStatusNotifierItems

1 files changed, 11 insertions, 7 deletions

diff --git a/modules/services/udiskie.nix b/modules/services/udiskie.nix
index 2976a631892..c058a23de6c 100644
--- a/modules/services/udiskie.nix
+++ b/modules/services/udiskie.nix
@@ -13,7 +13,7 @@ let
         (if cfg.notify then "n" else "N")
         ({ always = "t"; auto = "s"; never = "T"; }.${cfg.tray})
       ]
-      ++ optional cfg.sni "--appindicator"
+      ++ optional config.xsession.preferStatusNotifierItems "--appindicator"
     );
 
 in
@@ -21,6 +21,16 @@ in
 {
   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 = {
     services.udiskie = {
       enable = mkEnableOption "udiskie mount daemon";
@@ -37,12 +47,6 @@ in
         description = "Whether to show pop-up notifications.";
       };
 
-      sni = mkOption {
-        type = types.bool;
-        default = false;
-        description = "Whether to enable sni (appindicator) support.";
-      };
-
       tray = mkOption {
         type = types.enum [ "always" "auto" "never" ];
         default = "auto";