update

6 files changed, 57 insertions, 209 deletions

diff --git a/.config/hypr/hypridle.conf b/.config/hypr/hypridle.conf
deleted file mode 100644
index c867ff1..0000000
--- a/.config/hypr/hypridle.conf
+++ /dev/null
@@ -1,20 +0,0 @@
-general {
-    lock_cmd = notify-send "lock!"          # dbus/sysd lock command (loginctl lock-session)
-    unlock_cmd = notify-send "unlock!"      # same as above, but unlock
-    before_sleep_cmd = notify-send "Zzz"    # command ran before sleep
-    after_sleep_cmd = notify-send "Awake!"  # command ran after sleep
-    ignore_dbus_inhibit = false             # whether to ignore dbus-sent idle-inhibit requests (used by e.g. firefox or steam)
-    ignore_systemd_inhibit = false          # whether to ignore systemd-inhibit --what=idle inhibitors
-}
-
-listener {
-    timeout = 300                           # 5min
-    on-timeout = hyprlock                   # command to run when timeout has passed
-    on-resume = notify-send "Welcome back!" # command to run when activity is detected after timeout has fired.
-}
-
-listener {
-    timeout = 320                            # in seconds
-    on-timeout = hyprctl dispatch dpms off  # command to run when timeout has passed
-    on-resume = hyprctl dispatch dpms on  # command to run when activity is detected after timeout has fired.
-}
diff --git a/.config/hypr/hyprland.conf b/.config/hypr/hyprland.conf
index e03c3f1..9d47e7d 100644
--- a/.config/hypr/hyprland.conf
+++ b/.config/hypr/hyprland.conf
@@ -1,58 +1,37 @@
-################
-### MONITORS ###
-################
+monitor = DP-2, 2560x1440@165, 0x0, 1
+monitor = DP-3, 2560x1440@240, 2560x0,1
 
-monitor=,preferred,auto,auto
-monitor=DP-3,2560x1440@240,2560x0,1
-monitor=DP-2,2560x1440@165,0x0,1
-
-###################
-### MY PROGRAMS ###
-###################
-
-$terminal = foot 
-$fileManager = dolphin
+$terminal = kitty
+$browser = firefox
+$fileManager = kitty lf 
 $menu = wofi --show drun
-$browser = firefox 
-
-#################
-### AUTOSTART ###
-#################
 
-exec-once=pipewire & pipewire-pulse & wireplumber
-exec-once=hyprpaper & waybar & mako
-exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once=/home/awy/.config/hypr/portalstart
-exec-once = hypridle
+exec-once = pipewire & pipewire-pulse & wireplumber
+exec-once = start-portal
+exec-once = hyprpaper & waybar
 
-#############################
-### ENVIRONMENT VARIABLES ###
-#############################
-
-env = XCURSOR_THEME,Adwaita-old
+env = QT_SCREEN_SCALE_FACTORS,1;1
 env = XCURSOR_SIZE,24
-env = HYPRCURSOR_THEME,Adwaita-old
 env = HYPRCURSOR_SIZE,24
 env = LIBVA_DRIVER_NAME,nvidia
-env = XDG_SESSION_TYPE,wayland
 env = GBM_BACKEND,nvidia-drm
 env = __GLX_VENDOR_LIBRARY_NAME,nvidia
