refactor: hypr

hypr/hyprland.conf

@@ -44,6 +44,7 @@ exec-once = $startDelay && ~/.config/hypr/scripts/toggle_proxy.sh
 exec-once = $startDelay && ~/.config/hypr/scripts/sounds.sh
 exec-once = $startDelay && ~/.config/hypr/scripts/random_wallpaper.sh
 exec-once = $startDelay && ~/.config/hypr/scripts/autofreezer.sh
+exec-once = .cargo/bin/mpd-discord-rpc
 
 exec-shutdown = play -v 0.7 $HOME/Templates/Sounds/teleport.mp3
 
@@ -75,7 +76,7 @@ general {
     no_focus_fallback = true
 
     snap {
-      enabled = true
+        enabled = true
     }
 }
 
@@ -88,9 +89,9 @@ decoration {
 
     shadow {
         enabled = false # true
-        range = 4
+            range = 4
-        render_power = 3
+            render_power = 3
-        color = rgba(1a1a1aee)
+            color = rgba(1a1a1aee)
     }
 
     blur {
@@ -107,21 +108,20 @@ decoration {
 }
 
 group {
-  col.border_active = rgba(E96375ff) rgba(EB75FFff) 45deg
+    col.border_active = rgba(E96375ff) rgba(EB75FFff) 45deg
-  col.border_inactive = rgba(F9730032) rgba(FB850032) 45deg
+    col.border_inactive = rgba(F9730032) rgba(FB850032) 45deg
 
-  groupbar {
+        groupbar {
-    text_color = rgba(ffffff00)
+            text_color = rgba(ffffff00)
-    render_titles = false 
+            render_titles = false 
-    indicator_height = 10
+            indicator_height = 10
-    rounding = 5
+            rounding = 5
-    round_only_edges = false
+            round_only_edges = false
-    col.active = rgba(F8859Eff)
+            col.active = rgba(F8859Eff)
-    col.inactive = rgba(32323264) rgba(32323264) 45deg
+            col.inactive = rgba(32323264) rgba(32323264) 45deg
-    gaps_in = 5
+            gaps_in = 5
-    gaps_out = 2
+            gaps_out = 2
-
+        }
-  }
 }
 
 source = ~/.config/hypr/grayscale.conf
@@ -157,6 +157,9 @@ animations {
     animation = layers, 1, 7, default, slide
 }
 
+workspace = 10, monitor:eDP-1
+workspace = 11, monitor:eDP-1
+workspace = 12, monitor:eDP-1
 workspace = 1, monitor:HDMI-A-1
 workspace = 2, monitor:HDMI-A-1
 workspace = 3, monitor:HDMI-A-1
@@ -166,11 +169,6 @@ workspace = 6, monitor:HDMI-A-1
 workspace = 7, monitor:HDMI-A-1
 workspace = 8, monitor:HDMI-A-1
 workspace = 9, monitor:HDMI-A-1
-workspace = 10, monitor:eDP-1
-workspace = 11, monitor:eDP-1
-workspace = 12, monitor:eDP-1
-workspace = 13, monitor:eDP-1
-workspace = 13, on-created-empty:hyprctl dispatch workspace 1
 
 dwindle {
     pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
@@ -215,11 +213,11 @@ cursor {
 #############
 
 input {
-    kb_layout= us,ru
+    kb_layout = us,ru
-    kb_options= grp:caps_toggle,grp_led:caps
+    kb_options = grp:caps_toggle,grp_led:caps
     repeat_rate = 25
     repeat_delay = 200
-    
+
     follow_mouse = 2
     float_switch_override_focus = 0
 
@@ -259,6 +257,10 @@ device {
 
 $mainMod = SUPER
 
+binds {
+    allow_workspace_cycles = true
+}
+
 # Exit hyprland
 bind = $mainMod ALT, Q, exit,
 
@@ -353,21 +355,25 @@ bind = $mainMod SHIFT, minus, movetoworkspacesilent, 11
 bind = $mainMod SHIFT, equal, movetoworkspacesilent, 12
 
 # Cycle monitors
-bind = $mainMod CTRL, U, swapactiveworkspaces, eDP-1 HDMI-A-1
 bind = $mainMod, O, focusmonitor, +1
 
-bind = $mainMod SHIFT, Y, movecurrentworkspacetomonitor, +1
+# Move current workspace to another monitor
+bind = $mainMod SHIFT, y, movecurrentworkspacetomonitor, +1
+bind = $mainMod SHIFT, v, moveworkspacetomonitor, +0 +1
 
 # Example special workspace (scratchpad)
 bind = $mainMod, M, togglespecialworkspace, magic
 bind = $mainMod SHIFT, M, movetoworkspace, special:magic
 
-# Scroll through existing workspaces with mainMod + scroll
+# Go to previous/next workspace
 bind = $mainMod, bracketleft, workspace, -1
 bind = $mainMod, bracketright, workspace, +1
+
+# Go to previous/next occupied workspace
 bind = $mainMod SHIFT, bracketleft, workspace, m-1
 bind = $mainMod SHIFT, bracketright, workspace, m+1
 
+# Gaming special workspace
 bind = $mainMod, grave, togglespecialworkspace, dungeon
 bind = $mainMod SHIFT, grave, movetoworkspace, special:dungeon
 
@@ -395,9 +401,18 @@ bind = $mainMod, R, swapnext
 bind = $mainMod SHIFT, R, swapnext, prev
 
 # Go to previous window and back
-bind = ALT, TAB, focuscurrentorlast
+# bind = ALT, TAB, focuscurrentorlast
+
+# Go to previous workspace and back
+binds {
+    allow_workspace_cycles = true  # does not seem to affect anything
+}
+allow_workspace_cycles = true  # does not seem to affect anything
+bind = $mainMod, Tab, workspace, previous
+bind = ALT, Tab, workspace, previous_per_monitor
+
+# Toggle swallow for window
 bind = $mainMod, I, toggleswallow
-bindp = $mainMod, Tab, focuscurrentorlast
 
 # Resize windows in different directions via keyboard
 binde = $mainMod ALT, h, resizeactive, -60 0
@@ -409,7 +424,7 @@ binde = $mainMod ALT SHIFT, l, resizeactive, -60 0
 binde = $mainMod ALT SHIFT, j, resizeactive, 0 -60
 binde = $mainMod ALT SHIFT, k, resizeactive, 0 60
 
-# Swap windows in different directions via keyboard
+# Move windows in different directions via keyboard
 binde = $mainMod, Left, moveactive, -100 0
 binde = $mainMod, Right, moveactive, 100 0
 binde = $mainMod, Down, moveactive, 0 100
@@ -446,7 +461,7 @@ bindel = ,XF86MonBrightnessDown, exec, brightnessctl -e4 -n2 set 5%-
 bindl = $mainMod, XF86MonBrightnessUp, exec, brightnessctl set 60% 
 bindl = $mainMod, XF86MonBrightnessDown, exec, brightnessctl set 0
 
-# Requires playerctl
+# Media controls via playerctl
 bindl = , XF86AudioNext, exec, playerctl next
 bindl = , XF86AudioPause, exec, playerctl play-pause
 bindl = , XF86AudioPlay, exec, playerctl play-pause
@@ -510,6 +525,9 @@ windowrule {
   match:tag = voicechatuz
 }
 
+# Restart zapret
+bind = $mainMod SHIFT, z, exec, sudo systemctl restart zapret_discord_youtube.service && play -v 0.4 /home/greg/.config/hypr/sound/dmenu.wav 
+
 # Zen - focus searchbar
 bindrn = CTRL, Space, sendshortcut, , F6, class:^(zen)$
 
@@ -549,17 +567,17 @@ bind = $mainMod, U, submap, mpd
 submap = mpd
 
 # MPD controls (actions that exit submap)
-bind = , P, exec, mpc --password $mpdpass toggle
+bind = , P, exec, mpc toggle
-bind = SHIFT, H, exec, mpc --password $mpdpass prev  
+bind = SHIFT, H, exec, mpc prev  
-bind = SHIFT, L, exec, mpc --password $mpdpass next
+bind = SHIFT, L, exec, mpc next
 
 # MPD Seek
-binde = , H, exec, mpc --password $mpdpass seek "-00:00:5"
+binde = , H, exec, mpc seek "-00:00:5"
-binde = , L, exec, mpc --password $mpdpass seek "+00:00:5"
+binde = , L, exec, mpc seek "+00:00:5"
 
 # Volume controls (remain in submap for repeated adjustments)
-bind = , J, exec, mpc --password $mpdpass volume -5
+bind = , J, exec, mpc volume -5
-bind = , K, exec, mpc --password $mpdpass volume +5
+bind = , K, exec, mpc volume +5
 
 # Alternative exit methods
 bind = , escape, submap, reset
@@ -665,7 +683,7 @@ windowrule {
   name = windowrule-11
   no_screen_share = 0
   border_color = rgba(ff0000ff) rgba(ff0000ff) 90deg
-  dim_around = on
+  border_size = 5
   match:tag = privacyexpose
 }
 

hypr/scripts/sounds.sh

@@ -1,6 +1,5 @@
 #!/usr/bin/env bash
 
-
 SOUND_DIR="$HOME/.config/hypr/sound"
 PLAYER="play"
 VOLUME="0.1"
@@ -11,7 +10,7 @@ declare -A SOUND_MAP=(
     ["activelayout"]="popup.wav"
     ["fullscreen"]="fullscreen.wav"
     ["openwindow"]="open.mp3"
-    ["closewindow"]="popup.wav"
+    ["closewindow"]="close_2.wav"
     ["movewindow"]="popup.wav"
     ["changefloatingmode"]="float.wav"
 )
@@ -39,6 +38,9 @@ declare -A COOLDOWN_TIMERS=()
 
 mkdir -p "$SOUND_DIR"
 
+cp -r $SOUND_DIR "/tmp/hypr-sound"
+SOUND_DIR="/tmp/hypr-sound"
+
 log() {
     if [ $DEBUG -eq 1 ]; then
         echo "[$(date '+%H:%M:%S')] $1" >&2