diff --git a/modules/executes.lua b/modules/executes.lua index f625b33..feb1030 100644 --- a/modules/executes.lua +++ b/modules/executes.lua @@ -6,5 +6,5 @@ hl.on("hyprland.start", function() hl.exec_cmd("wl-paste --type image --watch cliphist store") hl.exec_cmd("hyprsunset -i") hl.exec_cmd("nextcloud --background") - hl.exec_cmd("brightnessctl set 100%") + hl.exec_cmd("brightnessctl set 100%") end) diff --git a/modules/monitors.lua b/modules/monitors.lua index 15d305e..106e00f 100644 --- a/modules/monitors.lua +++ b/modules/monitors.lua @@ -1,18 +1,18 @@ hl.monitor({ - output = "eDP-1", - mode = "2880x1800@120", - position = "0x0", - scale = 1.25, - bitdepth = 10, - cm = "hdr" + output = "eDP-1", + mode = "2880x1800@120", + position = "0x0", + scale = 1, + bitdepth = 10, + cm = "hdr", }) hl.monitor({ - output = "", - mode = "preferred", - position = "auto", - scale = 1, - bitdepth = 10, - cm = "srgb" - -- mirror = "eDP-1" + output = "", + mode = "3840x2160@30", + position = "auto", + scale = 1.5, + bitdepth = 10, + cm = "srgb", + -- mirror = "eDP-1" }) diff --git a/modules/settings.lua b/modules/settings.lua index 8db388f..27cb7c7 100644 --- a/modules/settings.lua +++ b/modules/settings.lua @@ -1,167 +1,184 @@ local C = require("modules.macchiato") hl.layer_rule({ - name = "blur_popups_bar", - blur = true, - match = {namespace = "ZShell-Bar"}, - ignore_alpha = 0.5 + 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 + name = "blur_popups_auth", + blur = true, + match = { namespace = "ZShell-Auth" }, + ignore_alpha = 0.5, }) hl.gesture = { - fingers = 3, - direction = "horizontal", - action = "workspace", - workspace_swipe_touch = true + fingers = 3, + direction = "horizontal", + action = "workspace", + workspace_swipe_touch = true, } hl.config({ - input = { - kb_layout = "us", - kb_variant = "intl", - kb_options = "fkeys:basic_13-24", - sensitivity = 0, - accel_profile = "flat", - follow_mouse = 1, - touchpad = { - natural_scroll = true, - scroll_factor = 0.4, - middle_button_emulation = true - } - }, - gestures = {workspace_swipe_touch = true}, - 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 = true, - 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 = {preserve_split = true} + input = { + kb_layout = "us", + kb_variant = "intl", + kb_options = "fkeys:basic_13-24", + sensitivity = 0, + accel_profile = "flat", + follow_mouse = 1, + touchpad = { + natural_scroll = true, + scroll_factor = 0.4, + middle_button_emulation = true, + }, + }, + gestures = { workspace_swipe_touch = true }, + 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 = true, + 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 = { preserve_split = true }, }) local animations = { - {leaf = "border", enabled = true, speed = 4, bezier = "linear"}, { - leaf = "borderangle", - enabled = false, - 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"} + { leaf = "border", enabled = true, speed = 4, bezier = "linear" }, + { + leaf = "borderangle", + enabled = false, + 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" }, } 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 - } - } + { + 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, + }, + }, } -for _, curve in ipairs(curves) do hl.curve(curve.name, curve.config) end +for _, curve in ipairs(curves) do + hl.curve(curve.name, curve.config) +end -for _, animation in ipairs(animations) do hl.animation(animation) end +for _, animation in ipairs(animations) do + hl.animation(animation) +end