diff --git a/home/christoph/default.nix b/home/christoph/default.nix
index 8e0a3eb1..a0ca67be 100644
--- a/home/christoph/default.nix
+++ b/home/christoph/default.nix
@@ -168,6 +168,10 @@ rec {
     #   preview = true;
     # };
 
+    rofi = {
+      enable = true;
+    };
+
     vscode.enable = true;
 
     waybar = {
diff --git a/home/modules/default.nix b/home/modules/default.nix
index f3489c28..d1c73241 100644
--- a/home/modules/default.nix
+++ b/home/modules/default.nix
@@ -24,6 +24,7 @@
     ./nextcloud
     ./nnn
     ./ranger
+    ./rofi
     ./vscode
     ./waybar
   ];
diff --git a/home/modules/hyprland/default.nix b/home/modules/hyprland/default.nix
index 71884a03..2c4cb040 100644
--- a/home/modules/hyprland/default.nix
+++ b/home/modules/hyprland/default.nix
@@ -177,21 +177,5 @@ in {
         enable = true;
       };
     };
-
-    programs = {
-      rofi = {
-        enable = true;
-        package = pkgs.rofi-wayland;
-        plugins = [
-          pkgs.keepmenu # TODO: Rofi KeepassXC frontend
-        ];
-
-        # NOTE: Don't use this, use the configfile for hot-reload
-        # terminal = "${pkgs.kitty}/bin/kitty";
-        # font = "JetBrains Mono 14";
-        # theme =
-        # extraConfig = '''';
-      };
-    };
   };
 }
diff --git a/home/modules/rofi/default.nix b/home/modules/rofi/default.nix
new file mode 100644
index 00000000..843bc7a8
--- /dev/null
+++ b/home/modules/rofi/default.nix
@@ -0,0 +1,30 @@
+{
+  config,
+  nixosConfig,
+  lib,
+  mylib,
+  pkgs,
+  ...
+}:
+with lib;
+with mylib.modules; let
+  cfg = config.modules.rofi;
+in {
+  options.modules.rofi = import ./options.nix {inherit lib mylib;};
+
+  config = mkIf cfg.enable {
+    programs.rofi = {
+      enable = true;
+      package = pkgs.rofi-wayland;
+      plugins = [
+        pkgs.keepmenu # TODO: Rofi KeepassXC frontend
+      ];
+
+      # NOTE: Don't use this, use the configfile for hot-reload
+      # terminal = "${pkgs.kitty}/bin/kitty";
+      # font = "JetBrains Mono 14";
+      # theme =
+      # extraConfig = '''';
+    };
+  };
+}
diff --git a/home/modules/rofi/options.nix b/home/modules/rofi/options.nix
new file mode 100644
index 00000000..c8fe728a
--- /dev/null
+++ b/home/modules/rofi/options.nix
@@ -0,0 +1,9 @@
+{
+  lib,
+  mylib,
+  ...
+}:
+with lib;
+with mylib.modules; {
+  enable = mkEnableOpt "Rofi";
+}