test

homes/nathan/home-manager/dotfiles/hypr/main.conf

@@ -16,7 +16,7 @@ exec-once = onSystemStart
 env = XCURSOR_SIZE,16
 
 source = ~/.config/hypr/otf.conf
-source = ~/.cache/wal/colors-hypr.conf
+source = ~/.cache/wal/colors-hyprland.conf
 
 # For all categories, see https://wiki.hyprland.org/Configuring/Variables/
 input {
@@ -81,22 +81,12 @@ animations {
 }
 
 
+source = ~/.config/hypr/dwindle.conf
 
-dwindle {
-	# See https://wiki.hyprland.org/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
-}
+source = ~/.config/hypr/master.conf
 
-master {
-        # See https://wiki.hyprland.org/Configuring/Master-Layout/ for more
-        new_status = "master"
-}
+source = ~/.config/hypr/scroll.conf
 
-scrolling {
-    column_width = 0.7
-    direction = "right"
-}
 
 misc {
         disable_hyprland_logo = false
@@ -208,19 +198,24 @@ bind = $mainMod SHIFT, 0, movetoworkspace, 10
 bind = $mainMod SHIFT, Home, movetoworkspace, 11
 
 # Scroll through existing workspaces with mainMod + scroll
-bind = $mainMod, down, workspace, e+1
-bind = $mainMod, up, workspace, e-1
+bind = $mainMod, down, workspace, r+1
+bind = $mainMod, up, workspace, r-1
 bind = $mainMod, left, layoutmsg, move -col
 bind = $mainMod, right, layoutmsg, move +col
 
-bind = $mainMod, H, layoutmsg, move -col
-bind = $mainMod, J, workspace, r+1
-bind = $mainMod, K, workspace, r-1
-bind = $mainMod, L, layoutmsg, move +col
+bind = $mainMod SHIFT, down, movetoworkspace, r+1
+bind = $mainMod SHIFT, up, movetoworkspace, r-1
+bind = $mainMod SHIFT, left, layoutmsg, swapcol l
+bind = $mainMod SHIFT, right, layoutmsg, swapcol r
+
+bind = $mainMod, H, layoutmsg, focus l
+bind = $mainMod, J, workspace, e+1
+bind = $mainMod, K, workspace, e-1
+bind = $mainMod, L, layoutmsg, focus r
 
 bind = $mainMod SHIFT, H, layoutmsg, swapcol l
-bind = $mainMod SHIFT, J, movetoworkspace, r+1
-bind = $mainMod SHIFT, K, movetoworkspace, r-1
+bind = $mainMod SHIFT, J, movetoworkspace, e+1
+bind = $mainMod SHIFT, K, movetoworkspace, e-1
 bind = $mainMod SHIFT, L, layoutmsg, swapcol r
 
 #switch network connections
@@ -231,10 +226,14 @@ bind = CTRL SHIFT, 2, exec, nmcli connection up CXNK00813829
 bind = CTRL SHIFT, 3, exec, nmcli connection up ATT9MhT2ql
 
 #brightness keys
-bind = , XF86MonBrightnessUp, exec, brightnessctl set +10%
-bind = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
+binde = SHIFT, XF86MonBrightnessUp, exec, brightnessctl set +2%
+binde = SHIFT, XF86MonBrightnessDown, exec, brightnessctl set 2%-
+binde = , XF86MonBrightnessUp, exec, brightnessctl set +10%
+binde = , XF86MonBrightnessDown, exec, brightnessctl set 10%-
 
 #volume keys
+binde = SHIFT, XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%+
+binde = SHIFT, XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 2%-
 binde = , XF86AudioRaiseVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%+
 binde = , XF86AudioLowerVolume, exec, wpctl set-volume @DEFAULT_SINK@ 10%-
 bind = , XF86AudioMute, exec, wpctl set-mute @DEFAULT_SINK@ toggle
@@ -256,27 +255,7 @@ bind = $mainMod SHIFT, D, movewindow, r
 bindm = $mainMod, mouse:272, movewindow
 bindm = $mainMod SHIFT, mouse:272, resizewindow
 
-$scratchpadsize = size (monitor_w*0.6) (monitor_h*0.8)
-
-$kitty = ^(scratchpad-kitty)$
-windowrule = float on, match:class $kitty
-windowrule = $scratchpadsize, match:class $kitty
-windowrule = workspace special silent, match:class $kitty
-
-$files = ^(scratchpad-files)$
-windowrule = float on, match:class $files
-windowrule = $scratchpadsize, match:class $files
-windowrule = workspace special silent, match:class $files
-
-$cal = ^(scratchpad-cal)$
-windowrule = float on, match:class $cal
-windowrule = $scratchpadsize, match:class $cal
-windowrule = workspace special silent, match:class $cal
-
-bind = $mainMod, semicolon, exec, pypr toggle lf
-bind = $mainMod, E, exec, pypr toggle kitty
-bind = $mainMod, C, exec, pypr toggle calendar
-
+source = ~/.config/hypr/pypr.conf
 
 bind = CTRL SHIFT, Home, exec, ssh nathan@esotericbytes.com -fL 5900:localhost:5900 sleep 10; vncviewer localhost:5900 -fullscreen
 bind = CTRL SHIFT, Home, submap, clean