diff --git a/homes/x86_64-linux/marley@nyx/default.nix b/homes/x86_64-linux/marley@nyx/default.nix
index 69ffe92..f90d5d2 100644
--- a/homes/x86_64-linux/marley@nyx/default.nix
+++ b/homes/x86_64-linux/marley@nyx/default.nix
@@ -36,6 +36,7 @@ in
       man = enabled;
       ncmpcpp = enabled;
       neo = enabled;
+      rbw = enabled;
       systemctl = enabled;
     };
     xorg = {
diff --git a/modules/home/programs/rbw/default.nix b/modules/home/programs/rbw/default.nix
new file mode 100644
index 0000000..916db2e
--- /dev/null
+++ b/modules/home/programs/rbw/default.nix
@@ -0,0 +1,23 @@
+{
+  lib,
+  config,
+  namespace,
+  ...
+}:
+let
+  inherit (lib) mkIf;
+  inherit (lib.${namespace}) mkEnableModule;
+
+  cfg = config.${namespace}.programs.rbw;
+in
+{
+  options = mkEnableModule "programs.rbw";
+
+  config = mkIf cfg.enable {
+    programs.rbw = {
+      enable = true;
+
+      settings.email = "bitwarden@punkfairie.net";
+    };
+  };
+}
diff --git a/old/home/programs/rbw.nix b/old/home/programs/rbw.nix
deleted file mode 100644
index 9541bdf..0000000
--- a/old/home/programs/rbw.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ _ }:
-{
-  programs.rbw = {
-    enable = true;
-
-    settings.email = "bitwarden@punkfairie.net";
-  };
-}