3 files changed, 127 insertions, 189 deletions
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 3da9c12..07423c3 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -1,9 +1,9 @@
 # See https://wiki.hypr.land/Configuring/Monitors/
 #{{{ Monitor config
-#monitor = DP-2, 1920x1080@75, 0x0, 1
-#monitor = HDMI-A-1, 1920x1080@75, 1920x0, 1
-monitor = eDP-1, 1920x1080@60, 0x0, 1
-monitor = , preferred, auto, 1
+#monitor = DP-2, highres highrr, 0x0, 1
+#monitor = HDMI-A-1, highres highrr, 1920x0, 1
+monitor = eDP-1, highres highrr, 0x0, 1
+monitor = , highres highrr, auto, 1
 #}}}
 
 # See https://wiki.hypr.land/Configuring/Keywords/ for more
@@ -16,25 +16,25 @@ monitor = , preferred, auto, 1
 #{{{ Autostart
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
-exec-once = hyprpm reload -n
-#exec-once = dinit
-#exec-once = xdph
+exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
+# These are for systems with no systemd
 exec-once = dinitctl start hyprpaper.user
-exec-once = waybar
+exec-once = hyprpm reload -n
 exec-once = pypr
-#exec-once = hyprscratch init
-exec-once = lxqt-policykit-agent
-exec-once = import-gsettings gtk-theme 'Flat-Remix-GTK-Green-Darkest'
-exec-once = import-gsettings icon-theme 'Papirus-Dark'
-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 = bl-save
+exec-once = hyprpaper
+exec-once = hypridle
+exec-once = waybar
+exec-once = /usr/lib/hyprpolkitagent/hyprpolkitagent
 exec-once = dunst
 exec-once = hypridle
 exec-once = xwayland-satellite :1
-exec-once = bl-save
-#exec-once = mpd
+exec-once = mpd
+# These are for systems with uwsm/systemd
+#exec-once = uwsm app -- hyprpm reload -n
+#exec-once = uwsm app -- xdph
+#exec-once = uwsm app -- pypr
+#exec-once = uwsm app -- bl-save
 #}}}
 
 #{{{ env
@@ -106,6 +106,7 @@ general {
 #}}}
 
 #{{{ cursor
+cursor=BreezeX-Black 32
 cursor {
   no_warps = false
 }
@@ -186,6 +187,18 @@ master {
 }
 #}}}
 
+#{{{ Scrolling layout options
+scrolling {
+    fullscreen_on_one_column = false
+    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
@@ -195,18 +208,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
+  #}
 }
 #}}}
 
@@ -253,6 +266,7 @@ windowrule = workspace +0, match:workspace name:spvimw, match:title negative:spv
 windowrule = workspace +0, match:workspace name:sptrmc, match:title negative:sptrmc
 windowrule = workspace +0, match:workspace name:helvum, match:title negative:helvum
 windowrule = workspace +0, match:workspace name:easyfx, match:title negative:easyfx
+windowrule = fullscreen on, match:class ^(steam_app_.*)$
 #}}}
 
 #{{{ Layerrules
@@ -285,20 +299,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
@@ -324,7 +338,7 @@ bind = $mainMod, Backspace, exec, touchpad.sh
 
 #{{{ WC binds
 bind = $mainMod SHIFT, Q, killactive, 
-bind = $mainMod SHIFT, E, exit, 
+bind = $mainMod SHIFT, E, exec, uwsm stop
 bind = $mainMod SHIFT, SPACE, togglefloating, 
 bind = $mainMod $secdMod, F2, exec, ~/.config/hypr/gamemode.sh
 bind = $mainMod, F, fullscreen, 0
@@ -334,80 +348,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/hypr/plugins.txt b/hypr/plugins.txt
new file mode 100644
index 0000000..21cb4cd
--- /dev/null
+++ b/hypr/plugins.txt
@@ -0,0 +1,2 @@
+- [hyprsplit](https://github.com/shezdy/hyprsplit)
+- [hyprland-plugins](https://github.com/hyprwm/hyprland-plugins)
diff --git a/hypr/pyprland.toml b/hypr/pyprland.toml
deleted file mode 100644
index 3110ba5..0000000
--- a/hypr/pyprland.toml
+++ /dev/null
@@ -1,78 +0,0 @@
-[pyprland]
-plugins = [
-  "toggle_special",
-  "scratchpads",
-  "expose"
-]
-
-[scratchpads.sphtop]
-animation = "fromBottom"
-command = "kitty --class sphtop -e htop"
-class = "sphtop"
-size = "50% 50%"
-
-[scratchpads.spterm]
-animation = "fromBottom"
-command = "kitty --class spterm"
-class = "spterm"
-size = "50% 50%"
-
-[scratchpads.sppmxr]
-animation = "fromBottom"
-command = "kitty --class sppmxr -e pulsemixer"
-class = "sppmxr"
-size = "50% 50%"
-
-[scratchpads.spblue]
-animation = "fromBottom"
-command = "kitty --class spblue -e bluetoothctl"
-class = "spblue"
-size = "50% 50%"
-
-[scratchpads.spncmp]
-animation = "fromBottom"
-command = "kitty --class spncmp -e ncmpcpp"
-class = "spncmp"
-size = "50% 50%"
-
-[scratchpads.spmutt]
-animation = "fromBottom"
-command = "kitty --class spmutt -e neomutt"
-class = "spmutt"
-size = "50% 50%"
-
-[scratchpads.spprof]
-animation = "fromBottom"
-command = "kitty --class spprof -e profanity"
-class = "spprof"
-size = "50% 50%"
-
-[scratchpads.spirss]
-animation = "fromBottom"
-command = "kitty --class spirss -e irssi"
-class = "spirss"
-size = "50% 50%"
-
-[scratchpads.spvimw]
-animation = "fromBottom"
-command = "kitty --class spvimw -e vw"
-class = "spvimw"
-size = "50% 50%"
-
-[scratchpads.trmc]
-animation = "fromBottom"
-command = "kitty --class trmc -e tremc"
-class = "trmc"
-size = "50% 50%"
-
-[scratchpads.helvum]
-animation = "fromBottom"
-command = "helvum"
-class = "org.pipewire.Helvum"
-size = "50% 50%"
-
-[scratchpads.easyfx]
-animation = "fromBottom"
-command = "easyeffects"
-class = "com.github.wwmm.easyeffects"
-size = "50% 50%"