Merge branch 'x13'

# Conflicts:
#	.config/hypr/hyprland.conf
#	.config/hypr/hyprpaper.conf
#	.config/waybar/config
#	.gitignore
#	.zshrc
#	bin/alias
#	bin/brightness
#	bin/cycle_pactl.sh
#	bin/keep.sh
#	bin/lid_close.sh
#	bin/lid_open.sh
#	bin/startup.sh

.config/hypr/hyprland.conf

@@ -13,6 +13,9 @@ monitor=HDMI-A-1,2560x1440@74.78, 1920x0, 1
 
 # Execute your favorite apps at launch
 
+debug {
+    disable_logs=false
+}
 
 # Source a file (multi-file configs)
 #source = ~/.config/hypr/myColors.conf
@@ -30,6 +33,8 @@ exec-once=~/bin/startup.sh
 exec-once=~/bin/suspend.sh
 
 exec-once=dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+exec-once=systemctl --user import-environment WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+
 exec-once=hyprland-autoname-workspaces
 exec-once=hyprctl setcursor Bibata-Modern-Classic 48
 exec-once=waybar
@@ -66,7 +71,7 @@ input {
     follow_mouse = 1
 
     touchpad {
-        natural_scroll = no
+        natural_scroll = yes
     }
 
     sensitivity = 0 # -1.0 - 1.0, 0 means no modification.
@@ -154,7 +159,7 @@ master {
 $mainMod = SUPER
 
 # Example binds, see https://wiki.hyprland.org/Configuring/Binds/ for more
-bind = $mainMod, Q, exec, wezterm #alacritty -e screen
+bind = $mainMod, Q, exec, wezterm start  #gnome-terminal #alacritty -e screen
 bind = $mainMod SHIFT, Q, exec, alacritty
 bind = $mainMod, C, killactive, 
 bind = $mainMod, W, killactive, 
@@ -164,19 +169,37 @@ bind = $mainMod, Y, exec, copyq toggle
 bind = $mainMod, A, exec, swaync-client -t -sw
 bind = $mainMod, V, togglefloating, 
 bind = $mainMod, space, exec, fuzzel
-#bind = $mainMod, space, exec, wofi --show drun
 bind = $mainMod, D, exec, wayscriber --active
 bind = $mainMod, P, pseudo, # dwindle
 bind = $mainMod, J, togglesplit, # dwindle
-bind = $mainMod, L, exec, swaylock --screenshots --effect-blur 7x5 --clock
+bind = $mainMod, L, exec, hyprlock
 bind = $mainMod, F, fullscreen,
-bind = $mainMod, D, exec, pkill -SIGUSR1 hyprmarker
+bind = $mainMod, Delete, exec, ~/bin/suspend.sh
+
+#laptop screen brightness
+bind = $mainMod ALT, 1, exec, sudo brightnessctl s 10%
+bind = $mainMod ALT, 2, exec, sudo brightnessctl s 20%
+bind = $mainMod ALT, 3, exec, sudo brightnessctl s 30%
+bind = $mainMod ALT, 4, exec, sudo brightnessctl s 40%
+bind = $mainMod ALT, 5, exec, sudo brightnessctl s 50%
+bind = $mainMod ALT, 6, exec, sudo brightnessctl s 60%
+bind = $mainMod ALT, 7, exec, sudo brightnessctl s 70%
+bind = $mainMod ALT, 8, exec, sudo brightnessctl s 80%
+bind = $mainMod ALT, 9, exec, sudo brightnessctl s 90%
+bind = $mainMod ALT, 0, exec, sudo brightnessctl s 100%
+bind = , XF86MonBrightnessUp, exec, sudo brightnessctl s "+10%"
+bind = , XF86MonBrightnessDown, exec, sudo brightnessctl s "10%-"
+
 #lid binds
-#bindl = , switch:on:Lid Switch, exec, swaylock --screenshots --effect-blur 7x5 --clock
-# trigger when the switch is turning off
-bindl = , switch:off:Lid Switch,exec,hyprctl keyword monitor "eDP-1, preferred, 0x0, 1"
-# # trigger when the switch is turning on
-bindl = , switch:on:Lid Switch,exec,hyprctl keyword monitor "eDP-1, disable"
+# trigger when the lid is opened
+bindl = , switch:off:Lid Switch,exec,~/bin/lid_open.sh
+# trigger when the lid is closed
+bindl = , switch:on:Lid Switch,exec,~/bin/lid_close.sh
+
+# Desktop zooming or magnifier
+bindd = $mainMod ALT, mouse_down, zoom in, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 2.0}')"
+bindd = $mainMod ALT, mouse_up, zoom out, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor / 2.0}')"
+
 
 # Desktop zooming or magnifier
 bindd = $mainMod ALT, mouse_down, zoom in, exec, hyprctl keyword cursor:zoom_factor "$(hyprctl getoption cursor:zoom_factor | awk 'NR==1 {factor = $2; if (factor < 1) {factor = 1}; print factor * 2.0}')"
@@ -236,10 +259,13 @@ bind = $mainMod CTRL, right, workspace, e+1
 #multimedia keys
 #bind = ,XF86AudioRaiseVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ +5%
 bind = ,XF86AudioRaiseVolume, exec, swayosd-client --output-volume raise
+#bind = ,code:115, exec, swayosd-client --output-volume raise
 #bind = ,XF86AudioLowerVolume, exec, pactl set-sink-volume @DEFAULT_SINK@ -5%
 bind = ,XF86AudioLowerVolume, exec, swayosd-client --output-volume lower
+#bind = ,code:114, exec, swayosd-client --output-volume lower
 #bind = ,XF86AudioMute, exec, pactl set-sink-mute @DEFAULT_SINK@ toggle
 bind = ,XF86AudioMute, exec,  swayosd-client --output-volume mute-toggle
+#bind = ,code:113, exec,  swayosd-client --output-volume mute-toggle
 
 bind = ,XF86AudioPlay, exec, playerctl play-pause
 bind = ,XF86PowerDown, exec, shutdown -h now
@@ -256,7 +282,7 @@ bind = ALT, a, exec, playerctl -p $player previous
 
 #screenshot
 #bind = $mainMod, Shift_R , exec, hyprshot --clipboard-only -m region
-bind = , Pause, exec, hyprshot --clipboard-only -m region
+bind = , Print, exec, hyprshot --clipboard-only -m region
 
 
 #windows rules 
@@ -295,4 +321,38 @@ windowrule {
     float = off
 }
 
+    float = on
+}
+
+windowrule {
+    name = stay-focused
+    match:class = (steam)
+    match:class = ^(zoom)$
+    stay_focused = on
+}
+
+windowrule {
+    name = tiled
+    match:class = ^(com-zerenesystems-stacker-gui-MainFrame)$
+    match:title = (A Ren(.)Py Game)
+    match:xwayland = 1
+    float = off
+}
+
+#jetbrain xwayland fixes. see https://github.com/hyprwm/Hyprland/issues/4257
+windowrule {
+  name = windowrule-jb-tag
+  tag = +jb
+  match:class = ^jetbrains-.*
+  match:initial_title = ""
+  #match:float = 1
+}
+
+windowrule {
+  name = windowrule-jb-focus
+  focus_on_activate = on
+  no_initial_focus = on
+  float=off
+  match:tag = jb
+}