diff --git a/options/custom/programs/default.nix b/options/custom/programs/default.nix
index df14138..d2dc2cf 100644
--- a/options/custom/programs/default.nix
+++ b/options/custom/programs/default.nix
@@ -54,6 +54,7 @@ with lib; {
       gamemode.enable = true;
       gamescope.enable = true;
       #// gnome-shell.enable = true;
+      goldwarden.enable = true;
       gpg.enable = true;
       #// gtklock.enable = true;
       hyprlock.enable = true;
diff --git a/options/custom/programs/goldwarden.nix b/options/custom/programs/goldwarden.nix
new file mode 100644
index 0000000..ce3a548
--- /dev/null
+++ b/options/custom/programs/goldwarden.nix
@@ -0,0 +1,25 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib; let
+  cfg = config.custom.programs.goldwarden;
+in {
+  options.custom.programs.goldwarden = {
+    enable = mkOption {default = false;};
+    flatpak = mkOption {default = true;};
+  };
+
+  config = mkIf cfg.enable {
+    # https://github.com/quexten/goldwarden
+    programs.goldwarden.enable = true;
+
+    # https://github.com/quexten/goldwarden/wiki/Flatpak-Configuration
+    systemd.user.services.goldwarden = mkIf cfg.flatpak {
+      environment = {
+        GOLDWARDEN_SOCKET_PATH = "%h/.var/app/com.quexten.Goldwarden/data/goldwarden.sock";
+      };
+    };
+  };
+}