diff --git a/modules/base.nix b/modules/base.nix
index 29d1b86..a89ad86 100644
--- a/modules/base.nix
+++ b/modules/base.nix
@@ -26,7 +26,11 @@
       ripgrep
       xdg-utils
       webcord
-      element-desktop
+      (writeScriptBin "element-desktop" ''
+        #!${runtimeShell}
+        exec ${element-desktop}/bin/element-desktop \
+          --password-store=gnome-libsecret "$@"
+      '')
     ];
     shells = with pkgs; [ bash ];
     sessionVariables.EDITOR = lib.mkDefault "vim";
@@ -49,5 +53,8 @@
   imports = [
     ./zen.nix
   ];
+
+  services.gnome.gnome-keyring.enable = true;
+  security.polkit.enable = true;
 }
 
diff --git a/modules/dev/default.nix b/modules/dev/default.nix
index 814997e..2891820 100644
--- a/modules/dev/default.nix
+++ b/modules/dev/default.nix
@@ -50,7 +50,5 @@
   programs.gnupg.agent = { enable = true; enableSSHSupport = true; };
 
   services.openssh.enable = true;
-  services.gnome.gnome-keyring.enable = true;
-
 }