From 00cf7b80f5c95ccc1c7d640dee956ebe586a360f Mon Sep 17 00:00:00 2001 From: AramJonghu Date: Fri, 8 May 2026 00:15:55 +0200 Subject: [PATCH] minor adjustments for lua conversion --- hyprland.lua | 12 ++-- modules/binds.lua | 8 +-- modules/settings.lua | 133 ++++++++++++++++++++-------------------- modules/windowrules.lua | 10 +-- 4 files changed, 82 insertions(+), 81 deletions(-) diff --git a/hyprland.lua b/hyprland.lua index 7d64cc3..b9584ef 100644 --- a/hyprland.lua +++ b/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") diff --git a/modules/binds.lua b/modules/binds.lua index f6d79bf..8810c3f 100644 --- a/modules/binds.lua +++ b/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")) diff --git a/modules/settings.lua b/modules/settings.lua index 1b4b3b8..3421b7d 100644 --- a/modules/settings.lua +++ b/modules/settings.lua @@ -1,86 +1,87 @@ -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, + 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 ({ - kb_layout = "us", - kb_variant = "intl", - kb_options = "fkeys:basic_13-24", - sensitivity = 0, - accel_profile = "flat", - follow_mouse = 1, +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 = { mauveAlpha, greenAlpha, sapphireAlpha, lavenderAlpha }, angle? = 90 }, - inactive_border = { surface1Alpha, angle? = 90}, - }, +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 = baseAlpha, - color_inactive = 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.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.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({ - dwindle = { - pseudotile = true, - preserve_split = true, - }, + dwindle = { + pseudotile = true, + preserve_split = true, + }, }) -hl.ecosystem ({ - no_donation_nag = true, - no_update_news = true, +hl.ecosystem({ + no_donation_nag = true, + no_update_news = true, }) -hl.misc ({ - disable_hyprland_logo = true, +hl.misc({ + disable_hyprland_logo = true, }) -hl.debug ({ - full_cm_proto = true, +hl.debug({ + full_cm_proto = true, }) diff --git a/modules/windowrules.lua b/modules/windowrules.lua index 409a73d..e353559 100644 --- a/modules/windowrules.lua +++ b/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 },