float on super + s again

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

modules/binds.lua

@@ -41,19 +41,18 @@ hl.bind(
 	hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
 	{ repeating = true, locked = true }
 )
-
 hl.bind(
-	"XF86AudioMicMute",
+	"code:192",
 	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", "28")
+hl.env("HYPRCURSOR_SIZE", "24")
 
 hl.env("ELECTRON_OZONE_PLATFORM_HINT", "auto")
 hl.env("QT_AUTO_SCREEN_SCALE_FACTOR", "1")
@@ -19,8 +19,14 @@ hl.env("CLUTTER_BACKEND", "wayland")
 hl.env("GDK_BACKEND", "wayland")
 hl.env("SDL_VIDEODRIVER", "wayland")
 
-hl.env("XDG_CONFIG_HOME", "/home/aram/.config")
+hl.env("XDG_CONFIG_HOME", "/home/koyomi/.config")
-hl.env("XDG_CACHE_HOME", "/home/aram/.cache")
+hl.env("XDG_CACHE_HOME", "/home/koyomi/.cache")
-hl.env("XDG_DATA_HOME", "/home/aram/.local/share")
+hl.env("XDG_DATA_HOME", "/home/koyomi/.local/share")
-hl.env("XDG_PICTRES_HOME", "/home/aram/Pictures")
+hl.env("XDG_PICTRES_HOME", "/home/koyomi/Pictures")
-hl.env("HYPRSHOT_DIR", "/home/aram/Pictures/Screenshots")
+hl.env("HYPRSHOT_DIR", "/home/koyomi/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,5 +6,4 @@ 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 = "eDP-1",
+	output = "DP-2",
-    mode = "2880x1800@120",
+	mode = "2560x1440@240",
-    position = "0x0",
+	position = "1728x0",
-    scale = 1.25,
+	scale = 1,
 	bitdepth = 10,
-    cm = "hdr"
+	cm = "srgb",
 })
 
 hl.monitor({
-    output = "",
+	output = "DP-3",
-    mode = "preferred",
+	mode = "3840x2160@60",
-    position = "auto",
+	position = "0x0",
-    scale = 1,
+	scale = 1.25,
 	bitdepth = 10,
-    cm = "srgb"
+	cm = "srgb",
-    -- mirror = "eDP-1"
+	transform = 1,
 })

modules/settings.lua

@@ -3,24 +3,17 @@ local C = require("modules.macchiato")
 hl.layer_rule({
 	name = "blur_popups_bar",
 	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",
 	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 = {
 		kb_layout = "us",
@@ -29,27 +22,21 @@ hl.config({
 		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 = {
+				colors = { C.colors.mauveAlpha, C.colors.greenAlpha, C.colors.sapphireAlpha, C.colors.lavenderAlpha },
-                    C.colors.mauveAlpha, C.colors.greenAlpha,
+				angle = 90,
-                    C.colors.sapphireAlpha, C.colors.lavenderAlpha
+			},
+			inactive_border = {
+				colors = { C.colors.surface1Alpha },
+				angle = 90,
 			},
-                angle = 90
 		},
-            inactive_border = {colors = {C.colors.surface1Alpha}, angle = 90}
-        }
 	},
 	decoration = {
 		rounding = 1,
@@ -58,7 +45,7 @@ hl.config({
 			range = 6,
 			render_power = 6,
 			color = C.colors.baseAlpha,
-            color_inactive = C.colors.mantleAlpha
+			color_inactive = C.colors.mantleAlpha,
 		},
 		blur = {
 			enabled = true,
@@ -73,95 +60,57 @@ hl.config({
 			xray = false,
 			noise = 0.05,
 			popups = true,
-            input_methods = 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,
 	},
-    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 = "border", enabled = true, speed = 4, bezier = "linear" },
-        leaf = "borderangle",
+	{ leaf = "borderangle", enabled = false, speed = 3, bezier = "linear", style = "loop" },
-        enabled = false,
+	{ leaf = "fadeOut", enabled = true, speed = 3, bezier = "default" },
-        speed = 3,
+	{ leaf = "fadeIn", enabled = true, speed = 4, bezier = "default" },
-        bezier = "linear",
+	{ leaf = "fadeLayers", enabled = true, speed = 1, bezier = "default" },
-        style = "loop"
+	{ leaf = "fadePopups", enabled = true, speed = 1, bezier = "default" },
-    }, {leaf = "fadeOut", enabled = true, speed = 3, bezier = "default"},
+	{ leaf = "global", enabled = true, speed = 6, bezier = "default" },
-    {leaf = "fadeIn", enabled = true, speed = 4, bezier = "default"},
+	{ leaf = "layers", enabled = true, speed = 5, bezier = "cubic-bezier", style = "fade" },
-    {leaf = "fadeLayers", enabled = true, speed = 1, bezier = "default"},
+	{ leaf = "windows", enabled = true, speed = 3, bezier = "wind", style = "popin" },
-    {leaf = "fadePopups", enabled = true, speed = 1, bezier = "default"},
+	{ leaf = "windowsIn", enabled = true, speed = 3, bezier = "winIn", style = "popin 90%" },
-    {leaf = "global", enabled = true, speed = 6, bezier = "default"}, {
+	{ leaf = "windowsOut", enabled = true, speed = 3, bezier = "winOut", style = "popin 90%" },
-        leaf = "layers",
+	{ leaf = "windowsMove", enabled = true, speed = 1, bezier = "wind", style = "slide" },
-        enabled = true,
+	{ leaf = "workspaces", enabled = true, speed = 4, bezier = "default" },
-        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 = "wind",
+	{ name = "winIn", config = { type = "bezier", points = { { 0.1, 1.0 }, { 0.1, 1 } } } },
-        config = {type = "bezier", points = {{0.05, 0.9}, {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 = "winIn",
+	{ name = "easeOutQuint", config = { type = "bezier", points = { { 0.23, 1 }, { 0.32, 1 } } } },
-        config = {type = "bezier", points = {{0.1, 1.0}, {0.1, 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 = "winOut", config = {type = "bezier", points = {{1, 0.35}, {1, 1}}}},
+	{ name = "quick", config = { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } } },
-    {name = "linear", config = {type = "bezier", points = {{1, 1}, {1, 1}}}}, {
+	{ name = "easy", config = { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 } },
-        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