merge hyprpaper (made same change on two devices)

2 files changed, 35 insertions, 30 deletions

diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index d613c3a..d131fde 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -11,6 +11,7 @@ monitor = DP-1, 1920x1080@60, 1920x0, 1
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
 exec-once = ~/.config/autostart.sh
+exec-once = /usr/lib/polkit-kde-authentication-agent-1
 #}}}
 
 # Source a file (multi-file configs)
@@ -100,10 +101,11 @@ dwindle {
 #{{{ Master layout options
 master {
     special_scale_factor = 0.55
+    mfact = 0.69
     # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-    new_is_master = true
-    new_on_top = false
-    no_gaps_when_only = false
+    new_is_master = false
+    new_on_top = true
+    no_gaps_when_only = true
     orientation = left
     inherit_fullscreen = true
 }
@@ -147,39 +149,42 @@ $secdMod = SUPER
 
 #{{{ Layout toggle bind
 # Layout toggle
-bind = $mainMod $secdMod, A, exec, hypr-layout -t
+#bind = $mainMod $secdMod, A, exec, hypr-layout -t
 #}}}
 
 #{{{ Master layout binds
 # Master layout binds
-#bind = $mainMod+SHIFT, Return, layoutmsg, swapwithmaster auto #MASTER
-#bind = $mainMod+SHIFT, J, layoutmsg, swapnext #MASTER
-#bind = $mainMod+SHIFT, K, layoutmsg, swapprev #MASTER
-#bind = $mainMod, H, layoutmsg, addmaster #MASTER
-#bind = $mainMod, L, layoutmsg, removemaster #MASTER
-#bind = $mainMod, J, movefocus, d #MASTER
-#bind = $mainMod, K, movefocus, u #MASTER
+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
+bindr = $mainMod, H, splitratio, -0.01 #MASTER
+bindr = $mainMod, L, splitratio, +0.01 #MASTER
+bind = $mainMod, O, splitratio, exact 0.69 #MASTER
+bind = $mainMod, J, movefocus, d #MASTER
+bind = $mainMod, K, movefocus, u #MASTER
 #}}}
 
 #{{{ Dwindle layout binds
-# Dwindle layout binds
-bind = $mainMod, P, pseudo, #DWINDLE
-bind = $mainMod $secdMod, S, togglesplit, #DWINDLE
-# Move focus with mainMod + HJKL
-bind = $mainMod, H, movefocus, l #DWINDLE
-bind = $mainMod, L, movefocus, r #DWINDLE
-bind = $mainMod, K, movefocus, u #DWINDLE
-bind = $mainMod, J, movefocus, d #DWINDLE
-# Move window with mainMod + HJKL
-bind = $mainMod SHIFT, L, movewindow, r #DWINDLE
-bind = $mainMod SHIFT, H, movewindow, l #DWINDLE
-bind = $mainMod SHIFT, J, movewindow, d #DWINDLE
-bind = $mainMod SHIFT, K, movewindow, u #DWINDLE
-# Resize clients with mainMod + secdMod + HJKL
-binde = $mainMod $secdMod, L, resizeactive, 10 0 #DWINDLE
-binde = $mainMod $secdMod, H, resizeactive, -10 0 #DWINDLE
-binde = $mainMod $secdMod, K, resizeactive, 0 -10 #DWINDLE
-binde = $mainMod $secdMod, J, resizeactive, 0 10 #DWINDLE
+## Dwindle layout binds
+#bind = $mainMod, P, pseudo, #DWINDLE
+#bind = $mainMod $secdMod, S, togglesplit, #DWINDLE
+## Move focus with mainMod + HJKL
+#bind = $mainMod, H, movefocus, l #DWINDLE
+#bind = $mainMod, L, movefocus, r #DWINDLE
+#bind = $mainMod, K, movefocus, u #DWINDLE
+#bind = $mainMod, J, movefocus, d #DWINDLE
+## Move window with mainMod + HJKL
+#bind = $mainMod SHIFT, L, movewindow, r #DWINDLE
+#bind = $mainMod SHIFT, H, movewindow, l #DWINDLE
+#bind = $mainMod SHIFT, J, movewindow, d #DWINDLE
+#bind = $mainMod SHIFT, K, movewindow, u #DWINDLE
+## Resize clients with mainMod + secdMod + HJKL
+#binde = $mainMod $secdMod, L, resizeactive, 10 0 #DWINDLE
+#binde = $mainMod $secdMod, H, resizeactive, -10 0 #DWINDLE
+#binde = $mainMod $secdMod, K, resizeactive, 0 -10 #DWINDLE
+#binde = $mainMod $secdMod, J, resizeactive, 0 10 #DWINDLE
 #}}}
 
 #{{{ Group binds
diff --git a/hypr/hyprpaper.conf b/hypr/hyprpaper.conf
index a85a08a..1b8480c 100644
--- a/hypr/hyprpaper.conf
+++ b/hypr/hyprpaper.conf
@@ -5,8 +5,8 @@ preload = ~/background.jpg
 
 #set the default wallpaper(s) seen on inital workspace(s) --depending on the number of monitors used
 wallpaper = eDP-1,~/background.jpg
-wallpaper = DP-1,~/background.jpg
 wallpaper = HDMI-A-1,~/background.jpg
+wallpaper = DP-1,~/background.jpg
 #if more than one monitor in use, can load a 2nd image
 #wallpaper = monitor2,~/background.jpg
 # .. more monitors