diff --git a/home/hosts/andromache/default.nix b/home/hosts/andromache/default.nix
index 43c682d1..550e576b 100644
--- a/home/hosts/andromache/default.nix
+++ b/home/hosts/andromache/default.nix
@@ -59,6 +59,7 @@
   shell.bash.aliases.lang-js = true;
   shell.bash.addBinToPath = true;
   devenv.enable = true;
+  keepassxc.enable = true;
   direnv.enable = true;
   nvim.enable = true;
   pandoc.enable = true;
diff --git a/home/hosts/astyanax/default.nix b/home/hosts/astyanax/default.nix
index 071d63f5..03e3d76f 100644
--- a/home/hosts/astyanax/default.nix
+++ b/home/hosts/astyanax/default.nix
@@ -56,6 +56,7 @@
   shell.bash.addBinToPath = true;
   my.yubikey.enable = true;
   devenv.enable = true;
+  keepassxc.enable = true;
   direnv.enable = true;
   nvim.enable = true;
   nfc.enable = true;
diff --git a/home/hosts/work/default.nix b/home/hosts/work/default.nix
index 6ac0d06d..7327317a 100644
--- a/home/hosts/work/default.nix
+++ b/home/hosts/work/default.nix
@@ -65,6 +65,7 @@
 
   browser.primary = "firefox";
   devenv.enable = true;
+  keepassxc.enable = true;
   direnv.enable = true;
   nvim.enable = true;
   my.dconf.enable = true;
diff --git a/home/modules/keepassxc/default.nix b/home/modules/keepassxc/default.nix
index 0f78729a..73a31cc5 100644
--- a/home/modules/keepassxc/default.nix
+++ b/home/modules/keepassxc/default.nix
@@ -1,8 +1,21 @@
 {
-  programs.keepassxc = {
-    enable = true;
-    settings = {
-      Browser.Enabled = true;
+  config,
+  lib,
+  ...
+}:
+
+let
+  cfg = config.keepassxc;
+in
+{
+  options.keepassxc.enable = lib.mkEnableOption "KeePassXC";
+
+  config = lib.mkIf cfg.enable {
+    programs.keepassxc = {
+      enable = true;
+      settings = {
+        Browser.Enabled = true;
+      };
     };
   };
 }