minor adjustments for lua conversion

Reviewed-on: https://git.aramjonghu.nl/AramJonghu/hypr/pulls/1

hyprland.conf

@@ -0,0 +1,7 @@
+source = ./modules/env.conf
+source = ./modules/macchiato.conf
+source = ./modules/settings.conf
+source = ./modules/binds.conf
+source = ./modules/executes.conf
+source = ./modules/windowrules.conf
+source = ./modules/monitors.conf

modules/binds.conf

@@ -0,0 +1,68 @@
+bindm = SUPER,mouse:272,movewindow
+bindm = SUPER,mouse:273,resizewindow
+
+bind = SUPER,RETURN,exec, ghostty
+bind = SUPER,Q,killactive
+bind = SUPER,M,exit
+bind = SUPER,E,exec, dolphin
+bind = SUPER,S,togglefloating
+bind = SUPER,P,pseudo
+bind = SUPER,B,exec, firefox
+
+bind = SUPER,H,movefocus,l
+bind = SUPER,L,movefocus,r
+bind = SUPER,K,movefocus,u
+bind = SUPER,J,movefocus,d
+binde = SUPER SHIFT,L,resizeactive, 50 0
+binde = SUPER SHIFT,H,resizeactive, -50 0
+binde = SUPER SHIFT,K,resizeactive, 0 -50
+binde = SUPER SHIFT,J,resizeactive, 0 50
+
+bind = SUPER,1,workspace,1
+bind = SUPER,2,workspace,2
+bind = SUPER,3,workspace,3
+bind = SUPER,4,workspace,4
+bind = SUPER,5,workspace,5
+bind = SUPER,6,workspace,6
+bind = SUPER,7,workspace,7
+bind = SUPER,8,workspace,8
+bind = SUPER,9,workspace,9
+bind = SUPER,0,workspace,10
+bind = ALT,1,movetoworkspace,1
+bind = ALT,2,movetoworkspace,2
+bind = ALT,3,movetoworkspace,3
+bind = ALT,4,movetoworkspace,4
+bind = ALT,5,movetoworkspace,5
+bind = ALT,6,movetoworkspace,6
+bind = ALT,7,movetoworkspace,7
+bind = ALT,8,movetoworkspace,8
+bind = ALT,9,movetoworkspace,9
+bind = ALT,0,movetoworkspace,10
+bind = SUPER,mouse_down,workspace,e+1
+bind = SUPER,mouse_up,workspace,e-1
+bind = SUPER,g,togglegroup
+bind = SUPER,tab,changegroupactive
+
+bind = SUPER, F,fullscreen
+bind = SUPER, D, exec, fuzzel
+bindel = , XF86AudioRaiseVolume, exec,  wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%+
+bindel = , XF86AudioLowerVolume, exec,  wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-
+bindel = , XF86AudioMute, exec,  wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = , F14, exec,  wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle
+bindel = , F15, exec,  wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle
+bindel = , F17, exec,  wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+
+bindel = , F16, exec,  wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-
+
+bindl = , XF86AudioPlay, exec,  playerctl play-pause
+bindl = , XF86AudioPrev, exec,  playerctl previous
+bindl = , XF86AudioNext, exec,  playerctl next
+
+# bind = , PRINT, exec,  hyprshot -m region -z
+
+# zshell
+bind = , PRINT, global, zshell:screenshotFreeze
+bind = SUPER, R, global, zshell:toggle-launcher
+bind = SUPER, A, global, zshell:toggle-nc
+bind = SUPER, V, global, zshell:toggle-drawing
+bind = SUPER, F1, global, zshell:lock
+bind = SUPER, F2, global, zshell:toggle-settings

modules/binds.lua

@@ -1,30 +1,49 @@
 hl.bind("SUPER + mouse:272", hl.dsp.window.drag(), { mouse = true })
 hl.bind("SUPER + mouse:273", hl.dsp.window.resize(), { mouse = true })
 
-hl.bind("SUPER + S", hl.dsp.window.float())
-hl.bind("SUPER + Q", hl.dsp.window.close())
-hl.bind("SUPER + M", hl.dsp.exit())
 hl.bind("SUPER + RETURN", hl.dsp.exec_cmd("ghostty"))
