2 files changed, 16 insertions, 13 deletions
diff --git a/modules/home-manager/personal/gui/x/i3/default.nix b/modules/home-manager/personal/gui/x/i3/default.nix
index 715ed44..b802f25 100644
--- a/modules/home-manager/personal/gui/x/i3/default.nix
+++ b/modules/home-manager/personal/gui/x/i3/default.nix
@@ -25,12 +25,12 @@ in {
               { class = "MUBI"; }
               { class = "Deezer"; }
             ];
-          } // lib.optionalAttrs config.personal.profiles.social {
-            "9: social" = [
-              { class = "^Mail$"; }
-              { class = "^thunderbird$"; }
-              { class = "^Signal$"; }
-            ];
+          } // lib.optionalAttrs config.personal.profiles.social.enable {
+            "9: social" = [ { class = "^Mail$"; } { class = "^thunderbird$"; } ]
+              ++ lib.optional
+              config.personal.profiles.social.identities.personal {
+                class = "^signal-desktop$";
+              };
           } // {
             "10: passwords" = [{
               # matches <some db>.kbdx [Locked] - KeePassXC
diff --git a/modules/home-manager/personal/gui/x/i3/startup.nix b/modules/home-manager/personal/gui/x/i3/startup.nix
index b40247b..f3b54a2 100644
--- a/modules/home-manager/personal/gui/x/i3/startup.nix
+++ b/modules/home-manager/personal/gui/x/i3/startup.nix
@@ -11,12 +11,15 @@
     (autostart { command = "keepassxc"; })
   ]
   ++ autostartIf config.programs.thunderbird.enable { command = "thunderbird"; }
-  ++ autostartIf config.personal.profiles.social { command = "signal-desktop"; }
-  # ++ autostartIf config.services.redshift.enable {
-  #   command = "systemctl --user start redshift";
-  # }
-  # ++ autostartIf config.services.xidlehook.enable {
-  #   command = "systemctl --user start xidlehook.service";
-  # }
+  ++ autostartIf (config.personal.profiles.social.enable
+    && config.personal.profiles.social.identities.personal) {
+      command = "signal-desktop";
+    }
+    # ++ autostartIf config.services.redshift.enable {
+    #   command = "systemctl --user start redshift";
+    # }
+    # ++ autostartIf config.services.xidlehook.enable {
+    #   command = "systemctl --user start xidlehook.service";
+    # }
   ;
 }