diff --git a/.config/I-DeskPet/Acheron.json b/.config/I-DeskPet/Acheron.json index e2c47eb..9a22abd 100644 --- a/.config/I-DeskPet/Acheron.json +++ b/.config/I-DeskPet/Acheron.json @@ -1,6 +1,6 @@ { - "positionX": 95, - "positionY": 986, + "positionX": 98, + "positionY": 1346, "scaling": 2.2375000000000145, "zIndex": 2 } diff --git a/.config/I-DeskPet/Evernight.json b/.config/I-DeskPet/Evernight.json index 62ec612..5176eaa 100644 --- a/.config/I-DeskPet/Evernight.json +++ b/.config/I-DeskPet/Evernight.json @@ -1,6 +1,6 @@ { "positionX": 0, - "positionY": 932, + "positionY": 1292, "scaling": 3.7125000000000177, "zIndex": 1 } diff --git a/.config/I-DeskPet/Stelle.json b/.config/I-DeskPet/Stelle.json index 49a69bb..16a5a43 100644 --- a/.config/I-DeskPet/Stelle.json +++ b/.config/I-DeskPet/Stelle.json @@ -1,6 +1,6 @@ { - "positionX": 102, - "positionY": 932, + "positionX": 125, + "positionY": 1292, "scaling": 4.05000000000002, "zIndex": 0 } diff --git a/.config/hypr/autostart/autostart.lua b/.config/hypr/autostart/autostart.lua index 362a798..30409d9 100644 --- a/.config/hypr/autostart/autostart.lua +++ b/.config/hypr/autostart/autostart.lua @@ -5,11 +5,10 @@ hl.on("hyprland.start", function() hl.exec_cmd("sleep 3s; " .. prefix .. "/usr/bin/otd-daemon") hl.exec_cmd("sleep 3s; " .. prefix .. "obs --scene 'Recording' --startreplaybuffer --minimize-to-tray") hl.exec_cmd("sleep 3s; " .. prefix .. "ideskpet start") - hl.exec_cmd("sleep 3s; " .. prefix .. "librewolf") hl.exec_cmd("sleep 3s; " .. prefix .. "Telegram -startintray") hl.exec_cmd("sleep 3s; " .. prefix .. "discord --enable-features=WaylandLinuxDrmSyncobj --start-minimized") hl.exec_cmd("sleep 3s; " .. prefix .. "steam -silent") hl.exec_cmd("sleep 3s; " .. prefix .. "~/.config/hypr/scripts/gtk.sh") hl.exec_cmd("sleep 3s; " .. prefix .. "wl-paste --watch cliphist store") - hl.exec_cmd("sleep 15s; " .. prefix .. "hyprpm reload") + -- hl.exec_cmd("sleep 15s; " .. prefix .. "hyprpm reload") end) diff --git a/.config/hypr/scheme/current.conf b/.config/hypr/hypr-old/scheme/current.conf similarity index 100% rename from .config/hypr/scheme/current.conf rename to .config/hypr/hypr-old/scheme/current.conf diff --git a/.config/hypr/keybinds/keybinds.lua b/.config/hypr/keybinds/keybinds.lua index 96da89c..4569bc7 100644 --- a/.config/hypr/keybinds/keybinds.lua +++ b/.config/hypr/keybinds/keybinds.lua @@ -27,7 +27,7 @@ hl.bind(mainMod .. " + F1", hl.dsp.exec_cmd("playerctl play-pause")) hl.bind(mainMod .. " + F2", hl.dsp.exec_cmd("playerctl previous")) hl.bind(mainMod .. " + F3", hl.dsp.exec_cmd("playerctl next")) hl.bind("PRINT", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle")) -hl.bind("code:172", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle")) +hl.bind("code:51", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle")) hl.bind("code:121", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle")) hl.bind("code:122", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02-")) hl.bind("code:123", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.02+ --limit 1.0")) @@ -51,8 +51,8 @@ hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true }) hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true }) -- Workspaces -hl.bind("code:171", hl.dsp.focus({ workspace = "m+1" })) -hl.bind("code:173", hl.dsp.focus({ workspace = "m-1" })) +-- hl.bind("code:113", hl.dsp.focus({ workspace = "m+1" })) +-- hl.bind("code:114", hl.dsp.focus({ workspace = "m-1" })) hl.bind("ALT + TAB", hl.dsp.focus({ workspace = "m+1" })) hl.bind(mainMod .. " + TAB", hl.dsp.focus({ workspace = "m-1" })) hl.bind(mainMod .. " + CTRL + left", hl.dsp.window.swap({ direction = "left" })) diff --git a/.config/hypr/hypr-old/scripts/Gtk-Settings.sh b/.config/hypr/scripts/Gtk-Settings.sh similarity index 100% rename from .config/hypr/hypr-old/scripts/Gtk-Settings.sh rename to .config/hypr/scripts/Gtk-Settings.sh diff --git a/.config/hypr/settings/animation.lua b/.config/hypr/settings/animation.lua index d8df32a..d65bcc2 100644 --- a/.config/hypr/settings/animation.lua +++ b/.config/hypr/settings/animation.lua @@ -1,5 +1,30 @@ local C = require("color") +local animations = { + { leaf = "global", enabled = true, speed = 10, bezier = "default" }, + { leaf = "border", enabled = true, speed = 10, bezier = "default" }, + { leaf = "windows", enabled = true, speed = 3, bezier = "default" }, + { leaf = "windowsIn", enabled = true, speed = 3, bezier = "default" }, + { leaf = "windowsOut", enabled = true, speed = 3, bezier = "default" }, + { leaf = "windowsMove", enabled = true, speed = 1, bezier = "default" }, + { leaf = "fadeOut", enabled = true, speed = 3, bezier = "default" }, + { leaf = "fadeIn", enabled = true, speed = 4, bezier = "default" }, + { leaf = "workspaces", enabled = true, speed = 4, bezier = "default" }, + { leaf = "layers", enabled = true, speed = 5, bezier = "default" }, + { leaf = "fadeLayers", enabled = true, speed = 1, bezier = "default" }, + { leaf = "fadePopups", enabled = true, speed = 1, bezier = "default" }, +} + +local curves = { + { name = "wind", config = { type = "bezier", points = { { 0.25, 0.1 }, { 0.25, 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 = "linear", config = { type = "bezier", points = { { 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 = "easy", config = { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 } }, +} + hl.config({ general = { gaps_in = 3, @@ -61,30 +86,29 @@ hl.config({ }, }) --- Default curves and animations, see https://wiki.hypr.land/Configuring/Advanced-and-Cool/Animations/ -hl.curve("easeOutQuint", { type = "bezier", points = { { 0.23, 1 }, { 0.32, 1 } } }) -hl.curve("easeInOutCubic", { type = "bezier", points = { { 0.65, 0.05 }, { 0.36, 1 } } }) -hl.curve("linear", { type = "bezier", points = { { 0, 0 }, { 1, 1 } } }) -hl.curve("almostLinear", { type = "bezier", points = { { 0.5, 0.5 }, { 0.75, 1 } } }) -hl.curve("quick", { type = "bezier", points = { { 0.15, 0 }, { 0.1, 1 } } }) +for _, animation in ipairs(animations) do + hl.animation(animation) +end --- Default springs -hl.curve("easy", { type = "spring", mass = 1, stiffness = 71.2633, dampening = 15.8273644 }) +for _, curve in ipairs(curves) do + hl.curve(curve.name, curve.config) +end -hl.animation({ leaf = "global", enabled = true, speed = 10, bezier = "default" }) -hl.animation({ leaf = "border", enabled = true, speed = 5.39, bezier = "easeOutQuint" }) -hl.animation({ leaf = "windows", enabled = true, speed = 4.79, spring = "easy" }) -hl.animation({ leaf = "windowsIn", enabled = true, speed = 4.1, spring = "easy", style = "popin 87%" }) -hl.animation({ leaf = "windowsOut", enabled = true, speed = 1.49, bezier = "linear", style = "popin 87%" }) -hl.animation({ leaf = "fadeIn", enabled = true, speed = 1.73, bezier = "almostLinear" }) -hl.animation({ leaf = "fadeOut", enabled = true, speed = 1.46, bezier = "almostLinear" }) -hl.animation({ leaf = "fade", enabled = true, speed = 3.03, bezier = "quick" }) -hl.animation({ leaf = "layers", enabled = true, speed = 3.81, bezier = "easeOutQuint" }) -hl.animation({ leaf = "layersIn", enabled = true, speed = 4, bezier = "easeOutQuint", style = "fade" }) -hl.animation({ leaf = "layersOut", enabled = true, speed = 1.5, bezier = "linear", style = "fade" }) -hl.animation({ leaf = "fadeLayersIn", enabled = true, speed = 1.79, bezier = "almostLinear" }) -hl.animation({ leaf = "fadeLayersOut", enabled = true, speed = 1.39, bezier = "almostLinear" }) -hl.animation({ leaf = "workspaces", enabled = true, speed = 1.94, bezier = "almostLinear", style = "fade" }) -hl.animation({ leaf = "workspacesIn", enabled = true, speed = 1.21, bezier = "almostLinear", style = "fade" }) -hl.animation({ leaf = "workspacesOut", enabled = true, speed = 1.94, bezier = "almostLinear", style = "fade" }) -hl.animation({ leaf = "zoomFactor", enabled = true, speed = 7, bezier = "quick" }) +-- List of animation options +-- "global" +-- "border" +-- "windows" +-- "windowsIn" +-- "windowsOut" +-- "fadeIn" +-- "fadeOut" +-- "fade" +-- "layers" +-- "layersIn" +-- "layersOut" +-- "fadeLayersIn" +-- "fadeLayersOut" +-- "workspaces" +-- "workspacesIn" +-- "workspacesOut" +-- "zoomFactor" diff --git a/.config/hypr/settings/monitor.lua b/.config/hypr/settings/monitor.lua index ee15589..499cde1 100644 --- a/.config/hypr/settings/monitor.lua +++ b/.config/hypr/settings/monitor.lua @@ -1,5 +1,5 @@ hl.monitor({ - output = "DP-1", + output = "DP-2", mode = "2560x1440@143.97", position = "auto", scale = "1.33", diff --git a/.config/hypr/settings/windowrules.lua b/.config/hypr/settings/windowrules.lua index 3a16411..2b59f7d 100644 --- a/.config/hypr/settings/windowrules.lua +++ b/.config/hypr/settings/windowrules.lua @@ -54,6 +54,16 @@ hl.window_rule({ no_shadow = true, }) +hl.window_rule({ + match = { + fullscreen_state_client = 2, + fullscreen_state_internal = 2, + class = "librewolf", + }, + + idle_inhibit = "always", +}) + hl.window_rule({ match = { fullscreen_state_client = 4,