refactor: hyprlock (from https://github.com/MrVivekRajan/Hyprlock-Styles)

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
-        render_power = 3
-        color = rgba(1a1a1aee)
+            range = 4
+            render_power = 3
+            color = rgba(1a1a1aee)
     }
 
     blur {
@@ -107,21 +108,20 @@ decoration {
 }
 
 group {
-  col.border_active = rgba(E96375ff) rgba(EB75FFff) 45deg
-  col.border_inactive = rgba(F9730032) rgba(FB850032) 45deg
+    col.border_active = rgba(E96375ff) rgba(EB75FFff) 45deg
+    col.border_inactive = rgba(F9730032) rgba(FB850032) 45deg
 
-  groupbar {
-    text_color = rgba(ffffff00)
-    render_titles = false 
-    indicator_height = 10
-    rounding = 5
-    round_only_edges = false
-    col.active = rgba(F8859Eff)
-    col.inactive = rgba(32323264) rgba(32323264) 45deg
-    gaps_in = 5
-    gaps_out = 2
-
-  }
+        groupbar {
+            text_color = rgba(ffffff00)
+            render_titles = false 
+            indicator_height = 10
+            rounding = 5
+            round_only_edges = false
+            col.active = rgba(F8859Eff)
+            col.inactive = rgba(32323264) rgba(32323264) 45deg
+            gaps_in = 5
+            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,8 +213,8 @@ cursor {
 #############
 
 input {
-    kb_layout= us,ru
-    kb_options= grp:caps_toggle,grp_led:caps
+    kb_layout = us,ru
+    kb_options = grp:caps_toggle,grp_led:caps
     repeat_rate = 25
     repeat_delay = 200
 
@@ -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 = SHIFT, H, exec, mpc --password $mpdpass prev  
-bind = SHIFT, L, exec, mpc --password $mpdpass next
+bind = , P, exec, mpc toggle
+bind = SHIFT, H, exec, mpc prev  
+bind = SHIFT, L, exec, mpc next
 
 # MPD Seek
-binde = , H, exec, mpc --password $mpdpass seek "-00:00:5"
-binde = , L, exec, mpc --password $mpdpass seek "+00:00:5"
+binde = , H, exec, mpc 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 = , K, exec, mpc --password $mpdpass volume +5
+bind = , J, exec, mpc 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/hyprlock.conf

@@ -1,111 +1,89 @@
-# sample hyprlock.conf
-# for more configuration options, refer https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock
-#
-# rendered text in all widgets supports pango markup (e.g. <b> or <i> tags)
-# ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#general-remarks
-#
-# shortcuts to clear password buffer: ESC, Ctrl+U, Ctrl+Backspace
-#
-# you can get started by copying this config to ~/.config/hypr/hyprlock.conf
-#
-
-$font = Iosevka
-
-general {
-    hide_cursor = true
-}
-
-# uncomment to enable fingerprint authentication
-# auth {
-#     fingerprint {
-#         enabled = true
-#         ready_message = Scan fingerprint to unlock
-#         present_message = Scanning...
-#         retry_delay = 250 # in milliseconds
-#     }
-# }
-
-animations {
-    enabled = true
-    bezier = linear, 1, 1, 0, 0
-    animation = fadeIn, 1, 5, linear
-    animation = fadeOut, 1, 5, linear
-    animation = inputFieldDots, 1, 2, linear
-}
-
+# BACKGROUND
 background {
     monitor =
-    path = screenshot
-    # path = /home/greg/Pictures/Wallpapers/japan_tower_sakura.jpg
-    blur_passes = 3
+    path = /home/greg/Pictures/Wallpapers/waporvape-dark-tvlike-pink.png
+    blur_passes = 0
+    contrast = 0.8916
+    brightness = 0.8172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0.0
 }
 
-image {
-  # TODO: store there images somewhere in the config dir
-  path = /home/greg/Pictures/Things/niko.jpg
-  position = 0, 40
-  halign = center
-  valign = center
-  size = 100, 100
-  rounding = -1
-  border_color = rgba(9E223800)
-  shadow_passes = 1 
-  shadow_size = 3
-  shadow_color = rgb(aaaaaa) 
+# GENERAL
+general {
+    no_fade_in = false
+    grace = 0
+    disable_loading_bar = false
 }
 
-input-field {
+# Time-Hour
+label {
     monitor =
-    size = 15%, 5%
-    outline_thickness = 3
-    inner_color = rgba(0, 0, 0, 0.5) # no fill
-
-    outer_color = rgba(9E223800)
-    check_color = rgba(ffff00ff) rgba(E96375ff) 120deg
-    fail_color = rgba(ff6633ee) rgba(ff0066ee) 40deg
-
-    font_color = rgb(255,255,255)
-    fade_on_empty = false
-    rounding = 15
-
-    font_family = $font
-    placeholder_text =  パスワード 
-    fail_text = $PAMFAIL
-
-    # uncomment to use a letter instead of a dot to indicate the typed password
-    # dots_text_format = *
-    # dots_size = 0.4
-    dots_spacing = 0.3
-
-    # uncomment to use an input indicator that does not show the password length (similar to swaylock's input indicator)
-    # hide_input = true
-
-    position = 0, -100
+    text = cmd[update:1000] echo "<span>$(date +"%I")</span>"
+    color = rgba(255, 255, 255, 1)
+    font_size = 125
+    font_family = StretchPro
+    position = -80, 190
     halign = center
     valign = center
 }
 
-# TIME
+# Time-Minute
 label {
     monitor =
-    text = $TIME # ref. https://wiki.hyprland.org/Hypr-Ecosystem/hyprlock/#variable-substitution
-    font_size = 90
-    font_family = $font
-
-    position = 0, -50
+    text = cmd[update:1000] echo "<span>$(date +"%M")</span>"
+    color = rgba(232, 60, 130, 1)
+    font_size = 125
+    font_family = StretchPro
+    position = 0, 70
     halign = center
-    valign = top
+    valign = center
 }
 
-# DATE
+# Day-Month-Date
 label {
     monitor =
-    text = cmd[update:60000] date +"%A, %d %B %Y" # update every 60 seconds
-    font_size = 25
-    font_family = $font
-
-    position = 0, -200
+    text = cmd[update:1000] echo -e "$(date +"%d %B, %a.")"
+    color = rgba(255, 255, 255, 100)
+    font_size = 22
+    font_family = Suisse Int'l Mono
+    position = 20, -8
     halign = center
-    valign = top
+    valign = center
 }
 
+# USER
+label {
+    monitor =
+    text =     $USER
+    color = rgba(232, 60, 130, 1)
+    outline_thickness = 2
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    font_size = 22
+    font_family = SF Pro Display Bold
+    position = 0, -220
+    halign = center
+    valign = center
+}
+
+# INPUT FIELD
+input-field {
+    monitor =
+    size = 300, 60
+    outline_thickness = 2
+    dots_size = 0.2 # Scale of input-field height, 0.2 - 0.8
+    dots_spacing = 0.2 # Scale of dots' absolute size, 0.0 - 1.0
+    dots_center = true
+    outer_color = rgba(0, 0, 0, 0)
+    inner_color = rgba(255, 255, 255, 0.1)
+    font_color = rgb(200, 200, 200)
+    fade_on_empty = false
+    font_family = SF Pro Display Bold
+    placeholder_text = <i><span foreground="##FB6F7F99">パスワード</span></i>
+    hide_input = false
+    position = 0, -290
+    halign = center
+    valign = center
+}

hypr/privacy.conf

@@ -1,98 +1,98 @@
 windowrule {
   name = privacy-rule-1
-  tag = +privacy
+  tag = privacy
   match:class = ^(org.telegram.desktop)$
 }
 
 windowrule {
   name = privacy-rule-2
-  tag = +privacy
+  tag = privacy
   match:class = ^(com.ayugram.desktop)$
 }
 
 windowrule {
   name = privacy-rule-3
-  tag = +privacy
+  tag = privacy
   match:class = ^(Element)$
 }
 
 windowrule {
   name = privacy-rule-4
-  tag = +privacy
+  tag = privacy
   match:class = ^(vesktop)$
 }
 
 windowrule {
   name = privacy-rule-5
-  tag = +privacy
+  tag = privacy
   match:class = ^(chat-simplex-desktop-MainKt)$
 }
 
 windowrule {
   name = privacy-rule-6
-  tag = +privacy
+  tag = privacy
   match:class = ^(com.github.hluk.copyq)$
 }
 
 windowrule {
   name = privacy-rule-7
-  tag = +privacy
+  tag = privacy
   match:class = ^(org.keepassxc.KeePassXC)$
 }
 
 windowrule {
   name = privacy-rule-8
-  tag = +privacy
+  tag = privacy
   match:class = ^(otpclient)$
 }
 
 windowrule {
   name = privacy-rule-9
-  tag = +privacy
+  tag = privacy
   match:class = ^(com.nextcloud.desktopclient.nextcloud)$
 }
 
 windowrule {
   name = privacy-rule-10
-  tag = +privacy
+  tag = privacy
   match:title = ^(diary)$
 }
 
 windowrule {
   name = privacy-rule-11
-  tag = +privacy
+  tag = privacy
   match:class = thunar
   match:title = .*(Downloads|Telegram Desktop).*
 }
 
 windowrule {
   name = privacy-rule-12
-  tag = +privacy
+  tag = privacy
   match:class = ^(Mullvad VPN)$
 }
 
 windowrule {
   name = privacy-rule-13
-  tag = +privacy
+  tag = privacy
   match:class = ^(Tor Browser)$
 }
 
 windowrule {
   name = privacy-rule-14
-  tag = +privacy
+  tag = privacy
   match:class = ^(zen)$
   match:title = .*Private Browsing.*
 }
 
 windowrule {
   name = privacy-rule-15
-  tag = +privacy
+  tag = privacy
   match:class = ^(Logseq)$
 }
 
 windowrule {
   name = privacy-rule-16
-  tag = +privacy
+  tag = privacy
   match:class = ^(com.obsproject.Studio)$
 }
 

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

rmpc/config.ron

@@ -3,7 +3,6 @@
 #![enable(unwrap_variant_newtypes)]
 (
     address: "127.0.0.1:6600",
-    password: "kapuchinamusica",
     theme: "kolinux",
     cache_dir: None,
     on_song_change: None,

waybar/config_bottom.jsonc

@@ -13,8 +13,8 @@
     "spacing": 0,
     "reload_style_on_change": true,
     "modules-left": [
-        "tray",
-        "custom/pomodoro"
+        "tray"
+        // "custom/pomodoro"
     ],
     "modules-center": [
     "wlr/taskbar",

waybar/config_top.jsonc

@@ -77,7 +77,7 @@
         }
     },
     "mpd": {
-        "password": "kapuchinamusica",
+        // "password": "kapuchinamusica",
         "artist-len": 30,
         "title-len": 50,
         "unknown-tag": "n/a",
@@ -93,11 +93,22 @@
         "tooltip-format": "MPD (connected) | MMB - toggle, LMB/RMB - next/prev, scroll - volume",
         "tooltip-format-disconnected": "MPD (disconnected) | MMB - toggle, LMB/RMB - next/prev, scroll - volume",
         "format-stopped": " Stopping player...",
-        "on-click-right": "mpc --password kapuchinamusica next",
-        "on-click-middle": "mpc --password kapuchinamusica prev",
-        "on-click": "mpc --password kapuchinamusica toggle",
-        "on-scroll-down": "mpc --password kapuchinamusica volume +1",
-        "on-scroll-up": "mpc --password kapuchinamusica volume -1"
+        "on-click-right": "mpc next",
+        "on-click-middle": "mpc prev",
+        "on-click": "mpc toggle",
+        "on-scroll-down": "mpc volume +1",
+        "on-scroll-up": "mpc volume -1"
+    },
+    "mpris": {
+        "format": "{player_icon} {dynamic}",
+        "format-paused": "{status_icon} <i>{dynamic}</i>",
+        "dynamic-order": ["artist", "title"],
+        "player-icons": {
+            "default": "▶"
+        },
+        "status-icons": {
+            "paused": "⏸"
+        }
     },
     "clock": {
         "timezone": "Europe/Moscow",

waybar/style/style_top.css

@@ -44,6 +44,7 @@ window#waybar.chromium {
    -------------------------------------------------------------------------- */
 /* Common styling applied to all modules */
 #mpd,
+#mpris,
 #custom-pomodoro,
 #clock,
 #battery,
@@ -80,6 +81,10 @@ window#waybar.chromium {
   color: @text-secondary;
 }
 
+#workspaces button.empty:not(.hosting-monitor) {
+  color: alpha(@text-secondary, 0.1);
+}
+
 #workspaces button.active.hosting-monitor {
   color: @accent;
   text-shadow: 0px 0px 8px @accent;
@@ -93,17 +98,28 @@ window#waybar.chromium {
   transition: color 0.5s, box-shadow 0.5s, background 0.5s;
 }
 
-#workspaces button:hover, #workspaces button.active.hosting-monitor:hover {
-  color: @foreground;
+#workspaces button:hover {
+  color: @text-primary;
   background: none;
   box-shadow: none;
-  text-shadow: none;
+  text-shadow: 0px -2px 3px @text-primary;
+}
+
+#workspaces button:not(.hosting-monitor):not(.empty) {
+    color: alpha(@accent, 0.2);
+}
+
+#workspaces button.active.hosting-monitor:hover {
+  color: @text-primary;
+  background: none;
+  box-shadow: none;
+  text-shadow: 0px 0px 8px @text-primary;
 }
 
 /* --------------------------------------------------------------------------
    SIDE PANEL GROUPS
    -------------------------------------------------------------------------- */
-#mpd, .modules-center, .modules-right {
+#mpd, #mpris, .modules-center, .modules-right {
   /* Layout & Box Model */
   border: 1px solid @border-color;
   border-radius: 15px;
@@ -181,24 +197,24 @@ window#waybar.chromium {
 }
 
 /* MPD STATES */
-#mpd {
+#mpd, #mpris {
   transition: color 2s, background 2s;
 }
 
-#mpd.playing {
+#mpd.playing, #mpris.playing {
   color: @accent;
   font-weight: 700;
   /* color: @text-primary; */
 }
 
-#mpd.stopped {
+#mpd.stopped, #mrpis.stopped {
   color: transparent;
   background: transparent;
   border-color: transparent;
   transition: color 2s, background 2s;
 }
 
-#mpd.paused {
+#mpd.paused, #mpris.paused {
   font-weight: normal;
   color: @text-secondary;
 }
@@ -228,6 +244,8 @@ window#waybar.chromium {
    -------------------------------------------------------------------------- */
 #mpd.playing:hover,
 #mpd.paused:hover,
+#mpris.playing:hover,
+#mpris.paused:hover,
 #clock:hover,
 #battery:hover,
 #network:hover,