diff --git a/configurations/home-manager/leyla/packages/default.nix b/configurations/home-manager/leyla/packages/default.nix
index 0917d04..a3669af 100644
--- a/configurations/home-manager/leyla/packages/default.nix
+++ b/configurations/home-manager/leyla/packages/default.nix
@@ -72,6 +72,9 @@ in {
           noita-entangled-worlds.enable = true;
           tor-browser.enable = true;
           gdx-liftoff.enable = true;
+          proton-mail-pwa.enable = true;
+          proton-calendar-pwa.enable = true;
+          matrix-cyberia-pwa.enable = true;
         })
       ];
     }
diff --git a/modules/home-manager-modules/programs/default.nix b/modules/home-manager-modules/programs/default.nix
index 5b3a169..916eb31 100644
--- a/modules/home-manager-modules/programs/default.nix
+++ b/modules/home-manager-modules/programs/default.nix
@@ -46,5 +46,8 @@
     ./gdx-liftoff.nix
     ./tor-browser.nix
     ./vmware-workstation.nix
+    ./proton-mail-pwa.nix
+    ./proton-calendar-pwa.nix
+    ./matrix-cyberia-pwa.nix
   ];
 }
diff --git a/modules/home-manager-modules/programs/matrix-cyberia-pwa.nix b/modules/home-manager-modules/programs/matrix-cyberia-pwa.nix
new file mode 100644
index 0000000..644df92
--- /dev/null
+++ b/modules/home-manager-modules/programs/matrix-cyberia-pwa.nix
@@ -0,0 +1,56 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: let
+  cfg = config.programs.matrix-cyberia-pwa;
+  isChromium = cfg.package == pkgs.chromium;
+  isBrowserImpermanenceSupported = cfg.package == pkgs.chromium;
+in {
+  options.programs.matrix-cyberia-pwa = {
+    enable = lib.mkEnableOption "enable Matrix Cyberia PWA";
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.chromium;
+      description = "Browser package to use for the PWA";
+    };
+    impermanence = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = isBrowserImpermanenceSupported;
+        description = "Enable impermanence configuration for the PWA. Only automatically enabled when using chromium.";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    {
+      warnings =
+        lib.optional (config.impermanence.enable && !isBrowserImpermanenceSupported)
+        "matrix-cyberia-pwa: Using unsupported package. You will need to manually configure pwa for ${cfg.package.pname}. Supported package(s) ${pkgs.chromium.pname}";
+    }
+    (
+      lib.mkIf isChromium {
+        xdg.desktopEntries.matrix-cyberia-pwa = {
+          name = "Matrix (Cyberia)";
+          type = "Application";
+          exec = "${cfg.package}/bin/${cfg.package.pname} --app=https://chat.cyberia.club/";
+          icon = "matrix";
+          terminal = false;
+          categories = ["Network" "InstantMessaging"];
+        };
+      }
+    )
+    (
+      lib.mkIf (config.impermanence.enable && cfg.impermanence.enable && isChromium) {
+        home.persistence."/persist${config.home.homeDirectory}" = {
+          directories = [
+            "${config.xdg.configHome}/chromium"
+          ];
+          allowOther = true;
+        };
+      }
+    )
+  ]);
+}
diff --git a/modules/home-manager-modules/programs/proton-calendar-pwa.nix b/modules/home-manager-modules/programs/proton-calendar-pwa.nix
new file mode 100644
index 0000000..33796e2
--- /dev/null
+++ b/modules/home-manager-modules/programs/proton-calendar-pwa.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: let
+  cfg = config.programs.proton-calendar-pwa;
+  isChromium = cfg.package == pkgs.chromium;
+  isBrowserImpermanenceSupported = cfg.package == pkgs.chromium;
+in {
+  options.programs.proton-calendar-pwa = {
+    enable = lib.mkEnableOption "enable Proton Calendar PWA";
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.chromium;
+      description = "Browser package to use for the PWA";
+    };
+    impermanence = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = isBrowserImpermanenceSupported;
+        description = "Enable impermanence configuration for the PWA. Only automatically enabled when using chromium.";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    {
+      warnings =
+        lib.optional (config.impermanence.enable && !isBrowserImpermanenceSupported)
+        "proton-calendar-pwa: Using unsupported package. You will need to manually configure pwa for ${cfg.package.pname}. Supported package(s) ${pkgs.chromium.pname}";
+    }
+    (
+      lib.mkIf isChromium {
+        xdg.desktopEntries.proton-calendar-pwa = {
+          name = "Proton Calendar";
+          type = "Application";
+          exec = "${cfg.package}/bin/${cfg.package.pname} --app=https://calendar.proton.me";
+          icon = "chrome-ojibjkjikcpjonjjngfkegflhmffeemk-Default";
+          terminal = false;
+        };
+      }
+    )
+    (
+      lib.mkIf (config.impermanence.enable && cfg.impermanence.enable && isChromium) {
+        home.persistence."/persist${config.home.homeDirectory}" = {
+          directories = [
+            "${config.xdg.configHome}/chromium"
+          ];
+          allowOther = true;
+        };
+      }
+    )
+  ]);
+}
diff --git a/modules/home-manager-modules/programs/proton-mail-pwa.nix b/modules/home-manager-modules/programs/proton-mail-pwa.nix
new file mode 100644
index 0000000..3a3fe89
--- /dev/null
+++ b/modules/home-manager-modules/programs/proton-mail-pwa.nix
@@ -0,0 +1,55 @@
+{
+  lib,
+  pkgs,
+  config,
+  ...
+}: let
+  cfg = config.programs.proton-mail-pwa;
+  isChromium = cfg.package == pkgs.chromium;
+  isBrowserImpermanenceSupported = cfg.package == pkgs.chromium;
+in {
+  options.programs.proton-mail-pwa = {
+    enable = lib.mkEnableOption "enable Proton Mail PWA";
+    package = lib.mkOption {
+      type = lib.types.package;
+      default = pkgs.chromium;
+      description = "Browser package to use for the PWA";
+    };
+    impermanence = {
+      enable = lib.mkOption {
+        type = lib.types.bool;
+        default = isBrowserImpermanenceSupported;
+        description = "Enable impermanence configuration for the PWA. Only automatically enabled when using chromium.";
+      };
+    };
+  };
+
+  config = lib.mkIf cfg.enable (lib.mkMerge [
+    {
+      warnings =
+        lib.optional (config.impermanence.enable && !isBrowserImpermanenceSupported)
+        "proton-mail-pwa: Using unsupported package. You will need to manually configure pwa for ${cfg.package.pname}. Supported package(s) ${pkgs.chromium.pname}";
+    }
+    (
+      lib.mkIf isChromium {
+        xdg.desktopEntries.proton-mail-pwa = {
+          name = "Proton Mail";
+          type = "Application";
+          exec = "${cfg.package}/bin/${cfg.package.pname} --app=https://mail.proton.me";
+          icon = "chrome-jnpecgipniidlgicjocehkhajgdnjekh-Default";
+          terminal = false;
+        };
+      }
+    )
+    (
+      lib.mkIf (config.impermanence.enable && cfg.impermanence.enable && isChromium) {
+        home.persistence."/persist${config.home.homeDirectory}" = {
+          directories = [
+            "${config.xdg.configHome}/chromium"
+          ];
+          allowOther = true;
+        };
+      }
+    )
+  ]);
+}