fix: fixed conflicts + moving to yadm

.config/hypr/hyprlock.conf

@@ -0,0 +1,57 @@
+general {
+    fail_timeout = 300
+}
+
+background {
+    path = $HOME/.config/hypr/Wallpaper/kita.png
+    blur_passes = 1 # 0 disables blurring
+    blur_size = 3
+    noise = 0.0117
+    contrast = 0.8916
+    brightness = 0.8172
+    vibrancy = 0.1696
+    vibrancy_darkness = 0.0
+}
+
+input-field {
+    size = 250, 60
+    outline_thickness = 4
+    dots_size = 0.2
+    dots_spacing = 0.2
+    dots_center = true
+	  outer_color = rgba(51, 204, 255, 0.93)
+    inner_color = rgba(10, 0, 30, 0)
+    font_color = rgb(200, 200, 200)
+    fade_on_empty = false
+    font_family = JetBrains Mono Nerd Font Mono
+    placeholder_text = <i><span foreground="##cdd6f4">Мур Кусь</span></i>
+    hide_input = false
+    position = 0, -280
+    halign = center
+    valign = center
+}
+
+label {
+    text = cmd[update:1000] echo "$(date +"%R")"
+    color = $foreground
+    font_size = 60
+    font_family = JetBrains Mono Nerd Font Mono ExtraBold
+    position = 0, -180
+    halign = center
+    valign = center
+}
+
+label {
+    text = cmd[update:1000] echo "$($HOME/.config/hypr/scripts/player-status.sh)"
+    color = $foreground
+    font_size = 14
+    font_family = JetBrains Mono Nerd Font Mono
+    position = 0, 10
+    halign = center
+    valign = bottom
+}
+
+animations {
+    animation = fadeIn, 0
+    animation = fadeOut, 0
+}