Merge branch 'master' into clacla

3 files changed, 77 insertions, 78 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index e51704d..7948349 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -1,4 +1,4 @@
-# See https://wiki.hyprland.org/Configuring/Monitors/
+# See https://wiki.hypr.land/Configuring/Monitors/
 #{{{ Monitor config
 monitor = DP-2, 1920x1080@75, 0x0, 1
 monitor = HDMI-A-1, 1920x1080@75, 1920x0, 1
@@ -6,7 +6,7 @@ monitor = HDMI-A-1, 1920x1080@75, 1920x0, 1
 monitor = , preferred, auto, 1
 #}}}
 
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+# See https://wiki.hypr.land/Configuring/Keywords/ for more
 
 #{{{ Plugins
 plugin = /var/cache/hyprpm/zachir/hyprland-plugins/hyprscrolling.so
@@ -64,7 +64,7 @@ device {
 # }}}
 
 #{{{ Input options
-# For all categories, see https://wiki.hyprland.org/Configuring/Variables/
+# For all categories, see https://wiki.hypr.land/Configuring/Variables/
 input {
     kb_layout = us
     kb_variant =
@@ -91,7 +91,7 @@ input {
 
 #{{{ General options
 general {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    # See https://wiki.hypr.land/Configuring/Variables/ for more
     gaps_in = 5
     gaps_out = 20
     border_size = 2
@@ -123,7 +123,7 @@ misc {
 
 #{{{ Decoration options
 decoration {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
+    # See https://wiki.hypr.land/Configuring/Variables/ for more
     rounding = 10
     #{{{ Blur options
     blur {
@@ -148,8 +148,8 @@ decoration {
 
 #{{{ Animations options
 animations {
-    enabled = yes
-    # Some default animations, see https://wiki.hyprland.org/Configuring/Animations/ for more
+    enabled = no
+    # Some default animations, see https://wiki.hypr.land/Configuring/Animations/ for more
     bezier = myBezier, 0.05, 0.9, 0.1, 1.05
     animation = windows, 1, 7, myBezier
     animation = windowsOut, 1, 7, default, popin 80%
@@ -162,7 +162,7 @@ animations {
 
 #{{{ Dwindle layout options
 dwindle {
-    # See https://wiki.hyprland.org/Configuring/Dwindle-Layout/ for more
+    # See https://wiki.hypr.land/Configuring/Dwindle-Layout/ for more
     pseudotile = yes # master switch for pseudotiling. Enabling is bound to mainMod + P in the keybinds section below
     preserve_split = yes # you probably want this
     special_scale_factor = 0.55
@@ -173,7 +173,7 @@ dwindle {
 master {
     special_scale_factor = 0.55
     mfact = 0.55
-    # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
+    # See https://wiki.hypr.land/Configuring/Master-Layout/ for more
     new_status = slave
     new_on_top = false
     new_on_active = before
@@ -186,8 +186,8 @@ master {
 
 #{{{ Gestures options
 gestures {
-    # See https://wiki.hyprland.org/Configuring/Variables/ for more
-    workspace_swipe = off
+    # See https://wiki.hypr.land/Configuring/Variables/ for more
+    #workspace_swipe = off
 }
 #}}}
 
@@ -226,6 +226,8 @@ windowrulev2 = workspace special:easyeffects silent, class: ^(com\.github\.wwmm\
 windowrulev2 = workspace special:sonobus silent, class: ^(SonoBus)$
 # Fix brave xray menus
 windowrulev2 = xray 0, class: ^(\s*), title: ^(\s*)$
+# Center floating XWayland windows
+windowrule = center, xwayland: 1
 #}}}
 
 #{{{ Layerrules
@@ -233,7 +235,7 @@ layerrule = blur, waybar
 #}}}
 
 #{{{ Mods
-# See https://wiki.hyprland.org/Configuring/Keywords/ for more
+# See https://wiki.hypr.land/Configuring/Keywords/ for more
 $mainMod = SUPER
 $secdMod = ALT
 #}}}
@@ -260,18 +262,12 @@ $secdMod = ALT
 
 #{{{ hyprscrolling layout binds
 # hyprscrolling layout binds
-#bind = $mainMod+SHIFT, H, layoutmsg, move -1 #HYPRSCROLLING
-#bind = $mainMod+SHIFT, L, layoutmsg, move +1 #HYPRSCROLLING
 bind = $mainMod+SHIFT, H, layoutmsg, movewindowto l #HYPRSCROLLING
 bind = $mainMod+SHIFT, J, layoutmsg, movewindowto d #HYPRSCROLLING
 bind = $mainMod+SHIFT, K, layoutmsg, movewindowto u #HYPRSCROLLING
 bind = $mainMod+SHIFT, L, layoutmsg, movewindowto r #HYPRSCROLLING
-bind = $mainMod+CONTROL, H, exec, hyprswap.sh -l
-bind = $mainMod+CONTROL, L, exec, hyprswap.sh -r
-#bind = $mainMod+SHIFT, H, movewindow, l #HYPRSCROLLING
-#bind = $mainMod+SHIFT, L, movewindow, r #HYPRSCROLLING
-#bind = $mainMod+SHIFT, K, movewindow, u #HYPRSCROLLING
-#bind = $mainMod+SHIFT, J, movewindow, d #HYPRSCROLLING
+bind = $mainMod+CONTROL, H, layoutmsg, swapcol l
+bind = $mainMod+CONTROL, L, layoutmsg, swapcol r
 bind = $mainMod, H, layoutmsg, focus l #HYPRSCROLLING
 bind = $mainMod, J, layoutmsg, focus d #HYPRSCROLLING
 bind = $mainMod, K, layoutmsg, focus u #HYPRSCROLLING
diff --git a/sh/functions b/sh/functions
index e84ea51..e7270bc 100644
--- a/sh/functions
+++ b/sh/functions
@@ -57,66 +57,68 @@ R	- /
 U.	- /usr
 Us	- /usr/share
 V.	- /var
-aw	- /home/zachir/.config/awesome
-b.	- /home/zachir/.local/bin
-bb	- /home/zachir/.local/bin/blocks
-bf	- /home/zachir/.local/bin/slatpak-sc
-bg	- /home/zachir/.local/bin/generics
-bi	- /home/zachir/.local/bin/ignore
-bsc	- /home/zachir/.local/bin/scripts
-bsh	- /home/zachir/.local/bin/shortcmds
-bsp	- /home/zachir/.local/bin/sp
-c	- /home/zachir/.config
-db	- /home/zachir/.local/src/dwmbar
-dc	- /home/zachir/Documents
-dl	- /home/zachir/.local/src/dwl
-dm	- /home/zachir/.local/src/dmenu
-do	- /home/zachir/Downloads
-dw	- /home/zachir/Downloads/wine
-e	- /home/zachir/Desktop
-f	- /home/zachir/.var/app
-h	- /home/zachir/.config/hypr
-lb	- /home/zachir/.local/bin
-lc	- /home/zachir/Games/cache
-lf	- /home/zachir/.config/lf
-ls	- /home/zachir/.local/share
-n3	- /home/zachir/.vst3/native
-ns	- /home/zachir/.vst/native
-nv	- /home/zachir/.config/nvim
-p	- /home/zachir/Pictures
-qb	- /home/zachir/.config/qutebrowser
-qp	- /home/zachir/.local/share/qutebrowser-profiles
-re	- /home/zachir/.local/src
+aw	- $XDG_CONFIG_HOME/awesome
+b.	- $HOME/.local/bin
+bb	- $HOME/.local/bin/blocks
+bf	- $HOME/.local/bin/slatpak-sc
+bg	- $HOME/.local/bin/generics
+bi	- $HOME/.local/bin/ignore
+bsc	- $HOME/.local/bin/scripts
+bsh	- $HOME/.local/bin/shortcmds
+bsp	- $HOME/.local/bin/sp
+c	- $XDG_CONFIG_HOME
+db	- $SRCDIR/dwmbar
+dc	- $XDG_DOCUMENTS_DIR
+dl	- $SRCDIR/dwl
+dm	- $SRCDIR/dmenu
+do	- $XDG_DOWNLOAD_DIR
+dp	- $XDG_DOWNLOAD_DIR/plugin/zachir_librem.one
+dw	- $XDG_DOWNLOAD_DIR/wine
+e	- $XDG_DESKTOP_DIR
+f	- $HOME/.var/app
+h	- $XDG_CONFIG_HOME/hypr
+lb	- $HOME/.local/bin
+lc	- $HOME/Games/cache
+lf	- $XDG_CONFIG_HOME/lf
+ls	- $XDG_DATA_HOME
+n3	- $HOME/.vst3/native
+ns	- $HOME/.vst/native
+nv	- $XDG_CONFIG_HOME/nvim
+p	- $XDG_PICTURES_DIR
+qb	- $XDG_CONFIG_HOME/qutebrowser
+qp	- $XDG_DATA_HOME/qutebrowser-profiles
+re	- $SRCDIR
 rs	- /etc/runit/sv
-sc	- /home/zachir/.local/bin/scripts
-sh	- /home/zachir/.config/sh
-sl	- /home/zachir/.local/src/slock
+sc	- $HOME/.local/bin/scripts
+sh	- $XDG_CONFIG_HOME/sh
+sl	- $SRCDIR/slock
 ss	- /etc/s6/sv
-st	- /home/zachir/.local/src/st
-sx	- /home/zachir/.config/sxhkd
-tr	- /home/zachir/.local/share/Trash/files
-urs	- /home/zachir/.runit/sv
-v3.	- /home/zachir/.vst3
-v3n	- /home/zachir/.vst3/native
-v3y	- /home/zachir/.vst3/yabridge
-v.	- /home/zachir/var
-vi	- /home/zachir/Videos
-vsn	- /home/zachir/.vst/native
-vs.	- /home/zachir/.vst
-vsy	- /home/zachir/.vst/yabridge
-wdo	- /home/zachir/.local/share/wineprefixes/default/drive_c/users/zachir/Downloads
-wa	- /home/zachir/.local/src/wallpapers
-wd	- /home/zachir/.local/share/wineprefixes/default
-wr	- /home/zachir/.local/share/wineprefixes
-wv3	- /home/zachir/.winvst3
-wvs	- /home/zachir/.winvst
-ww	- /home/zachir/.local/share/wineprefixes/work
-x	- /home/zachir/.config/X11
-y3	- /home/zachir/.vst3/yabridge
-yb	- /home/zachir/.cache/yay
-yc	- /home/zachir/.config/yay
-zs	- /home/zachir/.config/zsh
-zx	- /home/zachir/Documents/zachir.xyz
+st	- $SRCDIR/st
+sx	- $XDG_CONFIG_HOME/sxhkd
+tr	- $XDG_DATA_HOME/Trash/files
+urs	- $HOME/.runit/sv
+v3.	- $HOME/.vst3
+v3n	- $HOME/.vst3/native
+v3y	- $HOME/.vst3/yabridge
+v.	- $HOME/var
+vi	- $XDG_VIDEOS_DIR
+vsn	- $HOME/.vst/native
+vs.	- $HOME/.vst
+vsy	- $HOME/.vst/yabridge
+vw\t- $XDG_DATA_HOME/vimwiki
+wdo	- $WINEPREFIX/drive_c/users/zachir/Downloads
+wa	- $SRCDIR/wallpapers
+wd	- $WINEPREFIX
+wr	- $WINEROOT
+wv3	- $HOME/.winvst3
+wvs	- $HOME/.winvst
+ww	- $WINEROOT/work
+x	- $XDG_CONFIG_HOME/X11
+y3	- $HOME/.vst3/yabridge
+yb	- $XDG_CACHE_HOME/yay
+yc	- $XDG_CONFIG_HOME/yay
+zs	- $XDG_CONFIG_HOME/zsh
+zx	- $XDG_DOCUMENTS_DIR/zachir.xyz
 " ;;
       # STOPPRINT
       # STARTPATHS
diff --git a/sh/profile b/sh/profile
index 845b559..4e5f3ed 100644
--- a/sh/profile
+++ b/sh/profile
@@ -7,6 +7,7 @@ export XDG_CURRENT_DESKTOP="Hyprland"
 export XDG_DOCUMENTS_DIR=${HOME}/Documents
 export XDG_DOWNLOAD_DIR=${HOME}/Downloads
 export XDG_DESKTOP_DIR=${HOME}/Desktop
+export XDG_PICTURES_DIR=${HOME}/Pictures
 export XDG_STATE_HOME="${HOME}/.local/state"
 export XDG_VIDEOS_DIR=${HOME}/Videos