touchscreen workspace support, hdr testing

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

modules/binds.lua

@@ -41,18 +41,19 @@ hl.bind(
 	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
 	{ repeating = true, locked = true }
 )
+
 hl.bind(
-	"code:192",
+	"XF86AudioMicMute",
 	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),
 	{ repeating = true, locked = true }
 )
-hl.bind("code:193", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), { repeating = true, locked = true })
-hl.bind("code:194", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%-"), { repeating = true, locked = true })
-hl.bind("code:195", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SOURCE@ 5%+"), { 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("XF86MonBrightnessUp", hl.dsp.exec_cmd("brighnessctl set +5%"), { locked = true, repeating = true })
+hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brighnessctl set -5%"), { locked = true, repeating = true })
+hl.bind("XF86WebCam", hl.dsp.exec_cmd(""), { locked = true, repeating = true })
 
 hl.bind("PRINT", hl.dsp.global("zshell:screenshotFreeze"))
 hl.bind("SUPER + R", hl.dsp.global("zshell:toggle-launcher"))

modules/env.lua

@@ -5,7 +5,7 @@ hl.env("VISUAL", "nvim")
 hl.env("EDITOR", "nvim")
 
 hl.env("HYPRCURSOR_THEME", "catppuccin-macchiato-light-cursors")
-hl.env("HYPRCURSOR_SIZE", "24")
+hl.env("HYPRCURSOR_SIZE", "28")
 
 hl.env("ELECTRON_OZONE_PLATFORM_HINT", "auto")
 hl.env("QT_AUTO_SCREEN_SCALE_FACTOR", "1")
@@ -19,14 +19,8 @@ hl.env("CLUTTER_BACKEND", "wayland")
 hl.env("GDK_BACKEND", "wayland")
 hl.env("SDL_VIDEODRIVER", "wayland")
 
-hl.env("XDG_CONFIG_HOME", "/home/koyomi/.config")
+hl.env("XDG_CONFIG_HOME", "/home/aram/.config")
-hl.env("XDG_CACHE_HOME", "/home/koyomi/.cache")
+hl.env("XDG_CACHE_HOME", "/home/aram/.cache")
-hl.env("XDG_DATA_HOME", "/home/koyomi/.local/share")
+hl.env("XDG_DATA_HOME", "/home/aram/.local/share")
-hl.env("XDG_PICTRES_HOME", "/home/koyomi/Pictures")
+hl.env("XDG_PICTRES_HOME", "/home/aram/Pictures")
-hl.env("HYPRSHOT_DIR", "/home/koyomi/Pictures/Screenshots")
+hl.env("HYPRSHOT_DIR", "/home/aram/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.lua

@@ -6,4 +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%")
 end)

modules/monitors.lua

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

modules/settings.lua

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