Merge branch 'master' into cla

2 files changed, 53 insertions, 15 deletions

diff --git a/Makefile b/Makefile
index 28bc66e..3d220be 100644
--- a/Makefile
+++ b/Makefile
@@ -5,7 +5,18 @@ DCONFS := doas.conf
 
 all:
 
-install: install-zshconfigs install-shconfigs vimplug-vim
+install: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim
+
+install-hyprplugins:
+	@echo "Installing hyprsplit..."
+	@hyprpm add https://github.com/shezdy/hyprsplit
+	@echo "Installing hyprland-plugins..."
+	@hyprpm add https://github.com/hyprwm/hyprland-plugins
+	@echo "Enabling hyprsplit..."
+	@hyprpm enable hyprsplit
+	@echo "Enabling hyprscrolling..."
+	@hyprpm enable hyprscrolling
+	@echo "Done."
 
 install-zshconfigs: $(ZCONFS)
 	@echo "Installing zsh conf files..."
@@ -34,3 +45,5 @@ doas-conf: $(DCONFS)
 	@echo "doas.conf..."
 	@sudo cp -n doas.conf /etc/doas.conf
 	@echo "Done."
+
+.PHONY: install-hyprplugins install-zshconfigs install-shconfigs vimplug-vim doas-conf install
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 6404a3e..2ce53ed 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -10,8 +10,8 @@ monitor = , preferred, auto, 1
 #{{{ Autostart
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
-exec-once = xdph
 exec-once = hyprpm reload -n
+exec-once = xdph
 exec-once = hyprpaper
 #exec-once = hypridle
 exec-once = waybar
@@ -93,7 +93,7 @@ general {
     #col.inactive_border = rgba(595959aa)
     col.active_border = rgba(198844ee)
     col.inactive_border = rgba(1b1d1cee)
-    layout = master
+    layout = scrolling
 }
 #}}}
 
@@ -178,6 +178,16 @@ master {
 }
 #}}}
 
+#{{{ Hyprscrolling layout options
+plugin:hyprscrolling {
+  fullscreen_on_one_column = true
+  column_width = 0.5
+  explicit_column_widths = 0.333, 0.5, 0.667, 1.0
+  focus_fit_method = 1
+  follow_focus = true
+}
+#}}}
+
 #{{{ Gestures options
 gestures {
     # See https://wiki.hyprland.org/Configuring/Variables/ for more
@@ -222,18 +232,33 @@ $secdMod = ALT
 #}}}
 
 #{{{ Master layout binds
-# Master layout binds
-bind = $mainMod+SHIFT, Return, layoutmsg, swapwithmaster master #MASTER
-bind = $mainMod+SHIFT, J, layoutmsg, swapnext #MASTER
-bind = $mainMod+SHIFT, K, layoutmsg, swapprev #MASTER
-bind = $mainMod+SHIFT, H, layoutmsg, addmaster #MASTER
-bind = $mainMod+SHIFT, L, layoutmsg, removemaster #MASTER
-binde = $mainMod, J, layoutmsg, cyclenext #MASTER
-binde = $mainMod, K, layoutmsg, cycleprev #MASTER
-binde = $mainMod, H, splitratio, -0.01 #MASTER
-binde = $mainMod, L, splitratio, +0.01 #MASTER
-bind = $mainMod+SHIFT, O, splitratio, exact 0.55 #MASTER
-bind = $mainMod, O, splitratio, exact 0.69 #MASTER
+## Master layout binds
+#bind = $mainMod+SHIFT, Return, layoutmsg, swapwithmaster master #MASTER
+#bind = $mainMod+SHIFT, J, layoutmsg, swapnext #MASTER
+#bind = $mainMod+SHIFT, K, layoutmsg, swapprev #MASTER
+#bind = $mainMod+SHIFT, H, layoutmsg, addmaster #MASTER
+#bind = $mainMod+SHIFT, L, layoutmsg, removemaster #MASTER
+#binde = $mainMod, J, layoutmsg, cyclenext #MASTER
+#binde = $mainMod, K, layoutmsg, cycleprev #MASTER
+#binde = $mainMod, H, splitratio, -0.01 #MASTER
+#binde = $mainMod, L, splitratio, +0.01 #MASTER
+#bind = $mainMod+SHIFT, O, splitratio, exact 0.55 #MASTER
+#bind = $mainMod, O, splitratio, exact 0.69 #MASTER
+#}}}
+
+#{{{ 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, L, layoutmsg, movewindowto r #HYPRSCROLLING
+bind = $mainMod+SHIFT, J, layoutmsg, colresize -conf #HYPRSCROLLING
+bind = $mainMod+SHIFT, K, layoutmsg, colresize +conf #HYPRSCROLLING
+bind = $mainMod, H, movefocus, l #HYPRSCROLLING
+bind = $mainMod, J, movefocus, u #HYPRSCROLLING
+bind = $mainMod, K, movefocus, d #HYPRSCROLLING
+bind = $mainMod, L, movefocus, r #HYPRSCROLLING
+bind = $mainMod+SHIFT, Return, layoutmsg, promote #HYPRSCROLLING
 #}}}
 
 #{{{ Group binds