+hl.bind("SUPER + Q", hl.dsp.killactive())
+hl.bind("SUPER + M", hl.dsp.exit())
 hl.bind("SUPER + E", hl.dsp.exec_cmd("dolphin"))
+hl.bind("SUPER + S", hl.dsp.togglefloating())
+hl.bind("SUPER + P", hl.dsp.pseudo())
 hl.bind("SUPER + B", hl.dsp.exec_cmd("firefox"))
 
-hl.bind("SUPER + H", hl.dsp.focus({ direction = "l" }))
+hl.bind("SUPER + H", hl.dsp.movefocus("l"))
-hl.bind("SUPER + L", hl.dsp.focus({ direction = "r" }))
+hl.bind("SUPER + L", hl.dsp.movefocus("r"))
-hl.bind("SUPER + K", hl.dsp.focus({ direction = "u" }))
+hl.bind("SUPER + K", hl.dsp.movefocus("u"))
-hl.bind("SUPER + J", hl.dsp.focus({ direction = "d" }))
+hl.bind("SUPER + J", hl.dsp.movefocus("d"))
 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 })
 
-for i = 1, 10 do
+hl.bind("SUPER + 1", hl.dsp.workspace("1"))
-	local key = i % 10 -- 10 maps to key 0
+hl.bind("SUPER + 2", hl.dsp.workspace("2"))
-	hl.bind("SUPER" .. " + " .. key, hl.dsp.focus({ workspace = i }))
+hl.bind("SUPER + 3", hl.dsp.workspace("3"))
-	hl.bind("ALT" .. " + " .. key, hl.dsp.window.move({ workspace = i, follow = true }))
+hl.bind("SUPER + 4", hl.dsp.workspace("4"))
-	-- hl.bind("SUPER" .. " + " .. key, hl.dsp.window.move({ workspace = i, follow = false }))
+hl.bind("SUPER + 5", hl.dsp.workspace("5"))
-end
+hl.bind("SUPER + 6", hl.dsp.workspace("6"))
+hl.bind("SUPER + 7", hl.dsp.workspace("7"))
+hl.bind("SUPER + 8", hl.dsp.workspace("8"))
+hl.bind("SUPER + 9", hl.dsp.workspace("9"))
+hl.bind("SUPER + 0", hl.dsp.workspace("10"))
+hl.bind("ALT + 1", hl.dsp.movetoworkspace("1"))
+hl.bind("ALT + 2", hl.dsp.movetoworkspace("2"))
+hl.bind("ALT + 3", hl.dsp.movetoworkspace("3"))
+hl.bind("ALT + 4", hl.dsp.movetoworkspace("4"))
+hl.bind("ALT + 5", hl.dsp.movetoworkspace("5"))
+hl.bind("ALT + 6", hl.dsp.movetoworkspace("6"))
+hl.bind("ALT + 7", hl.dsp.movetoworkspace("7"))
+hl.bind("ALT + 8", hl.dsp.movetoworkspace("8"))
+hl.bind("ALT + 9", hl.dsp.movetoworkspace("9"))
+hl.bind("ALT + 0", hl.dsp.movetoworkspace("10"))
+hl.bind("SUPER + mouse_down", hl.dsp.workspace("e+1"))
+hl.bind("SUPER + mouse_up", hl.dsp.workspace("e-1"))
+hl.bind("SUPER + G", hl.dsp.togglegroup())
+hl.bind("SUPER + TAB", hl.dsp.changegroupactive())
 
-hl.bind("SUPER + F", hl.dsp.window.fullscreen())
+hl.bind("SUPER + F", hl.dsp.fullscreen())
 hl.bind("SUPER + D", hl.dsp.exec_cmd("fuzzel"))
 hl.bind(
 	"XF86AudioRaiseVolume",
@@ -41,24 +60,18 @@ hl.bind(
 	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
 	{ repeating = true, locked = true }
 )
-
+hl.bind("F14", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), { repeating = true, locked = true })
-hl.bind(
+hl.bind("F15", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), { repeating = true, locked = true })
-	"XF86AudioMicMute",
+hl.bind("F17", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+"), { repeating = true, locked = true })
-	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),
+hl.bind("F16", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-"), { repeating = true, locked = true })
-	{ repeating = true, locked = true }
-)
 
 hl.bind("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
 hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true })
 hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true })
