bump: hypr

9 files changed, 73 insertions, 31 deletions

diff --git a/dot-config/hypr/.luarc.json b/dot-config/hypr/.luarc.json
index ac416b5f..e6a4933b 100644
--- a/dot-config/hypr/.luarc.json
+++ b/dot-config/hypr/.luarc.json
@@ -1,15 +1,8 @@
 {
 	"workspace": {
-		"library": [
-			"/usr/share/hypr/stubs"
-		]
+		"library": ["/usr/share/hypr/stubs"]
 	},
 	"diagnostics": {
-		"globals": [
-			"hl",
-            "vars",
-            "color",
-            "colors"
-		]
+		"globals": ["vars", "colors"]
 	}
-}
\ No newline at end of file
+}
diff --git a/dot-config/hypr/bg.conf b/dot-config/hypr/bg.conf
deleted file mode 100644
index a0d24de3..00000000
--- a/dot-config/hypr/bg.conf
+++ /dev/null
@@ -1 +0,0 @@
-$bg = /home/system/Pictures/wallpapers/geowaves.png
diff --git a/dot-config/hypr/binds.lua b/dot-config/hypr/binds.lua
index 2a11eed4..0e9bc0ea 100644
--- a/dot-config/hypr/binds.lua
+++ b/dot-config/hypr/binds.lua
@@ -201,7 +201,8 @@ hl.bind("CTRL + " .. mod .. " + J", hl.dsp.focus({ window = "tiled" }))
 -- Move focus with mainMod + arrow keys / vim binds
 local focus_dirs = { h = "l", l = "r", k = "u", j = "d" }
 for k, v in pairs(focus_dirs) do
-	hl.bind(mod .. " + " .. string.upper(k), hl.dsp.focus({ direction = v }), { repeating = true })
+	-- hl.bind(mod .. " + " .. string.upper(k), hl.dsp.focus({ direction = v }), { repeating = true })
+	hl.bind(mod .. " + " .. string.upper(k), hl.dsp.layout("focus " .. v), { repeating = true })
 end
 
 hl.bind("CTRL + " .. mod .. " + K", hl.dsp.focus({ window = "floating" }))
