fix: correct desktop and Evolution activation

modules/capabilities/desktop-defaults.nix

@@ -34,6 +34,34 @@
       appCommand = id: "${command} --profile-directory=Default --app-id=${id}";
       actualId = "ahoihnifhakgijcmjlhbcgehigihinlo";
       whatsappId = "hnpfjngllnobngcgfapefoaidbinmjnm";
+      actualDesktop = pkgs.makeDesktopItem {
+        name = "vivaldi-${actualId}-Default";
+        desktopName = "Actual";
+        exec = appCommand actualId;
+        icon = "vivaldi-${actualId}-Default";
+        extraConfig.StartupWMClass = "crx_${actualId}";
+        actions = {
+          Accounts = {
+            name = "Accounts";
+            exec = "${appCommand actualId} --app-launch-url-for-shortcuts-menu-item=${config.facts.services.actual.origin}/accounts";
+          };
+          "Add-Transaction" = {
+            name = "Add Transaction";
+            exec = "${appCommand actualId} --app-launch-url-for-shortcuts-menu-item=${config.facts.services.actual.origin}/transactions/new";
+          };
+          Reports = {
+            name = "Reports";
+            exec = "${appCommand actualId} --app-launch-url-for-shortcuts-menu-item=${config.facts.services.actual.origin}/reports";
+          };
+        };
+      };
+      whatsappDesktop = pkgs.makeDesktopItem {
+        name = "vivaldi-${whatsappId}-Default";
+        desktopName = "WhatsApp Web";
+        exec = appCommand whatsappId;
+        icon = "vivaldi-${whatsappId}-Default";
+        extraConfig.StartupWMClass = "crx_${whatsappId}";
+      };
     in
     {
       desktop.commands.browser = [ command ];
@@ -42,30 +70,16 @@
         sessionVariables.BROWSER = command;
       };
       xdg = {
-        desktopEntries = {
-          "vivaldi-${actualId}-Default" = {
-            name = "Actual";
-            exec = appCommand actualId;
-            icon = "vivaldi-${actualId}-Default";
-            settings.StartupWMClass = "crx_${actualId}";
-            actions = {
-              Accounts.exec = "${appCommand actualId} --app-launch-url-for-shortcuts-menu-item=${config.facts.services.actual.origin}/accounts";
-              "Add-Transaction" = {
-                name = "Add Transaction";
-                exec = "${appCommand actualId} --app-launch-url-for-shortcuts-menu-item=${config.facts.services.actual.origin}/transactions/new";
-              };
-              Reports.exec = "${appCommand actualId} --app-launch-url-for-shortcuts-menu-item=${config.facts.services.actual.origin}/reports";
-            };
+        dataFile = {
+          "applications/vivaldi-${actualId}-Default.desktop" = {
+            force = true;
+            source = "${actualDesktop}/share/applications/vivaldi-${actualId}-Default.desktop";
           };
-
-          "vivaldi-${whatsappId}-Default" = {
-            name = "WhatsApp Web";
-            exec = appCommand whatsappId;
-            icon = "vivaldi-${whatsappId}-Default";
-            settings.StartupWMClass = "crx_${whatsappId}";
+          "applications/vivaldi-${whatsappId}-Default.desktop" = {
+            force = true;
+            source = "${whatsappDesktop}/share/applications/vivaldi-${whatsappId}-Default.desktop";
           };
         };
-
         mimeApps.defaultApplicationPackages = [ pkgs.vivaldi ];
       };
     };

modules/capabilities/pim.nix

@@ -8,6 +8,15 @@ let
   homeModules = config.flake.modules.homeManager;
 in
 {
+  flake.modules.nixos.evolution =
+    { pkgs, ... }:
+    {
+      programs.evolution = {
+        enable = true;
+        plugins = [ pkgs.evolution-ews ];
+      };
+    };
+
   flake.modules.homeManager.email =
     {
       config,
@@ -67,12 +76,6 @@ in
         };
     in
     {
-      home.packages = [
-        (pkgs.evolutionWithPlugins.override {
-          plugins = [ pkgs.evolution-ews ];
-        })
-      ];
-
       programs.thunderbird = {
         enable = true;
         profiles.${config.home.username} = {