diff --git a/configurations/home-manager/eve/packages.nix b/configurations/home-manager/eve/packages.nix
index 295597a..754ced2 100644
--- a/configurations/home-manager/eve/packages.nix
+++ b/configurations/home-manager/eve/packages.nix
@@ -20,7 +20,6 @@ in {
         ungoogled-chromium
         krita
         gnomeExtensions.dash-to-panel
-        (lib.mkIf hardware.piperMouse.enable piper)
       ]
     );
 
@@ -61,6 +60,7 @@ in {
         makemkv.enable = true;
         signal-desktop-bin.enable = true;
         steam.enable = true;
+        piper.enable = hardware.piperMouse.enable;
       })
     ];
   };
diff --git a/configurations/home-manager/leyla/packages/default.nix b/configurations/home-manager/leyla/packages/default.nix
index 702edda..33c6103 100644
--- a/configurations/home-manager/leyla/packages/default.nix
+++ b/configurations/home-manager/leyla/packages/default.nix
@@ -36,6 +36,7 @@ in {
           protonvpn-gui.enable = true;
           dbeaver-bin.enable = true;
           bruno.enable = true;
+          piper.enable = hardware.piperMouse.enable;
         })
         (lib.mkIf (hardware.directAccess.enable && config.user.isDesktopUser) {
           anki.enable = true;
@@ -105,7 +106,6 @@ in {
             noisetorch
 
             # hardware management tools
-            (lib.mkIf hardware.piperMouse.enable piper)
             (lib.mkIf hardware.openRGB.enable openrgb)
             (lib.mkIf hardware.viaKeyboard.enable via)
 
diff --git a/modules/home-manager-modules/programs/default.nix b/modules/home-manager-modules/programs/default.nix
index 675e77d..be4b072 100644
--- a/modules/home-manager-modules/programs/default.nix
+++ b/modules/home-manager-modules/programs/default.nix
@@ -6,6 +6,7 @@
     ./makemkv.nix
     ./obs.nix
     ./anki.nix
+    ./piper.nix
     ./qbittorrent.nix
     ./discord.nix
     ./obsidian.nix
diff --git a/modules/home-manager-modules/programs/piper.nix b/modules/home-manager-modules/programs/piper.nix
new file mode 100644
index 0000000..ec0d887
--- /dev/null
+++ b/modules/home-manager-modules/programs/piper.nix
@@ -0,0 +1,17 @@
+{
+  lib,
+  pkgs,
+  config,
+  osConfig,
+  ...
+}: {
+  options.programs.piper = {
+    enable = lib.mkEnableOption "enable piper";
+  };
+
+  config = lib.mkIf config.programs.piper.enable {
+    home.packages = with pkgs; [
+      piper
+    ];
+  };
+}