From 31d305ca93f03a14e97b7aa3bd0d17cf1e7304f1 Mon Sep 17 00:00:00 2001
From: azikx <irongidra@gmail.com>
Date: Tue, 22 Oct 2024 22:47:10 +0900
Subject: [PATCH] =?UTF-8?q?update=20=EF=8C=93?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 home/programs/cli/cava/default.nix      |  2 -
 home/window-managers/default.nix        |  1 +
 home/window-managers/hyprland/binds.nix | 97 ++++++++++++-------------
 3 files changed, 46 insertions(+), 54 deletions(-)

diff --git a/home/programs/cli/cava/default.nix b/home/programs/cli/cava/default.nix
index abbefbe..48859f4 100644
--- a/home/programs/cli/cava/default.nix
+++ b/home/programs/cli/cava/default.nix
@@ -14,8 +14,6 @@
         gradient_color_2 = "'#${base0D}'";
         gradient_color_3 = "'#${base0C}'";
         gradient_color_4 = "'#${base0B}'";
-        gradient_color_5 = "'#${base0A}'";
-        gradient_color_6 = "'#${base09}'";
       };
     };
   };
diff --git a/home/window-managers/default.nix b/home/window-managers/default.nix
index 13ba0e4..143b819 100644
--- a/home/window-managers/default.nix
+++ b/home/window-managers/default.nix
@@ -12,6 +12,7 @@
     nwg-drawer
     light
     grimblast
+    slurp
     wl-clipboard
     wf-recorder
   ];
diff --git a/home/window-managers/hyprland/binds.nix b/home/window-managers/hyprland/binds.nix
index 45cab83..649584f 100644
--- a/home/window-managers/hyprland/binds.nix
+++ b/home/window-managers/hyprland/binds.nix
@@ -23,7 +23,7 @@ in {
 
     "$nx" = "Next";
     "$pr" = "Prior";
-    "$p" = "Print";
+    "$PR" = "Print";
 
     "$md" = "mouse_down";
     "$mu" = "mouse_up";
@@ -86,16 +86,11 @@ in {
       "$m, T, exec, bottles"
       "$m  $s, T, exec, prismlauncher"
 
-      # PLAYER CONTROL
-      "$m, XF86WakeUp, exec, playerctl play-pause"
-      "$m, XF86Go, exec, playerctl next"
-      "$m, Cancel, exec, playerctl previous"
-
       # SCREENSHOTTER & VIDEO
-      ",   $p, exec, grimblast copysave area"
-      "$s, $p, exec, grimblast copysave output ${pic}"
-      "$a, $p, exec, grimblast copysave active ${pic}"
-      "$c, $p, exec, hyprpicker -a"
+      ",   $PR, exec, grimblast copysave area"
+      "$s, $PR, exec, grimblast copysave output ${pic}"
+      "$a, $PR, exec, grimblast copysave active ${pic}"
+      "$c, $PR, exec, hyprpicker -a"
 
       "$m, R, exec, wf-recorder -a ${aud} -f ${vid}"
       "$m  $s, R, exec, bash ~/.config/hypr/wfrec"
@@ -103,52 +98,53 @@ in {
     ] ++ workspaces;
 
     # HOLDING BUTTONS
-    binde = [
+    binde = let
+      mf = "movefocus";
+      sw = "swapwindow";
+      ra = "resizeactive";
+      ma = "moveactive";
+    in [
       # HJKL
-      "$m, H, movefocus, l"
-      "$m, J, movefocus, d"
-      "$m, K, movefocus, u"
-      "$m, L, movefocus, r"
+      "$m, H,    ${mf}, l"
+      "$m, J,    ${mf}, d"
+      "$m, K,    ${mf}, u"
+      "$m, L,    ${mf}, r"
 
-      "$m $s, H, swapwindow, l"
-      "$m $s, J, swapwindow, d"
-      "$m $s, K, swapwindow, u"
-      "$m $s, L, swapwindow, r"
+      "$m $s, H, ${sw}, l"
+      "$m $s, J, ${sw}, d"
+      "$m $s, K, ${sw}, u"
+      "$m $s, L, ${sw}, r"
 
-      "$m $a, H, resizeactive, -50 0"
-      "$m $a, J, resizeactive, 0 50"
-      "$m $a, K, resizeactive, 0 -50"
-      "$m $a, L, resizeactive, 50 0"
+      "$m $a, H, ${ra}, -50 0"
+      "$m $a, J, ${ra}, 0 50"
+      "$m $a, K, ${ra}, 0 -50"
+      "$m $a, L, ${ra}, 50 0"
 
-      "$m $c, H, moveactive, -50 0"
-      "$m $c, J, moveactive, 0 50"
-      "$m $c, K, moveactive, 0 -50"
-      "$m $c, L, moveactive, 50 0"
+      "$m $c, H, ${ma}, -50 0"
+      "$m $c, J, ${ma}, 0 50"
+      "$m $c, K, ${ma}, 0 -50"
+      "$m $c, L, ${ma}, 50 0"
 
       # ARROWS
-      "$m, left, movefocus, l"
-      "$m, down, movefocus, d"
-      "$m, up, movefocus, u"
-      "$m, right, movefocus, r"
+      "$m, left,     ${mf}, l"
+      "$m, down,     ${mf}, d"
+      "$m, up,       ${mf}, u"
+      "$m, right,    ${mf}, r"
 
-      "$m $s, left, swapwindow, l"
-      "$m $s, down, swapwindow, d"
-      "$m $s, up, swapwindow, u"
-      "$m $s, right, swapwindow, r"
+      "$m $s, left,  ${sw}, l"
+      "$m $s, down,  ${sw}, d"
+      "$m $s, up,    ${sw}, u"
+      "$m $s, right, ${sw}, r"
 
-      "$m $a, left, resizeactive, -50 0"
-      "$m $a, down, resizeactive, 0 50"
-      "$m $a, up, resizeactive, 0 -50"
-      "$m $a, right, resizeactive, 50 0"
+      "$m $a, left,  ${ra}, -50 0"
+      "$m $a, down,  ${ra}, 0 50"
+      "$m $a, up,    ${ra}, 0 -50"
+      "$m $a, right, ${ra}, 50 0"
 
-      "$m $c, left, moveactive, -50 0"
-      "$m $c, down, moveactive, 0 50"
-      "$m $c, up, moveactive, 0 -50"
-      "$m $c, right, moveactive, 50 0"
-
-      # BRIGHTNESS
-      ", XF86MonBrightnessDown, exec, doas light -U 10"
-      ", XF86MonBrightnessUp, exec, doas light -A 10"
+      "$m $c, left,  ${ma}, -50 0"
+      "$m $c, down,  ${ma}, 0 50"
+      "$m $c, up,    ${ma}, 0 -50"
+      "$m $c, right, ${ma}, 50 0"
 
       # SOUND
       ", XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+"
@@ -156,15 +152,12 @@ in {
 
       "$s, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%+"
       "$s, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_AUDIO_SINK@ 10%-"
-
-      ", XF86AudioMute, exec, wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"
-      ", XF86AudioMicMute, exec, fixf4=$(cat /sys/class/leds/platform::micmute/brightness); echo $((1-fixf4)) | doas tee /sys/class/leds/platform::micmute/brightness; wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"
     ];
 
     # MOUSE
     bindm = [
-      "$m, mouse:272, movewindow"
-      "$m, mouse:273, resizewindow"
+      "$m,     mouse:272, movewindow"
+      "$m,     mouse:273, resizewindow"
       "$m  $s, mouse:273, resizewindow 1"
     ];
   };