-hl.bind("XF86WebCam", hl.dsp.exec_cmd(""), { locked = true, repeating = true })
--- Broken on Artix -> Seems to not expose XF86 keys when not on DE (KDE Plasma worked)
--- hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl set +5%"), { locked = true, repeating = true })
--- hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl set -5%"), { locked = true, repeating = true })
 
-hl.bind("PRINT", hl.dsp.global("zshell:screenshotFreeze"))
+hl.bind("PRINT", hl.dsp.exec_cmd("zshell:screenshotFreeze"))
-hl.bind("SUPER + R", hl.dsp.global("zshell:toggle-launcher"))
+hl.bind("SUPER + R", hl.dsp.exec_cmd("zshell:toggle-launcher"))
-hl.bind("SUPER + A", hl.dsp.global("zshell:toggle-nc"))
+hl.bind("SUPER + A", hl.dsp.exec_cmd("zshell:toggle-nc"))
-hl.bind("SUPER + V", hl.dsp.global("zshell:toggle-drawing"))
+hl.bind("SUPER + V", hl.dsp.exec_cmd("zshell:toggle-drawing"))
-hl.bind("SUPER + F1", hl.dsp.global("zshell:lock"))
+hl.bind("SUPER + F1", hl.dsp.exec_cmd("zshell:lock"))
-hl.bind("SUPER + F2", hl.dsp.global("zshell:toggle-settings"))
+hl.bind("SUPER + F2", hl.dsp.exec_cmd("zshell:toggle-settings"))

modules/env.conf

@@ -0,0 +1,32 @@
+env = ZSH,/usr/share/oh-my-zsh/
+env = BROWSER,firefox
+env = TERM,tmux-256color
+env = VISUAL,nvim
+env = EDITOR,nvim
+
+env = HYPRCURSOR_THEME,catppuccin-macchiato-light-cursors
+env = HYPRCURSOR_SIZE,24
+
+env = ELECTRON_OZONE_PLATFORM_HINT,auto
+env = QT_AUTO_SCREEN_SCALE_FACTOR,1
+env = QT_QPA_PLATFORM,wayland
+env = QT_QPA_PLATFORMTHEME,qt6ct
+env = QT_WAYLAND_DISABLE_WINDOWDECORATION,1
+
+env = XDG_SESSION_DESKTOP,Hyprland
+env = XDG_SESSION_TYPE,wayland
+env = CLUTTER_BACKEND,wayland
+env = GDK_BACKEND,wayland
+env = SDL_VIDEODRIVER,wayland
+
+env = XDG_CONFIG_HOME,$HOME/.config
+env = XDG_CACHE_HOME,$HOME/.cache
+env = XDG_DATA_HOME,$HOME/.local/share
+env = XDG_PICTRES_HOME,$HOME/Pictures
+env = HYPRSHOT_DIR,$HOME/Pictures/Screenshots
+
+env = RUSTICL_ENABLE,radeonsi
+env = AMD_VULKAN_ICD,RADV
+
+env = HSA_OVERRIDE_GFX_VERSION,12.0.1
+env = HCC_AMDGPU_TARGET,gfx1201

modules/env.lua

@@ -1,26 +1,32 @@
-hl.env("ZSH", "/usr/share/oh-my-zsh/")
+hl.env("ZSH,/usr/share/oh-my-zsh/")
-hl.env("BROWSER", "firefox")
+hl.env("BROWSER,firefox")
-hl.env("TERM", "tmux-256color")
+hl.env("TERM,tmux-256color")
-hl.env("VISUAL", "nvim")
+hl.env("VISUAL,nvim")
-hl.env("EDITOR", "nvim")
+hl.env("EDITOR,nvim")
 
-hl.env("HYPRCURSOR_THEME", "catppuccin-macchiato-light-cursors")
+hl.env("HYPRCURSOR_THEME,catppuccin-macchiato-light-cursors")
-hl.env("HYPRCURSOR_SIZE", "28")
+hl.env("HYPRCURSOR_SIZE,24")
 
