diff --git a/home/hosts/gunter/default.nix b/home/hosts/gunter/default.nix
index 919fcc4..c7a0bb1 100644
--- a/home/hosts/gunter/default.nix
+++ b/home/hosts/gunter/default.nix
@@ -26,6 +26,7 @@
           ../../programs/kitty
           ../../programs/obs-studio
           ../../programs/rofi
+          ../../programs/streamcontroller
           ../../programs/tmux
           ../../programs/vscode
           ../../scripts
@@ -54,8 +55,8 @@
           "WLR_NO_HARDWARE_CURSORS,1"
         ];
 
-        hyprland.enableStreamController = true;
         hyprland.enableGrimblast = true;
+        streamcontroller.enable = true;
         hyprland.enableWacom = true;
         hyprland.cursorNoHardware = true;
 
diff --git a/home/hyprland/default.nix b/home/hyprland/default.nix
index b6f2f5b..6736732 100644
--- a/home/hyprland/default.nix
+++ b/home/hyprland/default.nix
@@ -29,8 +29,6 @@ in
       description = "Extra environment variables for Hyprland";
     };
 
-    enableStreamController = mkEnableOption "streamcontroller service";
-
     enableGrimblast = mkEnableOption "grimblast screenshot keybinds";
 
     enableWacom = mkEnableOption "Wacom tablet device configuration";
@@ -161,26 +159,6 @@ in
       };
     };
 
-    systemd.user.services = mkIf cfg.enableStreamController {
-      streamcontroller = {
-        Unit = {
-          Description = "Streamcontroller service";
-          PartOf = [ "graphical-session.target" ];
-          After = [ "graphical-session.target" ];
-          Requisite = [ "graphical-session.target" ];
-        };
-
-        Service = {
-          ExecStart = "${pkgs.streamcontroller}/bin/streamcontroller -b";
-          Restart = "on-failure";
-        };
-
-        Install = {
-          WantedBy = [ "graphical-session.target" ];
-        };
-      };
-    };
-
     wayland.windowManager.hyprland = {
       enable = true;
       package = pkgs.hyprland;
diff --git a/home/programs/streamcontroller/default.nix b/home/programs/streamcontroller/default.nix
new file mode 100644
index 0000000..2e33d58
--- /dev/null
+++ b/home/programs/streamcontroller/default.nix
@@ -0,0 +1,35 @@
+{
+  pkgs,
+  lib,
+  config,
+  ...
+}:
+with lib;
+let
+  cfg = config.streamcontroller;
+in
+{
+  options.streamcontroller = {
+    enable = mkEnableOption "streamcontroller service";
+  };
+
+  config = mkIf cfg.enable {
+    systemd.user.services.streamcontroller = {
+      Unit = {
+        Description = "Streamcontroller service";
+        PartOf = [ "graphical-session.target" ];
+        After = [ "graphical-session.target" ];
+        Requisite = [ "graphical-session.target" ];
+      };
+
+      Service = {
+        ExecStart = "${pkgs.streamcontroller}/bin/streamcontroller -b";
+        Restart = "on-failure";
+      };
+
+      Install = {
+        WantedBy = [ "graphical-session.target" ];
+      };
+    };
+  };
+}