RaveosHyperland update

4 files changed, 11 insertions, 23 deletions

diff --git a/raveos-hyprland-theme/PKGBUILD b/raveos-hyprland-theme/PKGBUILD
index 8f67750..cfe03f4 100644
--- a/raveos-hyprland-theme/PKGBUILD
+++ b/raveos-hyprland-theme/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=raveos-hyprland-theme
 pkgver=0.0.0
-pkgrel=31
+pkgrel=32
 pkgdesc="RaveOS Hyprland theme payload and installer (includes DankMaterialShell)"
 arch=('any')
 url="https://raveos.local"
diff --git a/raveos-hyprland-theme/theme-data/hypr/config/keybinds.lua b/raveos-hyprland-theme/theme-data/hypr/config/keybinds.lua
index 1999d6f..ddb61d2 100644
--- a/raveos-hyprland-theme/theme-data/hypr/config/keybinds.lua
+++ b/raveos-hyprland-theme/theme-data/hypr/config/keybinds.lua
@@ -34,8 +34,8 @@ hl.bind("CTRL + SUPER + Home", hl.dsp.exec_cmd("reboot"))
 hl.bind("CTRL + SUPER + End",  hl.dsp.exec_cmd("poweroff"))
 
 -- Window management
-hl.bind(mainMod .. " + Q", hl.dsp.killactive())
-hl.bind(mainMod .. " + V", hl.dsp.togglefloating())
+hl.bind(mainMod .. " + Q", hl.dsp.window.kill())
+hl.bind(mainMod .. " + V", hl.dsp.window.float())
 
 -- Move focus with mainMod + arrow keys
 hl.bind(mainMod .. " + left",  hl.dsp.focus({ direction = "left" }))
@@ -44,8 +44,8 @@ hl.bind(mainMod .. " + up",    hl.dsp.focus({ direction = "up" }))
 hl.bind(mainMod .. " + down",  hl.dsp.focus({ direction = "down" }))
 
 -- Move/resize windows with mainMod + mouse
-hl.bind(mainMod .. " + mouse:272", hl.dsp.exec_cmd("movewindow"))
-hl.bind(mainMod .. " + mouse:273", hl.dsp.exec_cmd("resizewindow"))
+hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag())
+hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize())
 
 -- Laptop multimedia keys
 hl.bind("XF86AudioRaiseVolume",  hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"),  { locked = true, repeating = true })
diff --git a/raveos-hyprland-theme/theme-data/hypr/hyprland.lua b/raveos-hyprland-theme/theme-data/hypr/hyprland.lua
index de39343..ae265a9 100644
--- a/raveos-hyprland-theme/theme-data/hypr/hyprland.lua
+++ b/raveos-hyprland-theme/theme-data/hypr/hyprland.lua
@@ -186,9 +186,9 @@ hl.gesture({
 --## HYPRSHELL LAYERS ###
 --#######################
 
-hl.layerrule("blur",       "hyprshell_overview")
-hl.layerrule("ignorezero", "hyprshell_overview")
-hl.layerrule("blur",       "hyprshell_switch")
-hl.layerrule("ignorezero", "hyprshell_switch")
-hl.layerrule("blur",       "hyprshell_launcher")
-hl.layerrule("ignorezero", "hyprshell_launcher")
+hl.layer_rule({ match = { namespace = "hyprshell_overview" }, blur = true })
+hl.layer_rule({ match = { namespace = "hyprshell_overview" }, ignore_alpha = true })
+hl.layer_rule({ match = { namespace = "hyprshell_switch" },   blur = true })
+hl.layer_rule({ match = { namespace = "hyprshell_switch" },   ignore_alpha = true })
+hl.layer_rule({ match = { namespace = "hyprshell_launcher" }, blur = true })
+hl.layer_rule({ match = { namespace = "hyprshell_launcher" }, ignore_alpha = true })
diff --git a/raveos-hyprland-theme/theme-data/sddm/sddm.conf b/raveos-hyprland-theme/theme-data/sddm/sddm.conf
index 1fa25d1..56b50a7 100644
--- a/raveos-hyprland-theme/theme-data/sddm/sddm.conf
+++ b/raveos-hyprland-theme/theme-data/sddm/sddm.conf
@@ -1,6 +1,3 @@
-# Run SDDM Wayland over Hyprland compositor
-# Credits to the HyDE project
-
 [Theme]
 Current=sddm-astronaut-theme
 CursorTheme=BreezeDark
@@ -10,8 +7,6 @@ CursorSize=24
 Numlock=on
 HaltCommand=/usr/bin/systemctl poweroff
 RebootCommand=/usr/bin/systemctl reboot
-DisplayServer=wayland
-GreeterEnvironment=QT_WAYLAND_SHELL_INTEGRATION=layer-shell
 
 [Users]
 DefaultPath=/usr/local/bin:/usr/bin:/bin
@@ -22,10 +17,3 @@ MinimumUid=1000
 RememberLastUser=true
 RememberLastSession=true
 ReuseSession=true
-
-[Wayland]
-CompositorCommand=start-hyprland -- -c /usr/share/hypr/sddm/hyprland.lua
-EnableHiDPI=true
-
-[X11]
-Enable=false