-hl.env("ELECTRON_OZONE_PLATFORM_HINT", "auto")
+hl.env("ELECTRON_OZONE_PLATFORM_HINT,auto")
-hl.env("QT_AUTO_SCREEN_SCALE_FACTOR", "1")
+hl.env("QT_AUTO_SCREEN_SCALE_FACTOR,1")
-hl.env("QT_QPA_PLATFORM", "wayland")
+hl.env("QT_QPA_PLATFORM,wayland")
-hl.env("QT_QPA_PLATFORMTHEME", "qt6ct")
+hl.env("QT_QPA_PLATFORMTHEME,qt6ct")
-hl.env("QT_WAYLAND_DISABLE_WINDOWDECORATION", "1")
+hl.env("QT_WAYLAND_DISABLE_WINDOWDECORATION,1")
 
-hl.env("XDG_SESSION_DESKTOP", "Hyprland")
+hl.env("XDG_SESSION_DESKTOP,Hyprland")
-hl.env("XDG_SESSION_TYPE", "wayland")
+hl.env("XDG_SESSION_TYPE,wayland")
-hl.env("CLUTTER_BACKEND", "wayland")
+hl.env("CLUTTER_BACKEND,wayland")
-hl.env("GDK_BACKEND", "wayland")
+hl.env("GDK_BACKEND,wayland")
-hl.env("SDL_VIDEODRIVER", "wayland")
+hl.env("SDL_VIDEODRIVER,wayland")
 
-hl.env("XDG_CONFIG_HOME", "/home/aram/.config")
+hl.env("XDG_CONFIG_HOME,$HOME/.config")
-hl.env("XDG_CACHE_HOME", "/home/aram/.cache")
+hl.env("XDG_CACHE_HOME,$HOME/.cache")
-hl.env("XDG_DATA_HOME", "/home/aram/.local/share")
+hl.env("XDG_DATA_HOME,$HOME/.local/share")
-hl.env("XDG_PICTRES_HOME", "/home/aram/Pictures")
+hl.env("XDG_PICTRES_HOME,$HOME/Pictures")
-hl.env("HYPRSHOT_DIR", "/home/aram/Pictures/Screenshots")
+hl.env("HYPRSHOT_DIR,$HOME/Pictures/Screenshots")
+
+hl.env("RUSTICL_ENABLE,radeonsi")
+hl.env("AMD_VULKAN_ICD,RADV")
+
+hl.env("HSA_OVERRIDE_GFX_VERSION,12.0.1")
+hl.env("HCC_AMDGPU_TARGET,gfx1201")

modules/executes.conf

@@ -0,0 +1,7 @@
+exec-once = zshell-cli shell start
+exec-once = fcitx5
+exec-once = wl-paste --type text --watch cliphist store
+exec-once = wl-paste --type image --watch cliphist store
+exec-once = nextcloud --background
+exec-once = hyprsunset -i
+exec-once = nm-applet

modules/executes.lua

@@ -1,10 +1,8 @@
 hl.on("hyprland.start", function()
-	hl.exec_cmd("zshell-cli shell start")
+	hl.exec.cmd("zshell-cli shell start")
-	hl.exec_cmd("nm-applet")
+	hl.exec.cmd("nm-applet")
-	hl.exec_cmd("fcitx5")
+	hl.exec.cmd("fcitx5")
-	hl.exec_cmd("wl-paste --type text --watch cliphist store")
+	hl.exec.cmd("wl-paste --type text --watch cliphist store")
-	hl.exec_cmd("wl-paste --type image --watch cliphist store")
+	hl.exec.cmd("wl-paste --type image --watch cliphist store")
-	hl.exec_cmd("hyprsunset -i")
+	hl.exec.cmd("hyprsunset -i")
-	hl.exec_cmd("nextcloud --background")
-	hl.exec_cmd("zigbright listen")
 end)

modules/macchiato.conf

