feat: refactor script

README.md

@@ -61,7 +61,7 @@ pacman -S dunst rofi hyprland
 
 Зависимости для `eww`:
 ```Bash
-pacman -S xorg-xrand jq xdg-desktop-portal-gtk hyprpolkitagent python-dbus python-evdev python-gobject libnotify wl-clipboard cliphist socat
+pacman -S xorg-xrand jq xdg-desktop-portal-gtk hyprpolkitagent hyprlock hypridle python-dbus python-evdev python-gobject libnotify wl-clipboard cliphist socat 
 ```
 
 Для корректной работы `python-evdev` добавляет своего пользователя в группу `input`:

eww/eww.yuck

@@ -138,12 +138,13 @@
       (statswidget :reveal_state s_rev :reveal_var s_var) 
       (volumewidget :reveal_state v_rev :reveal_var v_var))))
 
-;; дополнительный бар (без трея)
+;; дополнительный бар
 (defwidget side_bar [mon_key t_rev t_var s_rev s_var v_rev v_var]
   (centerbox :class "bar-inner"
     (box :halign "start" (workspaces :ws_data {ws_data[mon_key]}))
     (box :halign "center" (timewidget :reveal_state t_rev :reveal_var t_var))
-    (box :halign "end" :space-evenly false 
+    (box :halign "end" :space-evenly false
+      (tray_dynamic)
       (kb_widget) 
       (statswidget :reveal_state s_rev :reveal_var s_var) 
       (volumewidget :reveal_state v_rev :reveal_var v_var))))

hypr/config/bind.conf

@@ -70,7 +70,7 @@ bindl = $mainMod, F11, exec, playerctl play-pause
 bindl = $mainMod, F12, exec, playerctl next
 
 # resize mode
-bind = $mainMod, R, exec, hyprctl keyword general:col.active_border "rgb(e3a1d2)"
+bind = $mainMod, R, exec, hyprctl keyword general:col.active_border "rgb(e3a1d2)" ; hyprctl keyword general:border_size 5
 bind = $mainMod, R, submap, resize
 
 submap = resize
@@ -78,8 +78,10 @@ submap = resize
     binde = , left,  resizeactive, -20 0
     binde = , up,    resizeactive, 0 -20
     binde = , down,  resizeactive, 0 20
-    bind = , escape, exec, hyprctl keyword general:col.active_border "rgb(a8afe1)"
+    bind = , escape, exec, hyprctl keyword general:col.active_border "rgb(a8afe1)" ; hyprctl keyword general:border_size 1
-    bind = , escape, submap, reset 
+    bind = , escape, submap, reset
-    bind = , return, exec, hyprctl keyword general:col.active_border "rgb(a8afe1)"
+    bind = , return, exec, hyprctl keyword general:col.active_border "rgb(a8afe1)" ; hyprctl keyword general:border_size 1
-    bind = , return, submap, reset 
+    bind = , return, submap, reset
-submap = reset
+submap = reset
+
+bind = $mainMod, L, exec, loginctl lock-session

hypr/config/exec.conf

@@ -4,4 +4,5 @@ exec-once = wl-paste --type image --watch cliphist store
 exec-once = systemctl --user start hyprpolkitagent
 exec-once = gsettings set org.gnome.desktop.interface gtk-theme "Adwaita-dark"
 exec-once = gsettings set org.gnome.desktop.interface color-scheme "prefer-dark"
-exec-once = eww daemon && eww open-many bar_0 bar_1 wallpaper_0 wallpaper_1
+exec-once = eww daemon && sleep 1 && eww open-many bar_0 bar_1 wallpaper_0 wallpaper_1
+exec-once = hypridle --grace 15

hypr/config/input.conf

@@ -6,4 +6,5 @@ input {
     kb_rules =
     follow_mouse = 1
     sensitivity = 0
+    force_no_accel = true
 }

hypr/config/monitors.conf

@@ -0,0 +1,2 @@
+monitor = HDMI-A-1, 1920x1080@60, 0x0, 1
+monitor = DVI-I-1, 1600x900@60, 1920x120, 1

hypr/config/windowrule.conf

@@ -49,4 +49,12 @@ windowrule {
     match:title = ^(Picture-in-Picture)$
     opacity = 1.0 override 1.0 override 1.0 override
     float = true
-}
+}
+
+windowrule {
+    name = steam-app
+    match:class = ^(steam_app_)(.*)
+    fullscreen = on
+    fullscreen_state = 2
+    monitor = HDMI-A-1
+}

hypr/hypridle.conf