diff --git a/dot-config/hypr/decor.lua b/dot-config/hypr/decor.lua
index b771e3a5..7c0cfde4 100644
--- a/dot-config/hypr/decor.lua
+++ b/dot-config/hypr/decor.lua
@@ -70,10 +70,9 @@ hl.config({
 -- -- hl.curve("outsideIn", { type = "bezier", points = { {0.5, 1.1}, {0, 0.9} } })
 -- hl.curve("slow-fast", { type = "bezier", points = { {1, 0.33}, {0.3, 1} } })
 hl.curve("fast-slow", { type = "bezier", points = { { 0.33, 0.8 }, { 0, 1 } } })
--- hl.curve("linear", { type = "bezier", points = { {0, 0}, {1, 1} } })
--- -- hl.curve("linear", { type = "bezier", points = { {0, 0}, {1, 1} } })
+hl.curve("linear", { type = "bezier", points = { { 0, 0 }, { 1, 1 } } })
 -- -- hl.curve("md3_standard", { type = "bezier", points = { {0.2, 0}, {0, 1} } })
-hl.curve("md3_decel", { type = "bezier", points = { { 0.05, 0.7 }, { 0.1, 1 } } })
+-- hl.curve("md3_decel", { type = "bezier", points = { { 0.05, 0.7 }, { 0.1, 1 } } })
 -- -- hl.curve("md3_accel", { type = "bezier", points = { {0.3, 0}, {0.8, 0.15} } })
 -- -- hl.curve("overshot", { type = "bezier", points = { {0.05, 0.9}, {0.1, 1.1} } })
 -- -- hl.curve("crazyshot", { type = "bezier", points = { {0.1, 1.5}, {0.76, 0.92} } })
@@ -94,7 +93,7 @@ hl.animation({ leaf = "fade", enabled = true, speed = 4, bezier = "md3_decel" })
 -- -- hl.animation({ leaf = "windowsMove", enabled = true, speed = 2, bezier = "md3_accel" }) -- when new window appears, it will block it for a while since its slower then windowIn animation
 -- hl.animation({ leaf = "workspaces", enabled = true, speed = 5, bezier = "fast-slow", style = "slide" })
 -- hl.animation({ leaf = "workspacesIn", enabled = true, speed = 5, bezier = "fast-slow", style = "slidefade" })
--- hl.animation({ leaf = "borderangle", enabled = true, speed = 100, bezier = "linear", style = "loop" })
+hl.animation({ leaf = "borderangle", enabled = true, speed = 100, bezier = "linear", style = "loop" })
 
 -- hl.animation({ leaf = "layers", enabled = true, speed = 3, bezier = "sovershot", style = "popin 15%" })
 
@@ -102,7 +101,9 @@ hl.animation({ leaf = "zoomFactor", enabled = true, speed = 3, bezier = "fast-sl
 
 hl.curve("spring", { type = "spring", mass = 3, stiffness = 200, dampening = 35 })
 
-hl.curve("open", { type = "spring", mass = 4, stiffness = 325, dampening = 46 })
+hl.curve("layer", { type = "spring", mass = 4, stiffness = 450, dampening = 50 })
+
+hl.curve("open", { type = "spring", mass = 4, stiffness = 300, dampening = 46 })
 hl.curve("move", { type = "spring", mass = 4, stiffness = 375, dampening = 48 })
 
 hl.curve("workspace", { type = "spring", mass = 4, stiffness = 325, dampening = 50 })
@@ -112,6 +113,8 @@ hl.curve("workspaceIn", { type = "spring", mass = 4, stiffness = 375, dampening
 
 hl.animation({ leaf = "global", enabled = true, speed = 3, spring = "spring" })
 
+hl.animation({ leaf = "layers", enabled = true, speed = 3, spring = "layer" })
+
 hl.animation({ leaf = "windowsIn", enabled = true, speed = 3, spring = "open" })
 hl.animation({ leaf = "windowsMove", enabled = true, speed = 3, spring = "move" })
 
diff --git a/dot-config/hypr/hyprland.lua b/dot-config/hypr/hyprland.lua
index 2fe1d687..f0444b8f 100644
--- a/dot-config/hypr/hyprland.lua
+++ b/dot-config/hypr/hyprland.lua
@@ -89,6 +89,13 @@ require("binds")
 
 require("rules")
 
+---------------
+--- PLUGINS ---
+---------------
+
+require("plugins")
+
+
 
 -- hl.config({
 -- 	debug = {
diff --git a/dot-config/hypr/hyprtoolkit.conf b/dot-config/hypr/hyprtoolkit.conf
index 57deedd1..ada7cfe2 100644
--- a/dot-config/hypr/hyprtoolkit.conf
+++ b/dot-config/hypr/hyprtoolkit.conf
@@ -1,7 +1,7 @@
-background = FF151218
-base = FF413C44
-text = FFEEF9FF
-alternate_base = FF9CA7AD
-bright_text = FFDFEEF7
-accent = FF618A85
-accent_secondary = FFAEDAFC
+background = FF140D0D
+base = FF403737
+text = FFEEE7D4
+alternate_base = FF9C9482
+bright_text = FFDED4B9
+accent = FF687A74
+accent_secondary = FF968F73
diff --git a/dot-config/hypr/layout.lua b/dot-config/hypr/layout.lua
index 57cb6872..2dbcfaa4 100644
--- a/dot-config/hypr/layout.lua
+++ b/dot-config/hypr/layout.lua
@@ -1,7 +1,7 @@
 hl.config({
 	general = {
-				layout           = "scrolling",
-			},
+		layout = "scrolling",
+	},
 
 	dwindle = {
 		preserve_split = true, -- You probably want this
diff --git a/dot-config/hypr/plugins.lua b/dot-config/hypr/plugins.lua
new file mode 100644
index 00000000..6f446303
--- /dev/null
+++ b/dot-config/hypr/plugins.lua
@@ -0,0 +1,3 @@
+hl.config({
+	plugin = {}
+})
diff --git a/dot-config/hypr/rules.lua b/dot-config/hypr/rules.lua
index f69d2c80..8a543fef 100644
--- a/dot-config/hypr/rules.lua
+++ b/dot-config/hypr/rules.lua
@@ -19,6 +19,42 @@
 --     rounding    = 0,
 -- })
 
+-- Dynamically fetch exact gaps and monitor reserved space (Waybar)
+local function get_env_offsets()
+	-- 1. Rip gaps directly from the active config
+	local gaps_cfg = hl.get_config("general.gaps_out")
+	local gt, gb, gl, gr = 0, 0, 0, 0
+	if type(gaps_cfg) == "table" then
+		gt = gaps_cfg.top or gaps_cfg[1] or 0
+		gb = gaps_cfg.bottom or gaps_cfg[3] or 0
+		gl = gaps_cfg.left or gaps_cfg[4] or 0
+		gr = gaps_cfg.right or gaps_cfg[2] or 0
+	elseif type(gaps_cfg) == "number" then
+		gt, gb, gl, gr = gaps_cfg, gaps_cfg, gaps_cfg, gaps_cfg
+	end
+
+	-- 2. Interrogate the active monitor for reserved space (your bar)
+	local bt, bb, bl, br = 0, 0, 0, 0
+	local m = hl.get_active_monitor()
+	if m and m.reserved then
+		if type(m.reserved) == "table" then
+			bt = m.reserved.top or m.reserved[1] or 0
+			bb = m.reserved.bottom or m.reserved[2] or 0
+			bl = m.reserved.left or m.reserved[3] or 0
+			br = m.reserved.right or m.reserved[4] or 0
+		end
+	end
+
+	return {
+		top = gt + bt,
+		bottom = gb + bb,
+		left = gl + bl,
+		right = gr + br
+	}
+end
+
+local offsets = get_env_offsets()
+
 -- workspaces
 local tag_workspaces = {
 	terminal = 1,
@@ -46,7 +82,7 @@ hl.window_rule({
 	opacity = "0.85 0.75",
 	pin = true,
 	size = { "(monitor_w*0.53)", "(monitor_h*0.6)" },
-	move = { "(monitor_w*0.465)", "(monitor_h*0.048)" },
+	move = { "(monitor_w-window_w-" .. offsets.right .. ")", tostring(offsets.top) },
 	animation = "slide right top"
 })
 
@@ -64,10 +100,10 @@ hl.window_rule({
 
 -- positions
 local positions = {
-	["top-left"] = { "0", "0" },
-	["top-right"] = { "(monitor_w-window_w)", "0" },
-	["bottom-left"] = { "0", "(monitor_h-window_h)" },
-	["bottom-right"] = { "(monitor_w-window_w)", "(monitor_h-window_h)" }
+	["top-left"] = { tostring(offsets.left), tostring(offsets.top) },
+	["top-right"] = { "(monitor_w-window_w-" .. offsets.right .. ")", tostring(offsets.top) },
+	["bottom-left"] = { tostring(offsets.left), "(monitor_h-window_h-" .. offsets.bottom .. ")" },
+	["bottom-right"] = { "(monitor_w-window_w-" .. offsets.right .. ")", "(monitor_h-window_h-" .. offsets.bottom .. ")" }
 }
 
 for tag, pos in pairs(positions) do