@@ -0,0 +1,77 @@
+$rosewater = rgb(f4dbd6)
+$rosewaterAlpha = f4dbd6
+
+$flamingo = rgb(f0c6c6)
+$flamingoAlpha = f0c6c6
+
+$pink = rgb(f5bde6)
+$pinkAlpha = f5bde6
+
+$mauve = rgb(c6a0f6)
+$mauveAlpha = c6a0f6
+
+$red = rgb(ed8796)
+$redAlpha = ed8796
+
+$maroon = rgb(ee99a0)
+$maroonAlpha = ee99a0
+
+$peach = rgb(f5a97f)
+$peachAlpha = f5a97f
+
+$yellow = rgb(eed49f)
+$yellowAlpha = eed49f
+
+$green = rgb(a6da95)
+$greenAlpha = a6da95
+
+$teal = rgb(8bd5ca)
+$tealAlpha = 8bd5ca
+
+$sky = rgb(91d7e3)
+$skyAlpha = 91d7e3
+
+$sapphire = rgb(7dc4e4)
+$sapphireAlpha = 7dc4e4
+
+$blue = rgb(8aadf4)
+$blueAlpha = 8aadf4
+
+$lavender = rgb(b7bdf8)
+$lavenderAlpha = b7bdf8
+
+$text = rgb(cad3f5)
+$textAlpha = cad3f5
+
+$subtext1 = rgb(b8c0e0)
+$subtext1Alpha = b8c0e0
+
+$subtext0 = rgb(a5adcb)
+$subtext0Alpha = a5adcb
+
+$overlay2 = rgb(939ab7)
+$overlay2Alpha = 939ab7
+
+$overlay1 = rgb(8087a2)
+$overlay1Alpha = 8087a2
+
+$overlay0 = rgb(6e738d)
+$overlay0Alpha = 6e738d
+
+$surface2 = rgb(5b6078)
+$surface2Alpha = 5b6078
+
+$surface1 = rgb(494d64)
+$surface1Alpha = 494d64
+
+$surface0 = rgb(363a4f)
+$surface0Alpha = 363a4f
+
+$base = rgb(24273a)
+$baseAlpha = 24273a
+
+$mantle = rgb(1e2030)
+$mantleAlpha = 1e2030
+
+$crust = rgb(181926)
+$crustAlpha = 181926

modules/macchiato.lua

@@ -1,58 +1,51 @@
-local M = {}
+local rosewaterAlpha = rgb(f4dbd6)
 
-M.colors = {
+local flamingoAlpha = rgb(f0c6c6)
 
-	rosewaterAlpha = "rgb(f4dbd6)",
+local pinkAlpha = rgb(f5bde6)
 
-	flamingoAlpha = "rgb(f0c6c6)",
+local mauveAlpha = rgb(c6a0f6)
 
-	pinkAlpha = "rgb(f5bde6)",
+local redAlpha = rgb(ed8796)
 
-	mauveAlpha = "rgb(c6a0f6)",
+local maroonAlpha = rgb(ee99a0)
 
-	redAlpha = "rgb(ed8796)",
+local peachAlpha = rgb(f5a97f)
 
-	maroonAlpha = "rgb(ee99a0)",
+local yellowAlpha = rgb(eed49f)
 
-	peachAlpha = "rgb(f5a97f)",
+local greenAlpha = rgb(a6da95)
 
-	yellowAlpha = "rgb(eed49f)",
+local tealAlpha = rgb(8bd5ca)
 
-	greenAlpha = "rgb(a6da95)",
+local skyAlpha = rgb(91d7e3)
 
-	tealAlpha = "rgb(8bd5ca)",
+local sapphireAlpha = rgb(7dc4e4)
 
-	skyAlpha = "rgb(91d7e3)",
+local blueAlpha = rgb(8aadf4)
 
-	sapphireAlpha = "rgb(7dc4e4)",
+local lavenderAlpha = rgb(b7bdf8)
 
-	blueAlpha = "rgb(8aadf4)",
+local textAlpha = rgb(cad3f5)
 
-	lavenderAlpha = "rgb(b7bdf8)",
+local subtext1Alpha = rgb(b8c0e0)
 
-	textAlpha = "rgb(cad3f5)",
+local subtext0Alpha = rgb(a5adcb)
 
-	subtext1Alpha = "rgb(b8c0e0)",
+local overlay2Alpha = rgb(939ab7)
 
-	subtext0Alpha = "rgb(a5adcb)",
+local overlay1Alpha = rgb(8087a2)
 
-	overlay2Alpha = "rgb(939ab7)",
+local overlay0Alpha = rgb(6e738d)
 
-	overlay1Alpha = "rgb(8087a2)",
+local surface2Alpha = rgb(5b6078)
 
-	overlay0Alpha = "rgb(6e738d)",
+local surface1Alpha = rgb(494d64)
 
-	surface2Alpha = "rgb(5b6078)",
+local surface0Alpha = rgb(363a4f)
 
-	surface1Alpha = "rgb(494d64)",
+local baseAlpha = rgb(24273a)
 
-	surface0Alpha = "rgb(363a4f)",
+local mantleAlpha = rgb(1e2030)
 
-	baseAlpha = "rgb(24273a)",
+local crustAlpha = rgb(181926)
-
-	mantleAlpha = "rgb(1e2030)",
-
-	crustAlpha = "rgb(181926)",
-}
-
-return M

