diff --git a/hypr/hyprland/animations.lua b/hypr/hyprland/animations.lua index 808a2e5..18c928b 100644 --- a/hypr/hyprland/animations.lua +++ b/hypr/hyprland/animations.lua @@ -4,7 +4,7 @@ hl.curve("easeIn", { }) hl.curve("easeOut", { type = "bezier", - points = { {0.16, 1}, {0.3, 1} } + points = { {0.22, 1}, {0.36, 1} } }) hl.curve("linear", { type = "bezier", @@ -40,7 +40,7 @@ hl.animation({ hl.animation({ leaf = "windowsMove", enabled = true, - speed = 5, + speed = 4, bezier = "easeOut" }) hl.animation({ diff --git a/hypr/hyprland/binds.lua b/hypr/hyprland/binds.lua index ae66f2c..d633743 100644 --- a/hypr/hyprland/binds.lua +++ b/hypr/hyprland/binds.lua @@ -182,10 +182,10 @@ bind("SUPER + SHIFT + COMMA", hl.dsp.exec_cmd( local zoom = false bind("SUPER + SEMICOLON", function () if zoom then - hl.config({cursor = {zoom_factor = 1.0}}) + hl.config({cursor = {zoom_factor = 1.0, invisible = false}}) zoom = false else - hl.config({cursor = {zoom_factor = 3.0}}) + hl.config({cursor = {zoom_factor = 3.0, invisible = true}}) zoom = true end end) @@ -199,3 +199,10 @@ bind("SUPER + G", hl.dsp.exec_cmd("zen-browser")) bind("SUPER + C", hl.dsp.exec_cmd("vesktop")) bind("SUPER + R", hl.dsp.exec_cmd("keepassxc")) bind("SUPER + L", hl.dsp.exec_cmd("kitty")) + +bind("KP_HOME", hl.dsp.pass({window = "class:vesktop"})) +bind("KP_HOME", hl.dsp.pass({window = "class:vesktop"}), {release = true}) +bind("KP_UP", hl.dsp.send_shortcut({mods = "CTRL + SHIFT", key = "M", window = "class:vesktop"})) +bind("KP_UP", hl.dsp.send_shortcut({mods = "CTRL + SHIFT", key = "M", window = "class:vesktop"}), {release = true}) +bind("KP_PRIOR", hl.dsp.send_shortcut({mods = "CTRL + SHIFT", key = "D", window = "class:vesktop"})) +bind("KP_PRIOR", hl.dsp.send_shortcut({mods = "CTRL + SHIFT", key = "D", window = "class:vesktop"}), {release = true}) diff --git a/hypr/hyprland/config.lua b/hypr/hyprland/config.lua index d463d1f..9531bb1 100644 --- a/hypr/hyprland/config.lua +++ b/hypr/hyprland/config.lua @@ -53,11 +53,11 @@ hl.config({ key_press_enables_dpms = true, mouse_move_enables_dpms = true, focus_on_activate = true, - session_lock_xray = false, + session_lock_xray = true, animate_manual_resizes = true, enable_anr_dialog = false, background_color = "#141414", - enable_swallow = true, + enable_swallow = false, swallow_regex = "kitty" }, cursor = { diff --git a/hypr/hyprland/mcsr.lua b/hypr/hyprland/mcsr.lua index 210f544..df213d3 100644 --- a/hypr/hyprland/mcsr.lua +++ b/hypr/hyprland/mcsr.lua @@ -11,12 +11,15 @@ hl.define_submap("mcsr", function() hl.bind("KP_END", hl.dsp.window.resize({x = 1920, y = 16384})) hl.bind("KP_END", hl.dsp.window.move({x = 600, y = -7472})) hl.bind("KP_END", hl.dsp.exec_cmd("quickshell ipc call boateye open")) + hl.bind("KP_END", hl.dsp.exec_cmd("quickshell ipc call thin close")) -- Thin macro hl.bind("KP_DOWN", hl.dsp.window.fullscreen_state({internal = 0, client = 0})) hl.bind("KP_DOWN", hl.dsp.window.float({action = "on"})) hl.bind("KP_DOWN", hl.dsp.window.resize({x = 400, y = 1420})) hl.bind("KP_DOWN", hl.dsp.window.center()) + hl.bind("KP_DOWN", hl.dsp.exec_cmd("quickshell ipc call thin open")) + hl.bind("KP_DOWN", hl.dsp.exec_cmd("quickshell ipc call boateye close")) -- Wide macro hl.bind("KP_NEXT", hl.dsp.window.fullscreen_state({internal = 0, client = 0})) @@ -35,5 +38,13 @@ end) -- Close boateye -- FIXME: use hl.on() to couple this to the actions of fullscreening/floating -- instead of the keybinds -bind("SUPER + F", hl.dsp.exec_cmd("quickshell ipc call boateye close")) -bind("SUPER + M", hl.dsp.exec_cmd("quickshell ipc call boateye close")) +bind("SUPER + F", hl.dsp.exec_cmd("quickshell ipc call boateye close; quickshell ipc call thin close")) +bind("SUPER + M", hl.dsp.exec_cmd("quickshell ipc call boateye close; quickshell ipc call thin close")) + +bind("KP_LEFT", hl.dsp.pass({window = "class:ninjabrainbot-Main"})) +bind("KP_LEFT", hl.dsp.pass({window = "class:ninjabrainbot-Main"}), {release = true}) +bind("KP_BEGIN", hl.dsp.pass({window = "class:ninjabrainbot-Main"})) +bind("KP_BEGIN", hl.dsp.pass({window = "class:ninjabrainbot-Main"}), {release = true}) +bind("KP_RIGHT", hl.dsp.pass({window = "class:ninjabrainbot-Main"})) +bind("KP_RIGHT", hl.dsp.pass({window = "class:ninjabrainbot-Main"}), {release = true}) + diff --git a/hypr/hyprland/rules.lua b/hypr/hyprland/rules.lua index 241316d..19d5824 100644 --- a/hypr/hyprland/rules.lua +++ b/hypr/hyprland/rules.lua @@ -1,10 +1,6 @@ -- Smart gaps hl.workspace_rule({ workspace = "w[tv1]s[false]", gaps_out = 0, gaps_in = 0 }) hl.workspace_rule({ workspace = "f[1]s[false]", gaps_out = 0, gaps_in = 0 }) -hl.window_rule({ match = { float = false, workspace = "w[tv1]s[false]" }, border_size = 0 }) -hl.window_rule({ match = { float = false, workspace = "w[tv1]s[false]" }, rounding = 0 }) -hl.window_rule({ match = { float = false, workspace = "f[1]s[false]" }, border_size = 0 }) -hl.window_rule({ match = { float = false, workspace = "f[1]s[false]" }, rounding = 0 }) -- Special workspace hl.workspace_rule({ workspace = "s[true]", gaps_out = 64, gaps_in = 12}) diff --git a/kitty/kitty.conf b/kitty/kitty.conf index 8a7a1a6..c6a9331 100644 --- a/kitty/kitty.conf +++ b/kitty/kitty.conf @@ -1,5 +1,6 @@ include colors.conf + font_family 0xProto Nerd Font font_size 12