Merge branch 'master' into carcar

5 files changed, 113 insertions, 99 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index af37cd4..085723e 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -16,6 +16,7 @@ monitor = , preferred, auto, 1
 #{{{ Autostart
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
 exec-once = hyprpm reload -n
 exec-once = xdph
 exec-once = hyprpaper
@@ -30,8 +31,8 @@ exec-once = import-gsettings cursor-theme 'BreezeX-Black'
 exec-once = gsettings set org.gnome.desktop.interface color-scheme 'prefer-dark'
 exec-once = xrdb -load "$XDG_CONFIG_HOME"/X11/xresources
 exec-once = com.github.wwmm.easyeffects
-exec-once = systemctl --user start dunst
-exec-once = systemctl --user start hypridle
+exec-once = systemctl --user restart dunst
+exec-once = systemctl --user restart hypridle
 exec-once = xwayland-satellite :1
 exec-once = bl-save
 #exec-once = mpd
@@ -187,6 +188,18 @@ master {
 }
 #}}}
 
+#{{{ scrolling layout options
+scrolling {
+    fullscreen_on_one_column = true
+    column_width = 0.5
+    focus_fit_method = 1
+    follow_focus = true
+    follow_min_visible = 0.4
+    explicit_column_widths = 0.333, 0.5, 0.667, 1.0
+    direction = right
+}
+#}}}
+
 #{{{ Gestures options
 gestures {
     # See https://wiki.hypr.land/Configuring/Variables/ for more
@@ -196,18 +209,18 @@ gestures {
 
 #{{{ plugin options
 plugin {
-  hyprsplit {
-    num_workspaces = 9
-    persistent_workspaces = true
-  }
-
-  hyprscrolling {
-    fullscreen_on_one_column = false
-    column_width = 0.5
-    explicit_column_widths = 0.25, 0.333, 0.5, 0.667, 0.75, 1.0
-    focus_fit_method = 1
-    follow_focus = true
-  }
+  #hyprsplit {
+  #  num_workspaces = 9
+  #  persistent_workspaces = true
+  #}
+
+  #hyprscrolling {
+  #  fullscreen_on_one_column = false
+  #  column_width = 0.5
+  #  explicit_column_widths = 0.25, 0.333, 0.5, 0.667, 0.75, 1.0
+  #  focus_fit_method = 1
+  #  follow_focus = true
+  #}
 }
 #}}}
 
@@ -287,20 +300,20 @@ $secdMod = ALT
 #bind = $mainMod, O, splitratio, exact 0.69 #MASTER
 #}}}
 
-#{{{ hyprscrolling layout binds
-# hyprscrolling layout binds
-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, 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
-bind = $mainMod, L, layoutmsg, focus r #HYPRSCROLLING
-bind = $mainMod+SHIFT, R, layoutmsg, colresize +conf #HYPRSCROLLING
-bind = $mainMod+SHIFT, Return, layoutmsg, promote #HYPRSCROLLING
+#{{{ scrolling layout binds
+# scrolling layout binds
+bind = $mainMod+SHIFT, H, layoutmsg, movewindowto l #SCROLLING
+bind = $mainMod+SHIFT, J, layoutmsg, movewindowto d #SCROLLING
+bind = $mainMod+SHIFT, K, layoutmsg, movewindowto u #SCROLLING
+bind = $mainMod+SHIFT, L, layoutmsg, movewindowto r #SCROLLING
+bind = $mainMod+CONTROL, H, layoutmsg, swapcol l #SCROLLING
+bind = $mainMod+CONTROL, L, layoutmsg, swapcol r #SCROLLING
+bind = $mainMod, H, layoutmsg, focus l #SCROLLING
+bind = $mainMod, J, layoutmsg, focus d #SCROLLING
+bind = $mainMod, K, layoutmsg, focus u #SCROLLING
+bind = $mainMod, L, layoutmsg, focus r #SCROLLING
+bind = $mainMod+SHIFT, R, layoutmsg, colresize +conf #SCROLLING
+bind = $mainMod+SHIFT, Return, layoutmsg, promote #SCROLLING
 #}}}
 
 #{{{ tab binds
@@ -336,80 +349,80 @@ bind = $mainMod SHIFT, N, togglespecialworkspace, minimized
 #}}}
 
 #{{{ Workspace binds (using hyprsplit plugin!)
-# Switch workspaces with mainMod + [0-9]
-bind = $mainMod, 1, split:workspace, 1
-bind = $mainMod, 2, split:workspace, 2
-bind = $mainMod, 3, split:workspace, 3
-bind = $mainMod, 4, split:workspace, 4
-bind = $mainMod, 5, split:workspace, 5
-bind = $mainMod, 6, split:workspace, 6
-bind = $mainMod, 7, split:workspace, 7
-bind = $mainMod, 8, split:workspace, 8
-bind = $mainMod, 9, split:workspace, 9
-# Move active window to a workspace with mainMod + SHIFT + [0-9]
-bind = $mainMod SHIFT, 1, split:movetoworkspacesilent, 1
-bind = $mainMod SHIFT, 2, split:movetoworkspacesilent, 2
-bind = $mainMod SHIFT, 3, split:movetoworkspacesilent, 3
-bind = $mainMod SHIFT, 4, split:movetoworkspacesilent, 4
-bind = $mainMod SHIFT, 5, split:movetoworkspacesilent, 5
-bind = $mainMod SHIFT, 6, split:movetoworkspacesilent, 6
-bind = $mainMod SHIFT, 7, split:movetoworkspacesilent, 7
-bind = $mainMod SHIFT, 8, split:movetoworkspacesilent, 8
-bind = $mainMod SHIFT, 9, split:movetoworkspacesilent, 9
-bind = $mainMod CONTROL SHIFT, 1, split:movetoworkspace, 1
-bind = $mainMod CONTROL SHIFT, 2, split:movetoworkspace, 2
-bind = $mainMod CONTROL SHIFT, 3, split:movetoworkspace, 3
-bind = $mainMod CONTROL SHIFT, 4, split:movetoworkspace, 4
-bind = $mainMod CONTROL SHIFT, 5, split:movetoworkspace, 5
-bind = $mainMod CONTROL SHIFT, 6, split:movetoworkspace, 6
-bind = $mainMod CONTROL SHIFT, 7, split:movetoworkspace, 7
-bind = $mainMod CONTROL SHIFT, 8, split:movetoworkspace, 8
-bind = $mainMod CONTROL SHIFT, 9, split:movetoworkspace, 9
-#bind = $mainMod, mouse_down, split:workspace, e+1
-#bind = $mainMod, mouse_up, split:workspace, e-1
-bind = $mainMod, G, split:grabroguewindows
-bind = $mainMod, comma, focusmonitor, -1
-bind = $mainMod, period, focusmonitor, +1
-bind = $mainMod SHIFT, comma, movewindow, mon:-1
-bind = $mainMod SHIFT, period, movewindow, mon:+1
-#}}}
-
-#{{{ Workspace binds (not using hyprsplit plugin)
 ## Switch workspaces with mainMod + [0-9]
-#bind = $mainMod, 1, workspace, 1
-#bind = $mainMod, 2, workspace, 2
-#bind = $mainMod, 3, workspace, 3
-#bind = $mainMod, 4, workspace, 4
-#bind = $mainMod, 5, workspace, 5
-#bind = $mainMod, 6, workspace, 6
-#bind = $mainMod, 7, workspace, 7
-#bind = $mainMod, 8, workspace, 8
-#bind = $mainMod, 9, workspace, 9
+#bind = $mainMod, 1, split:workspace, 1
+#bind = $mainMod, 2, split:workspace, 2
+#bind = $mainMod, 3, split:workspace, 3
+#bind = $mainMod, 4, split:workspace, 4
+#bind = $mainMod, 5, split:workspace, 5
+#bind = $mainMod, 6, split:workspace, 6
+#bind = $mainMod, 7, split:workspace, 7
+#bind = $mainMod, 8, split:workspace, 8
+#bind = $mainMod, 9, split:workspace, 9
 ## Move active window to a workspace with mainMod + SHIFT + [0-9]
-#bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
-#bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2
-#bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3
-#bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4
-#bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5
-#bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6
-#bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
-#bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
-#bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
-#bind = $mainMod CONTROL SHIFT, 1, movetoworkspace, 1
-#bind = $mainMod CONTROL SHIFT, 2, movetoworkspace, 2
-#bind = $mainMod CONTROL SHIFT, 3, movetoworkspace, 3
-#bind = $mainMod CONTROL SHIFT, 4, movetoworkspace, 4
-#bind = $mainMod CONTROL SHIFT, 5, movetoworkspace, 5
-#bind = $mainMod CONTROL SHIFT, 6, movetoworkspace, 6
-#bind = $mainMod CONTROL SHIFT, 7, movetoworkspace, 7
-#bind = $mainMod CONTROL SHIFT, 8, movetoworkspace, 8
-#bind = $mainMod CONTROL SHIFT, 9, movetoworkspace, 9
+#bind = $mainMod SHIFT, 1, split:movetoworkspacesilent, 1
+#bind = $mainMod SHIFT, 2, split:movetoworkspacesilent, 2
+#bind = $mainMod SHIFT, 3, split:movetoworkspacesilent, 3
+#bind = $mainMod SHIFT, 4, split:movetoworkspacesilent, 4
+#bind = $mainMod SHIFT, 5, split:movetoworkspacesilent, 5
+#bind = $mainMod SHIFT, 6, split:movetoworkspacesilent, 6
+#bind = $mainMod SHIFT, 7, split:movetoworkspacesilent, 7
+#bind = $mainMod SHIFT, 8, split:movetoworkspacesilent, 8
+#bind = $mainMod SHIFT, 9, split:movetoworkspacesilent, 9
+#bind = $mainMod CONTROL SHIFT, 1, split:movetoworkspace, 1
+#bind = $mainMod CONTROL SHIFT, 2, split:movetoworkspace, 2
+#bind = $mainMod CONTROL SHIFT, 3, split:movetoworkspace, 3
+#bind = $mainMod CONTROL SHIFT, 4, split:movetoworkspace, 4
+#bind = $mainMod CONTROL SHIFT, 5, split:movetoworkspace, 5
+#bind = $mainMod CONTROL SHIFT, 6, split:movetoworkspace, 6
+#bind = $mainMod CONTROL SHIFT, 7, split:movetoworkspace, 7
+#bind = $mainMod CONTROL SHIFT, 8, split:movetoworkspace, 8
+#bind = $mainMod CONTROL SHIFT, 9, split:movetoworkspace, 9
+##bind = $mainMod, mouse_down, split:workspace, e+1
+##bind = $mainMod, mouse_up, split:workspace, e-1
+#bind = $mainMod, G, split:grabroguewindows
 #bind = $mainMod, comma, focusmonitor, -1
 #bind = $mainMod, period, focusmonitor, +1
 #bind = $mainMod SHIFT, comma, movewindow, mon:-1
 #bind = $mainMod SHIFT, period, movewindow, mon:+1
 #}}}
 
+#{{{ Workspace binds (not using hyprsplit plugin)
+# Switch workspaces with mainMod + [0-9]
+bind = $mainMod, 1, workspace, 1
+bind = $mainMod, 2, workspace, 2
+bind = $mainMod, 3, workspace, 3
+bind = $mainMod, 4, workspace, 4
+bind = $mainMod, 5, workspace, 5
+bind = $mainMod, 6, workspace, 6
+bind = $mainMod, 7, workspace, 7
+bind = $mainMod, 8, workspace, 8
+bind = $mainMod, 9, workspace, 9
+# Move active window to a workspace with mainMod + SHIFT + [0-9]
+bind = $mainMod SHIFT, 1, movetoworkspacesilent, 1
+bind = $mainMod SHIFT, 2, movetoworkspacesilent, 2
+bind = $mainMod SHIFT, 3, movetoworkspacesilent, 3
+bind = $mainMod SHIFT, 4, movetoworkspacesilent, 4
+bind = $mainMod SHIFT, 5, movetoworkspacesilent, 5
+bind = $mainMod SHIFT, 6, movetoworkspacesilent, 6
+bind = $mainMod SHIFT, 7, movetoworkspacesilent, 7
+bind = $mainMod SHIFT, 8, movetoworkspacesilent, 8
+bind = $mainMod SHIFT, 9, movetoworkspacesilent, 9
+bind = $mainMod CONTROL SHIFT, 1, movetoworkspace, 1
+bind = $mainMod CONTROL SHIFT, 2, movetoworkspace, 2
+bind = $mainMod CONTROL SHIFT, 3, movetoworkspace, 3
+bind = $mainMod CONTROL SHIFT, 4, movetoworkspace, 4
+bind = $mainMod CONTROL SHIFT, 5, movetoworkspace, 5
+bind = $mainMod CONTROL SHIFT, 6, movetoworkspace, 6
+bind = $mainMod CONTROL SHIFT, 7, movetoworkspace, 7
+bind = $mainMod CONTROL SHIFT, 8, movetoworkspace, 8
+bind = $mainMod CONTROL SHIFT, 9, movetoworkspace, 9
+bind = $mainMod, comma, focusmonitor, -1
+bind = $mainMod, period, focusmonitor, +1
+bind = $mainMod SHIFT, comma, movewindow, mon:-1
+bind = $mainMod SHIFT, period, movewindow, mon:+1
+#}}}
+
 #{{{ Mouse binds
 # Move/resize windows with mainMod + LMB/RMB and dragging
 bindm = $mainMod, mouse:272, movewindow
diff --git a/lf/lfrc b/lf/lfrc
index cbe77a4..456bf26 100644
--- a/lf/lfrc
+++ b/lf/lfrc
@@ -61,13 +61,13 @@ cmd vimv ${{ exec vimv }}
 cmd mkdir ${{
   printf "Directory Name: "
   read ans
-  mkdir $ans
+  mkdir "$ans"
 }}
 
 cmd mkfile ${{
   printf "File Name: "
   read ans
-  $EDITOR $ans
+  $EDITOR "$ans"
 }}
 
 cmd chmod ${{
diff --git a/mpv/mpv.conf b/mpv/mpv.conf
index 649af35..7cc3ab4 100644
--- a/mpv/mpv.conf
+++ b/mpv/mpv.conf
@@ -1,5 +1,5 @@
 save-position-on-quit
 ao=pipewire,pulse,jack
-vo=gpu
+vo=gpu-next
 hwdec=yes
 audio-channels=2
diff --git a/ncmpcpp/config b/ncmpcpp/config
index 2b4b68f..4cc4311 100644
--- a/ncmpcpp/config
+++ b/ncmpcpp/config
@@ -30,7 +30,7 @@ mpd_host = ~/.config/mpd/socket
 #
 ## Needed for tag editor and file operations to work.
 ##
-#mpd_music_dir = ~/music
+mpd_music_dir = ~/Music
 #
 #mpd_crossfade_time = 5
 #
@@ -271,6 +271,7 @@ visualizer_look = ●▮
 ## notifications etc.
 ##
 #execute_on_song_change = ""
+execute_on_song_change = "songinfo"
 #
 ##
 ## Note: Custom command that will be executed each time player state
diff --git a/xdg-desktop-portal/portals.conf b/xdg-desktop-portal/portals.conf
index b1a274e..262bbb0 100644
--- a/xdg-desktop-portal/portals.conf
+++ b/xdg-desktop-portal/portals.conf
@@ -1,4 +1,4 @@
 [preferred]
-default=hyprland
+default=hyprland;gtk
 org.freedesktop.impl.portal.FileChooser=gtk
 org.freedesktop.impl.portal.Settings=darkman