diff --git a/configs/home-manager/foo-dogsquared/default.nix b/configs/home-manager/foo-dogsquared/default.nix
index d2f94315..adc43aaa 100644
--- a/configs/home-manager/foo-dogsquared/default.nix
+++ b/configs/home-manager/foo-dogsquared/default.nix
@@ -117,11 +117,6 @@ in {
   nixpkgs.config = import ./config/nixpkgs/config.nix;
   xdg.configFile."nixpkgs/config.nix".source = ./config/nixpkgs/config.nix;
 
-  home.packages = with pkgs;
-    [
-      gopass # An improved version of the password manager for hipsters.
-    ];
-
   home.stateVersion = "23.11";
 
   xdg.configFile = {
diff --git a/configs/home-manager/foo-dogsquared/modules/default.nix b/configs/home-manager/foo-dogsquared/modules/default.nix
index e34f84b4..3d8dced0 100644
--- a/configs/home-manager/foo-dogsquared/modules/default.nix
+++ b/configs/home-manager/foo-dogsquared/modules/default.nix
@@ -15,6 +15,7 @@
     ./programs/nushell.nix
     ./programs/custom-homepage.nix
     ./programs/shell.nix
+    ./programs/password-utilities.nix
     ./programs/terminal-multiplexer.nix
     ./programs/terminal-emulator.nix
     ./programs/vs-code.nix
diff --git a/configs/home-manager/foo-dogsquared/modules/programs/password-utilities.nix b/configs/home-manager/foo-dogsquared/modules/programs/password-utilities.nix
new file mode 100644
index 00000000..8456a31e
--- /dev/null
+++ b/configs/home-manager/foo-dogsquared/modules/programs/password-utilities.nix
@@ -0,0 +1,26 @@
+{ config, lib, pkgs, ... }:
+
+let
+  userCfg = config.users.foo-dogsquared;
+  cfg = userCfg.programs.password-utilities;
+in
+{
+  options.users.foo-dogsquared.programs.password-utilities = {
+    enable = lib.mkEnableOption "password utilities setup";
+  };
+
+  config = lib.mkIf cfg.enable {
+    home.packages = with pkgs;
+      [
+        gopass # An improved version of the password manager for hipsters.
+      ];
+
+    programs.diceware = {
+      enable = true;
+      settings.diceware = {
+        num = 7;
+        specials = 4;
+      };
+    };
+  };
+}
diff --git a/configs/home-manager/foo-dogsquared/modules/setups/research.nix b/configs/home-manager/foo-dogsquared/modules/setups/research.nix
index fe3dda12..73945136 100644
--- a/configs/home-manager/foo-dogsquared/modules/setups/research.nix
+++ b/configs/home-manager/foo-dogsquared/modules/setups/research.nix
@@ -46,6 +46,8 @@ in {
 
   config = lib.mkIf cfg.enable (lib.mkMerge [
     {
+      users.foo-dogsquared.programs.password-utilities.enable = lib.mkDefault true;
+
       state.ports.syncthing.value = 8384;
 
       home.packages = with pkgs; [