diff --git a/hypr/hyprland.lua b/hypr/hyprland.lua index 71b53a7..ed28acc 100644 --- a/hypr/hyprland.lua +++ b/hypr/hyprland.lua @@ -9,8 +9,8 @@ hl.env("QT_QPA_PLATFORM", "wayland;xcb") hl.env("QT_QPA_PLATFORMTHEME", "gtk3") hl.env("XCURSOR_SIZE", "24") hl.env("HYPRCURSOR_SIZE", "24") -hl.env("DISPLAY", ":0") -hl.env("USE_X11", "false") +-- hl.env("DISPLAY", ":0") +-- hl.env("USE_X11", "false") -- monitors hl.monitor({ @@ -29,67 +29,69 @@ hl.monitor({ local home = os.getenv("HOME") -hl.on("hyprland.start", function () - -- gentoo specific - hl.exec_cmd("/usr/libexec/hyprpolkitagent") - hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP") - hl.exec_cmd("hyprpm reload") -- set up plugins - - hl.exec_cmd("hyprctl setcursor Adwaita 24") -- set cursor to be normal - hl.exec_cmd("wl-paste --watch cliphist store") - hl.exec_cmd("mako") - - hl.exec_cmd("awww-daemon") - hl.exec_cmd(home .. "/.config/hypr/awww_randomize.sh " .. home .. "/.wallpapers/2k") - hl.exec_cmd("qs -d -p " .. home .. "/.config/quickshell/shell.qml") +hl.on("hyprland.start", function() + -- gentoo specific + hl.exec_cmd("/usr/libexec/hyprpolkitagent") + hl.exec_cmd("dbus-update-activation-environment --systemd WAYLAND_DISPLAY XDG_CURRENT_DESKTOP") + hl.exec_cmd("hyprpm reload") -- set up plugins + + hl.exec_cmd("hyprctl setcursor Adwaita 24") -- set cursor to be normal + hl.exec_cmd("wl-clip-persist --clipboard regular") + + hl.exec_cmd("wl-paste --watch cliphist store") + hl.exec_cmd("mako") + + hl.exec_cmd("awww-daemon") + hl.exec_cmd(home .. "/.config/hypr/awww_randomize.sh " .. home .. "/.wallpapers/2k") + hl.exec_cmd("qs -d -p " .. home .. "/.config/quickshell/shell.qml") end) -- Refer to https://wiki.hypr.land/Configuring/Basics/Variables/ hl.config({ general = { - gaps_in = 4, - gaps_out = 5, + gaps_in = 4, + gaps_out = 5, - border_size = 2, + border_size = 2, - col = { - active_border = "rgba(0DB7D455)", + col = { + active_border = "rgba(0DB7D455)", inactive_border = "rgba(595959aa)", }, - resize_on_border = true, + resize_on_border = true, no_focus_fallback = true, - allow_tearing = true, - layout = "scrolling", + allow_tearing = true, + layout = "scrolling", }, decoration = { rounding = 10, rounding_power = 2.5, - shadow = { + shadow = { enabled = false, range = 4, render_power = 3, color = 0xee1a1a1a, }, - blur = { - enabled = true, - xray = true, - size = 6, - passes = 1, - vibrancy = 0.1696, + blur = { + enabled = true, + xray = true, + size = 6, + passes = 1, + vibrancy = 0.1696, }, - dim_inactive=true, - dim_strength=0.1, - dim_special=0.2, + dim_inactive = true, + dim_strength = 0.1, + dim_special = 0.2, }, - + input = { - kb_layout = "us", - follow_mouse = 2, + kb_layout = "us", + follow_mouse = 2, off_window_axis_events = 2, }, animations = { @@ -104,7 +106,7 @@ hl.config({ mouse_move_enables_dpms = true, key_press_enables_dpms = true }, - + dwindle = { preserve_split = true, -- You probably want this }, @@ -114,129 +116,153 @@ hl.config({ }, scrolling = { - fullscreen_on_one_column = false, + focus_fit_method = 1, + explicit_column_widths = "0.5,1", + fullscreen_on_one_column = true, }, }) -- 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} } }) +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 } } }) -- Default springs -hl.curve("easy", { type = "spring", mass = 1, stiffness = 238.1191, dampening = 24.21279333 }) +hl.curve("easy", { type = "spring", mass = 1, stiffness = 238.1191, dampening = 24.21279333 }) -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" }) +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" }) -local terminal = "alacritty" +local terminal = "alacritty" local fileManager = "thunar" local menu = "fuzzel" -local mainMod = "SUPER" -- Sets "Windows" key as main modifier +local mainMod = "SUPER" -- Sets "Windows" key as main modifier -- Example binds, see https://wiki.hypr.land/Configuring/Basics/Binds/ for more hl.bind(mainMod .. " + RETURN", hl.dsp.exec_cmd(terminal)) hl.bind(mainMod .. " + D", hl.dsp.exec_cmd(menu)) hl.bind(mainMod .. " + E", hl.dsp.exec_cmd(fileManager)) -hl.bind(mainMod .. " + M", hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'")) +hl.bind(mainMod .. " + M", + hl.dsp.exec_cmd("command -v hyprshutdown >/dev/null 2>&1 && hyprshutdown || hyprctl dispatch 'hl.dsp.exit()'")) hl.bind(mainMod .. " + SPACE", hl.dsp.window.float({ action = "toggle" })) -hl.bind(mainMod .. " + F", hl.dsp.window.fullscreen_state({ internal="1", client="1", layout_aware=true, action = "toggle"})) +-- toggle maximize in scrolling mode; from https://github.com/hyprwm/Hyprland/discussions/14380 +hl.bind(mainMod .. " + F", function() + hl.dispatch(hl.dsp.layout("colresize +conf")) + hl.dispatch(hl.dsp.layout("focus r")) + hl.dispatch(hl.dsp.layout("focus l")) +end +) hl.bind(mainMod .. " + SHIFT + Q", hl.dsp.window.close()) -- change focus -hl.bind(mainMod .. " + LEFT", hl.dsp.focus({ direction = "left" })) +hl.bind(mainMod .. " + LEFT", hl.dsp.focus({ direction = "left" })) hl.bind(mainMod .. " + RIGHT", hl.dsp.focus({ direction = "right" })) -hl.bind(mainMod .. " + UP", hl.dsp.focus({ direction = "up" })) -hl.bind(mainMod .. " + DOWN", hl.dsp.focus({ direction = "down" })) +hl.bind(mainMod .. " + UP", hl.dsp.focus({ direction = "up" })) +hl.bind(mainMod .. " + DOWN", hl.dsp.focus({ direction = "down" })) --- move workspaces -hl.bind(mainMod .. " + SHIFT + LEFT", hl.dsp.window.swap({ direction = "left"})) -hl.bind(mainMod .. " + SHIFT + RIGHT", hl.dsp.window.swap({ direction = "right"})) -hl.bind(mainMod .. " + SHIFT + UP", hl.dsp.window.swap({ direction = "up"})) -hl.bind(mainMod .. " + SHIFT + DOWN", hl.dsp.window.swap({ direction = "down"})) +local function move_window_relative(delta) + return function() + local ws = hl.get_active_workspace() + if not ws or ws.id < 1 then return end -- ignore special workspaces (negative IDs) + + local target = ws.id + delta + if target < 1 or target > 9 then return end + + hl.dispatch(hl.dsp.window.move({ workspace = target })) + end +end + + +-- move windows +hl.bind(mainMod .. " + SHIFT + LEFT", hl.dsp.window.swap({ direction = "left" })) +hl.bind(mainMod .. " + SHIFT + RIGHT", hl.dsp.window.swap({ direction = "right" })) +-- moves the window n +- 1 workspaces where n is the current workspace +hl.bind(mainMod .. " + SHIFT + UP", move_window_relative(-1)) +hl.bind(mainMod .. " + SHIFT + DOWN", move_window_relative(1)) -- screenshots -hl.bind("Print", hl.dsp.exec_cmd("grim -g \"$(slurp)\" ~/$(date + '%Y%m%d-%H%M%S').png")) -- dump to home -hl.bind("SUPER + Print", hl.dsp.exec_cmd( - "grim -g \"$(slurp)\" - | wl-copy" -)) -- copy to clipboard +hl.bind("Print", hl.dsp.exec_cmd('grim -g "$(slurp)" - | swappy -f -')) -- opens an interface to choose btwn saving / copying -- hy3 settings -local hy3 = hl.plugin.hy3 -hl.bind(mainMod .. " + V", hy3.make_group("v")) -hl.bind(mainMod .. " + H", hy3.make_group("h")) -hl.bind(mainMod .. " + T", hy3.make_group("tab")) +--local hy3 = hl.plugin.hy3 +--hl.bind(mainMod .. " + V", hy3.make_group("v")) +--hl.bind(mainMod .. " + H", hy3.make_group("h")) +--hl.bind(mainMod .. " + T", hy3.make_group("tab")) -hl.bind(mainMod .. " + CTRL + LEFT", hy3.focus_tab({ direction = "left" })) -hl.bind(mainMod .. " + CTRL + RIGHT", hy3.focus_tab({ direction = "right" })) +--hl.bind(mainMod .. " + CTRL + LEFT", hy3.focus_tab({ direction = "left" })) +--hl.bind(mainMod .. " + CTRL + RIGHT", hy3.focus_tab({ direction = "right" })) -- Switch workspaces with mainMod + [0-9] -- Move active window to a workspace with mainMod + SHIFT + [0-9] for i = 1, 10 do local key = i % 10 -- 10 maps to key 0 - hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = i})) - hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i })) + hl.bind(mainMod .. " + " .. key, hl.dsp.focus({ workspace = i })) + hl.bind(mainMod .. " + SHIFT + " .. key, hl.dsp.window.move({ workspace = i })) end -- scratchpad -hl.bind(mainMod .. " + MINUS", hl.dsp.workspace.toggle_special("magic")) +hl.bind(mainMod .. " + MINUS", hl.dsp.workspace.toggle_special("magic")) hl.bind(mainMod .. " + SHIFT + MINUS", hl.dsp.window.move({ workspace = "special:magic" })) -- Scroll through existing workspaces with mainMod + scroll hl.bind(mainMod .. " + mouse_down", hl.dsp.focus({ workspace = "e+1" })) -hl.bind(mainMod .. " + mouse_up", hl.dsp.focus({ workspace = "e-1" })) +hl.bind(mainMod .. " + mouse_up", hl.dsp.focus({ workspace = "e-1" })) -- Move/resize windows with mainMod + LMB/RMB and dragging -hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true }) +hl.bind(mainMod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true }) hl.bind(mainMod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true }) -- Laptop multimedia keys for volume and LCD brightness -hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), { locked = true, repeating = true }) -hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), { locked = true, repeating = true }) -hl.bind("XF86AudioMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), { locked = true, repeating = true }) -hl.bind("XF86AudioMicMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), { locked = true, repeating = true }) -hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true }) -hl.bind("XF86MonBrightnessDown",hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true }) +hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("wpctl set-volume -l 1 @DEFAULT_AUDIO_SINK@ 5%+"), + { locked = true, repeating = true }) +hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("wpctl set-volume @DEFAULT_AUDIO_SINK@ 5%-"), + { locked = true, repeating = true }) +hl.bind("XF86AudioMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"), + { locked = true, repeating = true }) +hl.bind("XF86AudioMicMute", hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"), + { locked = true, repeating = true }) +hl.bind("XF86MonBrightnessUp", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%+"), { locked = true, repeating = true }) +hl.bind("XF86MonBrightnessDown", hl.dsp.exec_cmd("brightnessctl -e4 -n2 set 5%-"), { locked = true, repeating = true }) -- Requires playerctl -hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true }) +hl.bind("XF86AudioNext", hl.dsp.exec_cmd("playerctl next"), { locked = true }) hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"), { 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("XF86AudioPlay", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true }) +hl.bind("XF86AudioPrev", hl.dsp.exec_cmd("playerctl previous"), { locked = true }) local suppressMaximizeRule = hl.window_rule({ -- Ignore maximize requests from all apps. You'll probably like this. - name = "suppress-maximize-events", - match = { class = ".*" }, + name = "suppress-maximize-events", + match = { class = ".*" }, suppress_event = "maximize", }) -suppressMaximizeRule:set_enabled(true) +suppressMaximizeRule:set_enabled(false) hl.window_rule({ -- Fix some dragging issues with XWayland - name = "fix-xwayland-drags", - match = { + name = "fix-xwayland-drags", + match = { class = "^$", title = "^$", xwayland = true, @@ -248,4 +274,12 @@ hl.window_rule({ no_focus = true, }) +hl.layer_rule({ + name = "slurp", + match = { + title = "*slurp*", + }, + blur = false, +}) + require("rules")