Merge branch 'master' into cas

4 files changed, 23 insertions, 16 deletions

diff --git a/.gitignore b/.gitignore
index 0d0aa13..f36e92a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -87,7 +87,7 @@ gtk-4.0/
 guitarix/
 Hellbeast v2/
 Hellbeast v2.settings
-htop/htoprc
+htop/
 ibus/
 icedtea-web/
 inkscape/
@@ -142,6 +142,7 @@ mgba/
 micro/buffers/
 mimeapps.list
 minigalaxy/
+miopen/
 mixbus9/
 mksh/history
 modprobed.db
@@ -314,4 +315,5 @@ zsh/.zcompdump
 zsh/zcompdump
 zsh/zfunc
 zsh/.zkbd/
+zsh/.zsh_sessions
 zsh/.zsh_theme
diff --git a/hypr/hyprland.conf b/hypr/hyprland.conf
index 8efc2a1..47be77b 100644
--- a/hypr/hyprland.conf
+++ b/hypr/hyprland.conf
@@ -16,26 +16,26 @@ monitor = , highres highrr, auto, 1
 #{{{ Autostart
 # Execute your favorite apps at launch
 # exec-once = waybar & hyprpaper & firefox
+<<<<<<< HEAD
 exec-once = dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP
-exec-once = hyprpm reload -n
-#exec-once = dinit
-#exec-once = xdph
+# 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
@@ -107,6 +107,7 @@ general {
 #}}}
 
 #{{{ cursor
+cursor=BreezeX-Black 32
 cursor {
   no_warps = false
 }
@@ -266,6 +267,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
@@ -337,7 +339,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
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/sh/aliases b/sh/aliases
index 0abc42c..ac0d8f6 100644
--- a/sh/aliases
+++ b/sh/aliases
@@ -20,6 +20,7 @@ case `uname -s` in
   "Linux")
     #alias ls="ls -h $COLOR_FLAGS_GNU"
     type eza >/dev/null && alias ls="eza"
+    alias ls="ls --color"
     ;;
   "Darwin")
     type eza >/dev/null && alias ls="eza --color"