diff --git a/flake.lock b/flake.lock
index f1f97418..c9cf031e 100644
--- a/flake.lock
+++ b/flake.lock
@@ -42,11 +42,11 @@
     },
     "emacs-overlay": {
       "locked": {
-        "lastModified": 1634519219,
-        "narHash": "sha256-WdGukmfKgQB6JczR2d5TuRFBhN0dnT10UGC+P6zmP+k=",
+        "lastModified": 1634549090,
+        "narHash": "sha256-MIMBcJHA6fN9ZoCn95c8GoD4GK147EJh9jvIdQ2PFBY=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "1a89af3378352766c7b6e0ee14fc2fe71068c92c",
+        "rev": "56654fcb7b38712806a4673d9d654d206ebecdfe",
         "type": "github"
       },
       "original": {
@@ -77,11 +77,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1634539674,
-        "narHash": "sha256-XJ7hHLM3XZjLbCfrkA0fGs0QWhHyly9jQA1q95+TamM=",
+        "lastModified": 1634543124,
+        "narHash": "sha256-sPjP5GjZ0DgTgY8KljhGeix4L5ey7A3L1nm6lDffTh0=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "d244ca125f140391c5a8164f576c9cf7ce2f15e1",
+        "rev": "b5d738b5a3f8c3738433e0aa6482afb4ac635380",
         "type": "github"
       },
       "original": {
diff --git a/machines/kharbranth/default.nix b/machines/kharbranth/default.nix
index c45de963..b42895ee 100644
--- a/machines/kharbranth/default.nix
+++ b/machines/kharbranth/default.nix
@@ -37,6 +37,7 @@
     graphical.enable = true;
     programs = {
       eid.enable = true;
+      element.enable = true;
       hledger.enable = true;
       obs.enable = true;
     };
diff --git a/machines/kholinar/default.nix b/machines/kholinar/default.nix
index ff7c3975..ae7f377b 100644
--- a/machines/kholinar/default.nix
+++ b/machines/kholinar/default.nix
@@ -36,6 +36,7 @@
       calibre.enable = false;
       deluge.enable = true;
       eid.enable = true;
+      element.enable = true;
       hledger.enable = true;
       obs.enable = true;
     };
diff --git a/modules/graphical/sway/default.nix b/modules/graphical/sway/default.nix
index 5a87cf71..eb02280e 100644
--- a/modules/graphical/sway/default.nix
+++ b/modules/graphical/sway/default.nix
@@ -150,13 +150,16 @@ in
           workspace 8 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
           workspace 9 output DP-3 DP-4 DP-5 HDMI-A-1 eDP-1
 
-          workspace 1
-          exec ${pkgs.qutebrowser}/bin/qutebrowser
-
           no_focus [title="Microsoft Teams Notification"]
 
           default_border pixel
-        '';
+
+          workspace 1
+          exec ${pkgs.qutebrowser}/bin/qutebrowser
+        '' + (lib.optionalString config.chvp.programs.element.enable ''
+          workspace 3
+          exec ${pkgs.element-desktop-wayland}/bin/element-desktop
+        '');
         extraSessionCommands = ''
           export XDG_SESSION_TYPE=wayland
           export XDG_CURRENT_DESKTOP=sway
diff --git a/modules/programs/default.nix b/modules/programs/default.nix
index cad88aaf..11faeb0a 100644
--- a/modules/programs/default.nix
+++ b/modules/programs/default.nix
@@ -5,6 +5,7 @@
     ./calibre
     ./deluge
     ./eid
+    ./element
     ./hledger
     ./obs
   ];
diff --git a/modules/programs/element/default.nix b/modules/programs/element/default.nix
new file mode 100644
index 00000000..b682635b
--- /dev/null
+++ b/modules/programs/element/default.nix
@@ -0,0 +1,17 @@
+{ config, lib, pkgs, ... }:
+
+{
+  options.chvp.programs.element.enable = lib.mkOption {
+    default = false;
+    example = true;
+  };
+
+  config = lib.mkIf config.chvp.programs.element.enable {
+    chvp.base.zfs.homeLinks = [
+      { path = ".config/Element"; type = "cache"; }
+    ];
+    home-manager.users.charlotte = { ... }: {
+      home.packages = [ pkgs.element-desktop-wayland ];
+    };
+  };
+}