@@ -0,0 +1,24 @@
+general {
+    lock_cmd = pidof hyprlock || hyprlock
+    before_sleep_cmd = loginctl lock-session
+    after_sleep_cmd = hyprctl dispatch dpms on
+    ignore_dbus_inhibit = false
+    ignore_wayland_inhibit = false
+    ignore_systemd_inhibit = false
+}
+
+listener {
+    timeout = 300
+    on-timeout = loginctl lock-session
+}
+
+listener {
+    timeout = 360
+    on-timeout = hyprctl dispatch dpms off
+    on-resume = hyprctl dispatch dpms on
+}
+
+listener {
+    timeout = 600
+    on-timeout = systemctl suspend
+}

hypr/hyprland.conf

@@ -1,14 +1,14 @@
-source = ~/.config/hypr/monitors.conf
+source = ~/.config/hypr/config/monitors.conf
-source = ~/.config/hypr/workspaces.conf
+source = ~/.config/hypr/config/workspaces.conf
-source = ~/.config/hypr/programs.conf
+source = ~/.config/hypr/config/programs.conf
-source = ~/.config/hypr/exec.conf
+source = ~/.config/hypr/config/exec.conf
-source = ~/.config/hypr/env.conf
+source = ~/.config/hypr/config/env.conf
-source = ~/.config/hypr/general.conf
+source = ~/.config/hypr/config/general.conf
-source = ~/.config/hypr/decoration.conf
+source = ~/.config/hypr/config/decoration.conf
-source = ~/.config/hypr/animations.conf
+source = ~/.config/hypr/config/animations.conf
-source = ~/.config/hypr/dwindle.conf
+source = ~/.config/hypr/config/dwindle.conf
-source = ~/.config/hypr/master.conf
+source = ~/.config/hypr/config/master.conf
-source = ~/.config/hypr/misc.conf
+source = ~/.config/hypr/config/misc.conf
-source = ~/.config/hypr/input.conf
+source = ~/.config/hypr/config/input.conf
-source = ~/.config/hypr/bind.conf
+source = ~/.config/hypr/config/bind.conf
-source = ~/.config/hypr/windowrule.conf
+source = ~/.config/hypr/config/windowrule.conf

hypr/hyprlock.conf

@@ -0,0 +1,40 @@
+general {
+    hide_cursor = true
+    ignore_empty_input = true
+}
+
+background {
+    monitor =
+    path = screenshot
+    blur_passes = 2
+    blur_size = 5
+}
+
+input-field {
+    monitor =
+    size = 250, 60
+    outline_thickness = 2
+    dots_size = 0.2
+    dots_spacing = 0.2
+    dots_center = true
+    outer_color = rgba(168, 175, 225, 0.5)
+    inner_color = rgba(30, 30, 46, 0.5)
+    font_color = rgb(202, 211, 245)
+    fade_on_empty = true
+    placeholder_text = <i>Password...</i>
+    hide_input = false
+    position = 0, -154
+    halign = center
+    valign = center
+}
+
+label {
+    monitor =
+    text = $TIME
+    color = rgba(202, 211, 245, 0.8)
+    font_size = 94
+    font_family = Noto Sans Bold
+    position = 0, 0
+    halign = center
+    valign = center
+}

hypr/monitors.conf

@@ -1,2 +0,0 @@
-monitor = HDMI-A-1, 1920x1080@60, 0x0, 1
-monitor = DVI-I-1, 1600x900@60, -1600x140, 1

hypr/scripts/toggle_monitor.sh

@@ -1,9 +1,12 @@
 #!/bin/bash
 
 MONITOR_NAME="DVI-I-1"
+WIDTH=1920
+HEIGHT=120
+WIDHT_FIXED=$((WIDTH+10))
 
-hyprctl keyword monitor "$MONITOR_NAME, 1600x900@60, 0x-2000, 1" && eww reload
+hyprctl keyword monitor "$MONITOR_NAME, 1600x900@60, ${WIDHT_FIXED}x${HEIGHT}, 1" && eww reload
-notify-send -t 1500 "$MONITOR_NAME: Game Mode" "Monitor moved to 0x-2000"
+notify-send -t 1500 "$MONITOR_NAME: Game Mode" "Monitor moved to ${WIDHT_FIXED}x${HEIGHT}"
 
 if [[ "$1" == *"="* ]]; then
     VAR=$1
@@ -13,5 +16,5 @@ else
     "$@"
 fi
 
-hyprctl -- keyword monitor "$MONITOR_NAME, 1600x900@60, -1600x0, 1" && eww reload
+hyprctl -- keyword monitor "$MONITOR_NAME, 1600x900@60, ${WIDTH}x${HEIGHT}, 1" && eww reload
-notify-send -t 1500 "$MONITOR_NAME: Desktop Mode" "Monitor returned to -1600x0"
+notify-send -t 1500 "$MONITOR_NAME: Desktop Mode" "Monitor returned to ${WIDTH}x${HEIGHT}"