modules/monitors.conf

@@ -0,0 +1,9 @@
+monitor= DP-2, 2560x1440@240, 1728x0, 1, bitdepth, 10, cm, srgb
+monitor = DP-3, 3840x2160@60, 0x0, 1.25, bitdepth, 10, transform, 1
+
+#monitor = DP-3, 3840x2160@60, 0x0, 1.25, bitdepth, 10, transform, 1, icc, /home/koyomi/.config/colorprofiles/lg4k.icm
+
+render { 
+    cm_auto_hdr = 0
+    cm_fs_passthrough = 1
+}

modules/monitors.lua

@@ -1,18 +1,18 @@
 hl.monitor({
-	output = "eDP-1",
+	output = "DP-2",
-	mode = "2880x1800@120",
+	mode = "2560x1440@240",
-	position = "0x0",
+	position = "1728x0",
 	scale = 1,
 	bitdepth = 10,
-	cm = "hdr",
+	cm = "srgb",
 })
 
 hl.monitor({
-	output = "",
+	output = "DP-3",
-	mode = "3840x2160@30",
+	mode = "3840x2160@60",
-	position = "auto",
+	position = "0x0",
-	scale = 1.5,
+	scale = 1.25,
 	bitdepth = 10,
 	cm = "srgb",
-	mirror = "eDP-1"
+	transform = 1,
 })

modules/settings.conf

@@ -0,0 +1,80 @@
+input {
+    kb_layout = us
+    kb_variant = intl
+    kb_model =
+    kb_options = fkeys:basic_13-24
+    kb_rules =
+    sensitivity = 0
+    accel_profile = flat
+    follow_mouse = 1
+}
+
+general {
+    gaps_in = 2
+    gaps_out = 2
+    border_size = 1
+    col.active_border = $mauve $teal $green $sapphire $lavender 90deg
+    col.inactive_border = $surface1 90deg
+}
+
+decoration {
+    rounding = 1
+        shadow {
+            enabled = false
+            range = 6
+            render_power = 6
+            color = $base
+            color_inactive = $mantle
+        }
+        blur {
+            enabled = false
+            size = 2
+            passes = 2
+            new_optimizations = on
+            ignore_opacity = true
+            contrast = 1.0
+            brightness = 1.0
+            vibrancy = 0
+            vibrancy_darkness = 0
+            xray = false
+            noise = 0.05
+            popups = true
+            input_methods = true
+    }
+
+}
+
+layerrule = blur_popups on, match:namespace ZShell-Bar
+layerrule = ignore_alpha 0.5, match:namespace ZShell-Bar
+layerrule = blur on, match:namespace ZShell-Bar
+
+layerrule = blur_popups on, match:namespace ZShell-Auth
+layerrule = ignore_alpha 0.5, match:namespace ZShell-Auth
+layerrule = blur on, match:namespace ZShell-Auth
+
+animations {
+    enabled = 1
+    bezier = overshot,0.13,0.99,0.29,1.1
+    animation = windows,1,4,overshot,slide
+    animation = border,1,4,default
+    animation = fade,1,4,default
+    animation = workspaces,1,4,overshot,slidevert
+}
+
+dwindle {
+    pseudotile = true
+    preserve_split = true
+}
+
+ecosystem {
+    no_donation_nag = true
+    no_update_news = true
+}
+
+misc {
+    disable_hyprland_logo = true
+}
+
+debug {
+    full_cm_proto = true
+}