-env = EDITOR,nvim
-env = ELECTRON_OZONE_PLATFORM_HINT,auto
-env = SUDO,doas
-
-#####################
-### LOOK AND FEEL ###
-#####################
+env = QT_QPA_PLATFORM,wayland
+env = QT_QPA_PLATFORMTHEME,qt6ct
+env = CLUTTER_BACKEND,wayland
+env = SDL_VIDEODRIVER,wayland
+env = XDG_SESSION_TYPE,wayland
+env = XDG_CURRENT_DESKTOP,Hyprland
+env = XDG_SESSION_DESKTOP,Hyprland
 
 general { 
     gaps_in = 5
-    gaps_out = 10
+    gaps_out = 20
 
     border_size = 2
 
-    col.active_border = rgba(fbf1c7ee) 
-    col.inactive_border = rgba(3c3836ee)
+    col.active_border = rgba(33ccffee) rgba(00ff99ee) 45deg
+    col.inactive_border = rgba(595959aa)
 
     resize_on_border = false 
 
@@ -62,69 +41,64 @@ general {
 }
 
 decoration {
-    rounding = 0
+    rounding = 10
 
     active_opacity = 1.0
     inactive_opacity = 1.0
 
-    drop_shadow = false 
-    shadow_range = 32
-    shadow_render_power = 4
+    drop_shadow = true
+    shadow_range = 4
+    shadow_render_power = 3
     col.shadow = rgba(1a1a1aee)
 
     blur {
-        enabled = false
-        size = 2
-        passes = 4
-        xray = false
-        ignore_opacity = true
+        enabled = true
+        size = 3
+        passes = 1
+        
         vibrancy = 0.1696
-        popups = true
     }
 }
 
 animations {
-    enabled = yes
+    enabled = true
 
-    bezier = quart, 0.25, 1, 0.5, 1
+    bezier = myBezier, 0.05, 0.9, 0.1, 1.05
 
-    animation = windows, 1, 5, quart, slide
-    animation = border, 1, 5, quart
-    animation = borderangle, 1, 5, quart
-    animation = fade, 1, 5, quart
-    animation = workspaces, 1, 5, quart, slidevert
+    animation = windows, 1, 7, myBezier
+    animation = windowsOut, 1, 7, default, popin 80%
+    animation = border, 1, 10, default
+    animation = borderangle, 1, 8, default
+    animation = fade, 1, 7, default
+    animation = workspaces, 1, 6, default
 }
 
-
 dwindle {
     pseudotile = true # Master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
     preserve_split = true # You probably want this
-    no_gaps_when_only = 0
 }
 
-misc { 
-    force_default_wallpaper = 0 # Set to 0 or 1 to disable the anime mascot wallpapers
-    disable_hyprland_logo = true # If true disables the random hyprland logo / anime girl background. :(
-    disable_splash_rendering = true
-    enable_swallow = 1
-    swallow_regex = ^(foot)$
+master {
+    new_status = master
 }
 
-#############
-### INPUT ###
-#############
+misc { 
+    force_default_wallpaper = -1 # Set to 0 or 1 to disable the anime mascot wallpapers
+    disable_hyprland_logo = false # If true disables the random hyprland logo / anime girl background. :(
+}
 
 input {
     kb_layout = us,ru
     kb_variant =
     kb_model =
-    kb_options = grp:alt_shift_toggle
+    kb_options = grp:alt_shift_toogle
     kb_rules =
 
+    force_no_accel = 1
     follow_mouse = 1
 
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
-    force_no_accel = 1
+
     touchpad {
         natural_scroll = false
     }
@@ -134,28 +108,23 @@ gestures {
     workspace_swipe = false
 }
 
-####################
-### KEYBINDINGS ###
-####################
-
 $mainMod = SUPER # Sets "Windows" key as main modifier
 
 bind = $mainMod, Return, exec, $terminal
-bind = $mainMod SHIFT, Q, killactive,
+bind = $mainMod, Q, killactive,
 bind = $mainMod, M, exit,
-bind = $mainMod, E, exec, $fileManager
-bind = $mainMod SHIFT, B, exec, $browser
+bind = $mainMod, W, exec, $browser
+bind = $mainMod, R, exec, $fileManager
 bind = $mainMod, V, togglefloating,
-bind = $mainMod, Space, exec, $menu
+bind = $mainMod, D, exec, $menu
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod SHIFT, J, togglesplit, # dwindle
 bind = $mainMod, F, fullscreen,
 bind = $mainMod SHIFT, Return, swapnext
-bind = $mainMod SHIFT, S, exec, grim -g "$(slurp -d)" - | wl-copy
 bind =,XF86AudioPlay, exec, playerctl play-pause
 bind =,XF86AudioPrev, exec, playerctl previous
 bind =,XF86AudioNext, exec, playerctl next
-bind =,mouse:276, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle  
+bind =,mouse:276, exec, wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle && pkill -RTMIN+8 waybar 
 
 bind = $mainMod SHIFT, L, resizeactive, 100 0
 bind = $mainMod SHIFT, H, resizeactive, -100 0
@@ -188,6 +157,7 @@ bind = $mainMod SHIFT, 9, movetoworkspace, 9
 bind = $mainMod SHIFT, 0, movetoworkspace, 10
 
 bind = $mainMod, S, togglespecialworkspace, magic
+bind = $mainMod SHIFT, S, movetoworkspace, special:magic
 
 bind = $mainMod, mouse_down, workspace, e+1
 bind = $mainMod, mouse_up, workspace, e-1
@@ -195,19 +165,4 @@ bind = $mainMod, mouse_up, workspace, e-1
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod, mouse:273, resizewindow
 
-##############################
-### WINDOWS AND WORKSPACES ###
-##############################
-
 windowrulev2 = suppressevent maximize, class:.* # You'll probably like this.
-
-workspace=1,monitor:DP-2, persistent:true
-workspace=2,monitor:DP-2, persistent:true
-workspace=3,monitor:DP-3, persistent:true
-workspace=4,monitor:DP-3, persistent:true
-
-layerrule = blur, notifications 
-layerrule = ignorezero, notifications
-layerrule = blur, waybar 
-#layerrule = xray 1, waybar
-
diff --git a/.config/hypr/hyprlock.conf b/.config/hypr/hyprlock.conf
deleted file mode 100644
index 41f134a..0000000
--- a/.config/hypr/hyprlock.conf
+++ /dev/null
@@ -1,83 +0,0 @@
-general {
-    ignore_empty_input = true
-}
-
-background {
-    monitor =
-    #path = ~/.local/share/papes/wallhaven-kxg8xm_3840x2160.png 
-    color = rgba(1e1e2ee0)
-
-    # all these options are taken from hyprland, see https://wiki.hyprland.org/Configuring/Variables/#blur for explanations
-    blur_passes = 4
-    blur_size = 6
-    noise = 0.05
-    contrast = 1.0
-    brightness = 0.8
-    vibrancy = 0.15
-    vibrancy_darkness = 1.0
-}
-
-label {
-    monitor =
-    text = $TIME
-    text_align = center # center/right or any value for default left. multi-line text alignment inside label container
-    color = rgb(255, 255, 255)
-    font_size = 128
-    font_family = JetBrainsMonoNerdFontMono Bold
-    rotate = 0 # degrees, counter-clockwise
-
-    position = 0, 360
-    halign = center
-    valign = center
-}
-label {
-    monitor =
-    text = Welcome back, $USER!
-    text_align = center # center/right or any value for default left. multi-line text alignment inside label container
-    color = rgb(255, 255, 255)
-    font_size = 32
-    font_family = JetBrainsMonoNerdFontMono Bold
-    rotate = 0 # degrees, counter-clockwise
-
-    position = 0, 100
-    halign = center
-    valign = center
-}
-
-input-field {
-    monitor =
-    
-    shadow_passes = 4
-    shadow_size = 6
-    shadow_color = rgb(74c7ec)
-    shadow_boost = 1.0
-
-    size = 120, 40
-    outline_thickness = 4
-    dots_size = 0.33 # Scale of input-field height, 0.2 - 0.8
-    dots_spacing = 0.15 # Scale of dots' absolute size, 0.0 - 1.0
-    dots_center = true
-    dots_rounding = -1 # -1 default circle, -2 follow input-field rounding
-    outer_color = rgb(74c7ec)
-    inner_color = rgba(1e1e2ef0)
-    font_color = rgb(cdd6f4)
-    fade_on_empty = false
-    fade_timeout = 1000 # Milliseconds before fade_on_empty is triggered.
-    placeholder_text = <i></i> # Text rendered in the input box when it's empty.
-    hide_input = false
-    rounding = -1 # -1 means complete rounding (circle/oval)
-    check_color = rgb(f9e2af)
-    fail_color = rgb(f38ba8) # if authentication failed, changes outer_color and fail message color
-    # fail_text = <i>$FAIL <b>($ATTEMPTS)</b></i> # can be set to empty
-    fail_text = <i></i>
-    fail_transition = 300 # transition time in ms between normal outer_color and fail_color
-    capslock_color = -1
-    numlock_color = -1
-    bothlock_color = -1 # when both locks are active. -1 means don't change outer color (same for above)
-    invert_numlock = false # change color if numlock is off
-    swap_font_color = false # see below
-
-    position = 0, -20
-    halign = center
-    valign = center
-}
diff --git a/.config/hypr/hyprpaper.conf b/.config/hypr/hyprpaper.conf
index ff3d4cc..8054ae1 100644
--- a/.config/hypr/hyprpaper.conf
+++ b/.config/hypr/hyprpaper.conf
@@ -1,4 +1,7 @@
 ipc = on
-preload = /mnt/ssd/papes/thiemeyer_road_to_samarkand.jpg
-wallpaper = , /mnt/ssd/papes/thiemeyer_road_to_samarkand.jpg
+preload = /mnt/ssd/papes/wallhaven-0j7k1q_2560x1440.png
+#preload = "/mnt/ssd/papes/wallhaven-wegw36_2560x1440.png"
+
+wallpaper = , /mnt/ssd/papes/wallhaven-0j7k1q_2560x1440.png
 splash = false
+#wallpaper = DP-3,/mnt/ssd/papes/wallhaven-wegw36_2560x1440.png
diff --git a/.config/hypr/portalstart b/.config/hypr/portalstart
deleted file mode 100755
index 8f692bf..0000000
--- a/.config/hypr/portalstart
+++ /dev/null
@@ -1,8 +0,0 @@
-#!/bin/bash
-sleep 1
-killall xdg-desktop-portal-hyprland
-killall xdg-desktop-portal-wlr
-killall xdg-desktop-portal
-/usr/lib/xdg-desktop-portal-hyprland &
-sleep 2
-/usr/lib/xdg-desktop-portal &
diff --git a/.config/hypr/start.sh b/.config/hypr/start
index 75123a3..f52cc13 100755
--- a/.config/hypr/start.sh
+++ b/.config/hypr/start
@@ -1,4 +1,5 @@
-cd ~
+#!/bin/dash
+
 export XDG_RUNTIME_DIR="/tmp/hyprland"
 mkdir -p $XDG_RUNTIME_DIR
 chmod 0700 $XDG_RUNTIME_DIR