home: split identities from social profile

2 files changed, 6 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 b802f25..d7ec295 100644
--- a/modules/home-manager/personal/gui/x/i3/default.nix
+++ b/modules/home-manager/personal/gui/x/i3/default.nix
@@ -25,10 +25,10 @@ in {
               { class = "MUBI"; }
               { class = "Deezer"; }
             ];
-          } // lib.optionalAttrs config.personal.profiles.social.enable {
+          } // lib.optionalAttrs config.personal.profiles.social {
             "9: social" = [ { class = "^Mail$"; } { class = "^thunderbird$"; } ]
               ++ lib.optional
-              config.personal.profiles.social.identities.personal {
+              config.personal.identities.personal {
                 class = "^signal-desktop$";
               };
           } // {
diff --git a/modules/home-manager/personal/gui/x/i3/startup.nix b/modules/home-manager/personal/gui/x/i3/startup.nix
index f3b54a2..521b666 100644
--- a/modules/home-manager/personal/gui/x/i3/startup.nix
+++ b/modules/home-manager/personal/gui/x/i3/startup.nix
@@ -11,15 +11,8 @@
     (autostart { command = "keepassxc"; })
   ]
   ++ autostartIf config.programs.thunderbird.enable { command = "thunderbird"; }
-  ++ 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";
-    # }
-  ;
+  ++ autostartIf
+  (config.personal.profiles.social && config.personal.identities.personal) {
+    command = "signal-desktop";
+  };
 }