modules/settings.lua

@@ -1,69 +1,50 @@
-local C = require("modules.macchiato")
+local color = require("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.gesture = {
+hl.input({
-	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,
+hl.general({
-			middle_button_emulation = true,
-		},
-	},
-	gestures = { workspace_swipe_touch = true },
-	general = {
 	gaps_in = 2,
 	gaps_out = 2,
-		border_size = 2,
+	border_size = 1,
 	col = {
 		active_border = {
-				colors = {
+			colors = { color.mauveAlpha, color.greenAlpha, color.sapphireAlpha, color.lavenderAlpha },
-					C.colors.mauveAlpha,
-					C.colors.greenAlpha,
-					C.colors.sapphireAlpha,
-					C.colors.lavenderAlpha,
-				},
 			angle = 90,
 		},
-			inactive_border = { colors = { C.colors.surface1Alpha }, angle = 90 },
+		inactive_border = { color.surface1Alpha, angle = 90 },
 	},
-	},
+})
-	decoration = {
+
+hl.decoration({
 	rounding = 1,
-		shadow = {
+	hl.shadow({
 		enabled = false,
 		range = 6,
 		render_power = 6,
-			color = C.colors.baseAlpha,
+		color = color.baseAlpha,
-			color_inactive = C.colors.mantleAlpha,
+		color_inactive = color.mantleAlpha,
-		},
+	}),
-		blur = {
+	hl.blur({
-			enabled = true,
+		enabled = false,
 		size = 2,
 		passes = 2,
 		new_optimizations = true,
@@ -76,109 +57,31 @@ hl.config({
 		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 = {
+hl.curve({ type = "brezier", points = { { 0, 13 }, { 0, 99 }, { 0, 29 }, { 1, 1 } } })
-	{ leaf = "border", enabled = true, speed = 4, bezier = "linear" },
+hl.animation({ leaf = "windows", enabled = true, speed = 4, spring = "overshot", style = "slide" })
-	{
+hl.animation({ leaf = "fade", enabled = true, speed = 4 })
-		leaf = "borderangle",
+hl.animation({ leaf = "border", enabled = true, speed = 4 })
-		enabled = false,
+hl.animation({ leaf = "workspaces", enabled = true, speed = 4, spring = "overshot", style = "slide" })
-		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 = {
+hl.config({
-	{
+	dwindle = {
-		name = "wind",
+		pseudotile = true,
-		config = { type = "bezier", points = { { 0.05, 0.9 }, { 0.1, 1 } } },
+		preserve_split = true,
 	},
-	{
+})
-		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.ecosystem({
-	hl.curve(curve.name, curve.config)
+	no_donation_nag = true,
-end
+	no_update_news = true,
+})
 
-for _, animation in ipairs(animations) do
+hl.misc({
-	hl.animation(animation)
+	disable_hyprland_logo = true,
-end
+})
+
+hl.debug({
+	full_cm_proto = true,
+})

modules/windowrules.conf

@@ -0,0 +1,44 @@
+windowrule {
+  name = windowrule-1
+  opacity = 0.0 override
+  no_anim = on
+  no_initial_focus = on
+  max_size = 1 1
+  no_blur = on
+  no_focus = on
+  match:class = ^(xwaylandvideobridge)$
+}
+
+
+windowrule {
+  name = windowrule-2
+  idle_inhibit = fullscreen
+  match:class = .*
+}
+
+windowrule {
+  name = windowrule-3
+  idle_inhibit = always
+  match:content = video
+}
+
+windowrule {
+  name = windowrule-4
+  idle_inhibit = always
+  match:content = game
+}
+
+windowrule {
+  name = windowrule-5
+  idle_inhibit = always
+  match:fullscreen_state_internal = client
+  match:fullscreen_state_client = 2
+}
+
+windowrule {
+  name = windowrule-6
+  idle_inhibit = always
+  match:fullscreen_state_internal = internal
+  match:fullscreen_state_client = 2
+}
+