minor adjustments for lua conversion

hyprland.lua

@@ -1,6 +1,6 @@
-require("binds")
-require("env")
-require("executes")
-require("monitors")
-require("settings")
-require("windowrules")
+require("modules.binds")
+require("modules.env")
+require("modules.executes")
+require("modules.monitors")
+require("modules.settings")
+require("modules.windowrules")

modules/binds.lua

@@ -13,10 +13,10 @@ hl.bind("SUPER + H", hl.dsp.movefocus("l"))
 hl.bind("SUPER + L", hl.dsp.movefocus("r"))
 hl.bind("SUPER + K", hl.dsp.movefocus("u"))
 hl.bind("SUPER + J", hl.dsp.movefocus("d"))
-hl.bind("SUPER + SHIFT + L", hl.dsp.resizeactive("50 0"), { repeating = true })
-hl.bind("SUPER + SHIFT + H", hl.dsp.resizeactive("-50 0"), { repeating = true })
-hl.bind("SUPER + SHIFT + K", hl.dsp.resizeactive("0 -50"), { repeating = true })
-hl.bind("SUPER + SHIFT + J", hl.dsp.resizeactive("0 50"), { repeating = true })
+hl.bind("SUPER + SHIFT + L", hl.dsp.window.resize({ x = 50, y = 0, relative = true }), { repeating = true })
+hl.bind("SUPER + SHIFT + H", hl.dsp.window.resize({ x = -50, y = 0, relative = true }), { repeating = true })
+hl.bind("SUPER + SHIFT + K", hl.dsp.window.resize({ x = 0, y = -50, relative = true }), { repeating = true })
+hl.bind("SUPER + SHIFT + J", hl.dsp.window.resize({ x = 0, y = 50, relative = true }), { repeating = true })
 
 hl.bind("SUPER + 1", hl.dsp.workspace("1"))
 hl.bind("SUPER + 2", hl.dsp.workspace("2"))

modules/settings.lua

@@ -1,20 +1,18 @@
-require "macchiato"
+local color = require("macchiato")
 
 hl.layer_rule({
 	name = "blur_popups_bar",
 	blur = true,
 	match = { namespace = "ZShell-Bar" },
 	ignore_alpha = 0.5,
-},
-    {
+}, {
 	name = "blur_popups_auth",
 	blur = true,
 	match = { namespace = "ZShell-Auth" },
 	ignore_alpha = 0.5,
 })
 
-
-hl.input ({
+hl.input({
 	kb_layout = "us",
 	kb_variant = "intl",
 	kb_options = "fkeys:basic_13-24",
@@ -23,26 +21,29 @@ hl.input ({
 	follow_mouse = 1,
 })
 
-hl.general ({
+hl.general({
 	gaps_in = 2,
 	gaps_out = 2,
 	border_size = 1,
 	col = {
-        active_border = { colors = { mauveAlpha, greenAlpha, sapphireAlpha, lavenderAlpha }, angle? = 90 },
-        inactive_border = { surface1Alpha, angle? = 90},
+		active_border = {
+			colors = { color.mauveAlpha, color.greenAlpha, color.sapphireAlpha, color.lavenderAlpha },
+			angle = 90,
+		},
+		inactive_border = { color.surface1Alpha, angle = 90 },
 	},
 })
 
-hl.decoration ({
+hl.decoration({
 	rounding = 1,
-        hl.shadow ({
+	hl.shadow({
 		enabled = false,
 		range = 6,
 		render_power = 6,
-            color = baseAlpha,
-            color_inactive = mantleAlpha,
+		color = color.baseAlpha,
+		color_inactive = color.mantleAlpha,
 	}),
-        hl.blur ({
+	hl.blur({
 		enabled = false,
 		size = 2,
 		passes = 2,
@@ -59,10 +60,10 @@ hl.decoration ({
 	}),
 })
 
-hl.curve({ type = "brezier", points = { {0, 13}, {0, 99}, {0, 29}, {1, 1}}})
-hl.animation({ leaf = "windows", enabled = true, speed = 4, spring= "overshot", style = "slide" })
-hl.animation({ leaf = "fade", enabled = true, speed = 4, })
-hl.animation({ leaf = "border", enabled = true, speed = 4, })
+hl.curve({ type = "brezier", points = { { 0, 13 }, { 0, 99 }, { 0, 29 }, { 1, 1 } } })
+hl.animation({ leaf = "windows", enabled = true, speed = 4, spring = "overshot", style = "slide" })
+hl.animation({ leaf = "fade", enabled = true, speed = 4 })
+hl.animation({ leaf = "border", enabled = true, speed = 4 })
 hl.animation({ leaf = "workspaces", enabled = true, speed = 4, spring = "overshot", style = "slide" })
 
 hl.config({
@@ -72,15 +73,15 @@ hl.config({
 	},
 })
 
-hl.ecosystem ({
+hl.ecosystem({
 	no_donation_nag = true,
 	no_update_news = true,
 })
 
-hl.misc ({
+hl.misc({
 	disable_hyprland_logo = true,
 })
 
-hl.debug ({
+hl.debug({
 	full_cm_proto = true,
 })

modules/windowrules.lua

@@ -1,4 +1,4 @@
-hl.windowrule({
+hl.window_rule({
 	name = "xwayland",
 	opacity = "0.0 override",
 	no_anim = true,
@@ -9,25 +9,25 @@ hl.windowrule({
 	match = { class = "^(xwaylandvideobridge)$" },
 })
 
-hl.windowrule({
+hl.window_rule({
 	name = "fullscreen_idling",
 	idle_inhibit = "fullscreen",
 	match = { class = ".*" },
 })
 
-hl.windowrule({
+hl.window_rule({
 	name = "video_idling",
 	idle_inhibit = "always",
 	match = { content = "video" },
 })
 
-hl.windowrule({
+hl.window_rule({
 	name = "game_idling",
 	idle_inhibit = "always",
 	match = { content = "game" },
 })
 
-hl.windowrule({
+hl.window_rule({
 	name = "match_fullscreen",
 	idle_inhibit = "always",
 	match = { fullscreen_state_internal = 2, fullscreen_state_client = 2 },