Conversion complete!

modules/settings.lua

@@ -1,87 +1,116 @@
-local color = require("macchiato")
+local C = require("modules.macchiato")
 
 hl.layer_rule({
 	name = "blur_popups_bar",
 	blur = true,
 	match = { namespace = "ZShell-Bar" },
 	ignore_alpha = 0.5,
-}, {
+})
+
+hl.layer_rule({
 	name = "blur_popups_auth",
 	blur = true,
 	match = { namespace = "ZShell-Auth" },
 	ignore_alpha = 0.5,
 })
 
-hl.input({
-	kb_layout = "us",
-	kb_variant = "intl",
-	kb_options = "fkeys:basic_13-24",
-	sensitivity = 0,
-	accel_profile = "flat",
-	follow_mouse = 1,
-})
-
-hl.general({
-	gaps_in = 2,
-	gaps_out = 2,
-	border_size = 1,
-	col = {
-		active_border = {
-			colors = { color.mauveAlpha, color.greenAlpha, color.sapphireAlpha, color.lavenderAlpha },
-			angle = 90,
-		},
-		inactive_border = { color.surface1Alpha, angle = 90 },
-	},
-})
-
-hl.decoration({
-	rounding = 1,
-	hl.shadow({
-		enabled = false,
-		range = 6,
-		render_power = 6,
-		color = color.baseAlpha,
-		color_inactive = color.mantleAlpha,
-	}),
-	hl.blur({
-		enabled = false,
-		size = 2,
-		passes = 2,
-		new_optimizations = true,
-		ignore_opacity = true,
-		contrast = 1.0,
-		brightness = 1.0,
-		vibrancy = 0,
-		vibrancy_darkness = 0,
-		xray = false,
-		noise = 0.05,
-		popups = true,
-		input_methods = true,
-	}),
-})
-
-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({
+	input = {
+		kb_layout = "us",
+		kb_variant = "intl",
+		kb_options = "fkeys:basic_13-24",
+		sensitivity = 0,
+		accel_profile = "flat",
+		follow_mouse = 1,
+	},
+	general = {
+		gaps_in = 2,
+		gaps_out = 2,
+		border_size = 2,
+		col = {
+			active_border = {
+				colors = { C.colors.mauveAlpha, C.colors.greenAlpha, C.colors.sapphireAlpha, C.colors.lavenderAlpha },
+				angle = 90,
+			},
+			inactive_border = {
+				colors = { C.colors.surface1Alpha },
+				angle = 90,
+			},
+		},
+	},
+	decoration = {
+		rounding = 1,
+		shadow = {
+			enabled = false,
+			range = 6,
+			render_power = 6,
+			color = C.colors.baseAlpha,
+			color_inactive = C.colors.mantleAlpha,
+		},
+		blur = {
+			enabled = false,
+			size = 2,
+			passes = 2,
+			new_optimizations = true,
+			ignore_opacity = true,
+			contrast = 1.0,
+			brightness = 1.0,
+			vibrancy = 0,
+			vibrancy_darkness = 0,
+			xray = false,
+			noise = 0.05,
+			popups = true,
+			input_methods = true,
+		},
+	},
+	ecosystem = {
+		no_donation_nag = true,
+		no_update_news = true,
+	},
+	misc = {
+		disable_hyprland_logo = true,
+	},
+	debug = {
+		full_cm_proto = true,
+	},
 	dwindle = {
-		pseudotile = true,
 		preserve_split = true,
 	},
 })
 
-hl.ecosystem({
-	no_donation_nag = true,
-	no_update_news = true,
-})
+local animations = {
+	{ leaf = "border", enabled = true, speed = 4, bezier = "linear" },
+	{ leaf = "borderangle", enabled = true, speed = 3, bezier = "linear", style = "loop" },
+	{ leaf = "fadeOut", enabled = true, speed = 3, bezier = "default" },
+	{ leaf = "fadeIn", enabled = true, speed = 4, bezier = "default" },
+	{ leaf = "fadeLayers", enabled = true, speed = 1, bezier = "default" },
+	{ leaf = "fadePopups", enabled = true, speed = 1, bezier = "default" },
+	{ leaf = "global", enabled = true, speed = 6, bezier = "default" },
+	{ leaf = "layers", enabled = true, speed = 5, bezier = "cubic-bezier", style = "fade" },
+	{ leaf = "windows", enabled = true, speed = 3, bezier = "wind", style = "popin" },
+	{ leaf = "windowsIn", enabled = true, speed = 3, bezier = "winIn", style = "popin 90%" },
+	{ leaf = "windowsOut", enabled = true, speed = 3, bezier = "winOut", style = "popin 90%" },
+	{ leaf = "windowsMove", enabled = true, speed = 1, bezier = "wind", style = "slide" },
+	{ leaf = "workspaces", enabled = true, speed = 4, bezier = "default" },
+}
 
-hl.misc({
-	disable_hyprland_logo = true,
-})
+local curves = {
+	{ name = "wind", config = { type = "bezier", points = { { 0.05, 0.9 }, { 0.1, 1 } } } },
+	{ name = "winIn", config = { type = "bezier", points = { { 0.1, 1.0 }, { 0.1, 1 } } } },
+	{ name = "winOut", config = { type = "bezier", points = { { 1, 0.35 }, { 1, 1 } } } },
+	{ name = "linear", config = { type = "bezier", points = { { 1, 1 }, { 1, 1 } } } },
+	{ name = "cubic-bezier", config = { type = "bezier", points = { { 0.215, 0.61 }, { 0.355, 1 } } } },
+	{ name = "easeOutQuint", config = { type = "bezier", points = { { 0.23, 1 }, { 0.32, 1 } } } },
+	{ name = "easeInOutCubic", config = { type = "bezier", points = { { 0.65, 0.05 }, { 0.36, 1 } } } },
+	{ name = "almostLinear", config = { type = "bezier", points = { { 0.5, 0.5 }, { 0.75, 1 } } } },
+	{ name = "quick", config = { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } } },
+	{ name = "easy", config = { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 } },
+}
 
-hl.debug({
-	full_cm_proto = true,
-})
+for _, curve in ipairs(curves) do
+	hl.curve(curve.name, curve.config)
+end
+
+for _, animation in ipairs(animations) do
+	hl.animation(animation)
+end