From 47b5336149b269d1a156826d6d60b9ee24f5860f Mon Sep 17 00:00:00 2001
From: danny <danny10132024@gmail.com>
Date: Sun, 10 Aug 2025 14:57:17 +0800
Subject: [PATCH] refactor: update windowrules for general use

---
 home/user/hypr/windowrule.nix     | 20 ++++++++++++++++++++
 system/dev/dn-pre7780/default.nix | 18 ------------------
 2 files changed, 20 insertions(+), 18 deletions(-)

diff --git a/home/user/hypr/windowrule.nix b/home/user/hypr/windowrule.nix
index 3ee2615..41986dc 100644
--- a/home/user/hypr/windowrule.nix
+++ b/home/user/hypr/windowrule.nix
@@ -1,3 +1,7 @@
+let
+  top = "60";
+  right = "100%-w-10";
+in
 {
   windowrule = [
     "pseudo, class:fcitx"
@@ -34,6 +38,22 @@
     "pin, class:^(vesktop)$,title:^(Discord Popout)$"
     "float, class:^(steam)$,title:^(Friends List)$"
 
+    # Meidia control
+    "move ${right} ${top}, class: ^(org.pulseaudio.pavucontrol)$"
+    "size 30% 33%, class: ^(org.pulseaudio.pavucontrol)$"
+
+    # Local Send (File Sharing)
+    "move ${right} 8%, class: ^(localsend_app)$"
+    "size 20% 80%, class: ^(localsend_app)$"
+
+    # Airplay
+    "move ${right} 10%, class: ^(GStreamer)$"
+    "size 21% 80%, class: ^(GStreamer)$"
+
+    # Bluetooth
+    "move ${right} ${top}, class: ^(blueberry.py)$"
+    "size 25% 45%, class: ^(blueberry.py)$"
+
     # Media Control
     "float, class: ^(org.pulseaudio.pavucontrol)$"
     "pin, class: ^(org.pulseaudio.pavucontrol)$"
diff --git a/system/dev/dn-pre7780/default.nix b/system/dev/dn-pre7780/default.nix
index 9be60f9..166c45b 100644
--- a/system/dev/dn-pre7780/default.nix
+++ b/system/dev/dn-pre7780/default.nix
@@ -79,24 +79,6 @@ in
         {
           wayland.windowManager.hyprland = {
             settings = {
-              windowrulev2 = [
-                # Meidia control
-                "move 1680 59, class: ^(org.pulseaudio.pavucontrol)$"
-                "size 868 561, class: ^(org.pulseaudio.pavucontrol)$"
-
-                # Local Send (File Sharing)
-                "size 523 1372, class: ^(localsend_app)$"
-                "move 2024 56, class: ^(localsend_app)$"
-
-                # Airplay
-                "size 487 1055, class: ^(GStreamer)$"
-                "move 2061 203, class: ^(GStreamer)$"
-
-                # Bluetooth
-                "move 1943 59, class: ^(blueberry.py)$"
-                "size 605 763, class: ^(blueberry.py)$"
-              ];
-
               monitor = [
                 ''desc:ASUSTek COMPUTER INC ASUS VG32VQ1B 0x00002271, 2560x1440@165, 0x0, 1''
                 ''desc:Acer Technologies XV272U V3 1322131231233, 2560x1440@180, -1440x-600, 1, transform, 1''