dns + keybinding consolidation

This commit is contained in:
ari committed 2026-09-21 10:52:32 -04:00
1 parent df46627173
commit f8444b1549
23 files changed
+612 -109

No files matched your search

+15 -10
View File
@@ -32,7 +32,12 @@ split under `conf/` and pulled in with `require()`.
inside quickshell-based apps fail silently (hyprwm/Hyprland#14844). There is
intentionally no waybar/hyprpanel.
- **Keybinds:** `conf/keybindings.lua` mirrors `configs/niri/shared/binds.kdl`
and `configs/niri/dms/binds.kdl` as closely as Hyprland allows.
and `configs/niri/dms/binds.kdl` as closely as Hyprland allows. `Mod+Alt+E`
opens this file in Zed (`zeditor`), mirroring niri's `Mod+Alt+E` ->
`shared/binds.kdl`. Windows are moved around with `Mod+Ctrl+arrows`
(`Mod+Ctrl+Left/Right` move in a direction, `Mod+Ctrl+Up/Down` move to a
workspace), and the `Mod+Shift` media/volume binds mirror niri's "Basic Sound
Control" block. Hyprland groups/tabs are intentionally unused.
- **Overview:** A standalone Quickshell config (`configs/fwbook/quickshell/overview/`,
symlinked to `~/.config/quickshell/overview` by the
`skyg.nixos.desktop.tiler.quickshell` module) provides a niri-like scrolling
@@ -62,9 +67,9 @@ hypr/
├── animations.lua # workspaces slide = "slidevert" (niri-like); only the `workspaces`
│ # leaf overridden — other styles: slide, fade, slidefade, slidefadevert
├── monitors.lua # hl.monitor per display (from configs/niri/.../outputs.kdl)
├── inputs.lua # touchpad tap + natural scroll, kb us, hl.gesture
├── inputs.lua # touchpad tap + natural scroll, kb us, hl.gesture (incl. Mod+swipe workspace-to-monitor)
├── window-rules.lua # hl.window_rule floats for small dialogs/utilities
├── keybindings.lua # niri + noctalia binds, scrolling dispatchers (hl.bind/hl.dsp); Mod+Tab toggles the Quickshell overview
├── keybindings.lua # niri + noctalia binds, scrolling dispatchers (hl.bind/hl.dsp); Mod+Tab toggles the Quickshell overview; Mod+Ctrl moves windows, Mod+Shift is media/volume
└── autostart.lua # noctalia + Quickshell overview via setpriv (hl.on hyprland.start; drops compositor caps)
```
@@ -72,11 +77,10 @@ hypr/
- `Mod+Shift+H` (show-hotkey-overlay) — no native Hyprland equivalent; left commented.
- `Mod+Escape` (toggle-keyboard-shortcuts-inhibit) — no native equivalent; omitted.
- `Mod+W` (toggle-column-tabbed-display) — mapped to `hl.dsp.group.toggle()` as the nearest
analog. Additional group binds were added on top via `hyprctl dispatch` (the extra
dispatchers aren't wrapped by `hl.dsp`): `Mod+Shift+W` (merge into an adjacent group),
`Mod+Alt+W` (pull out of a group), `Mod+Alt+Left/Right` (cycle through the active
group's tabs; no-op outside a group), and `Mod+Shift+G` (lock/unlock the group).
- `Mod+C` (center-column) — Hyprland runs the `focus current` scrolling dispatch.
- `Mod+Ctrl+F` (reset-window-height) — the scrolling layout has no per-window
height reset, so it maps to `layout "fit active"` (resets the focused column
to full width).
- `Mod+Tab` (toggle-overview) — the Quickshell scrolling overview (see above);
previously a pure-Lua wofi picker, then the ScrollOverview plugin, and
`cyclenext` before that.
@@ -88,8 +92,9 @@ niri's 3-finger swipes are mirrored in `conf/inputs.lua`:
- **Horizontal** → `scroll_move` (scroll through columns along the tape)
- **Vertical** → `workspace` (switch workspaces up/down)
- **Mod + swipe (any direction)** → move the whole workspace to the monitor in
that direction (`movecurrentworkspacetomonitor`), mirroring niri's
`Mod+TouchpadScroll*` binds. This replaced the old `Mod + mouse wheel` approach.
that direction (`hyprctl dispatch movecurrentworkspacetomonitor`), mirroring
niri's `Mod+TouchpadScroll*` binds. Swipe direction maps to the same monitor
direction (up→up, down→down, left→left, right→right).
- **4-finger up/down** → open/close the Quickshell scrolling overview (see
Overview above). `hl.gesture` is a discrete trigger, so there's no
swipe-progress animation.
+35
View File
@@ -14,6 +14,41 @@ hl.config({
hl.gesture({ fingers = 3, direction = "horizontal", action = "scroll_move" })
hl.gesture({ fingers = 3, direction = "vertical", action = "workspace" })
-- Mod + 3-finger swipe: move the whole workspace to the monitor in that
-- direction (mirrors niri's Mod+TouchpadScroll* binds).
hl.gesture({
fingers = 3,
direction = "up",
mods = "SUPER",
action = function()
hl.exec_cmd("hyprctl dispatch movecurrentworkspacetomonitor u")
end,
})
hl.gesture({
fingers = 3,
direction = "down",
mods = "SUPER",
action = function()
hl.exec_cmd("hyprctl dispatch movecurrentworkspacetomonitor d")
end,
})
hl.gesture({
fingers = 3,
direction = "left",
mods = "SUPER",
action = function()
hl.exec_cmd("hyprctl dispatch movecurrentworkspacetomonitor l")
end,
})
hl.gesture({
fingers = 3,
direction = "right",
mods = "SUPER",
action = function()
hl.exec_cmd("hyprctl dispatch movecurrentworkspacetomonitor r")
end,
})
hl.gesture({
fingers = 4,
direction = "up",
+24 -56
View File
@@ -10,6 +10,7 @@ hl.bind(mod .. " + T", hl.dsp.exec_cmd("ghostty"))
hl.bind(mod .. " + Z", hl.dsp.exec_cmd("flatpak run app.zen_browser.zen"))
hl.bind(mod .. " + B", hl.dsp.exec_cmd("chromium"))
hl.bind(mod .. " + E", hl.dsp.exec_cmd("wofi-emoji"))
hl.bind(mod .. " + ALT + E", hl.dsp.exec_cmd("zeditor ~/.config/hypr/conf/keybindings.lua"))
hl.bind(mod .. " + Q", hl.dsp.window.close())
-- =========================
@@ -27,58 +28,12 @@ hl.bind(mod .. " + SHIFT + Tab", hl.dsp.focus({ monitor = "+1" }))
-- =========================
-- Window Management
-- =========================
-- hl.bind(mod .. " + CTRL + right", function()
-- hl.dispatch(hl.dsp.resize({x = 1, relative = true}))
-- hl.dispatch(hl.dsp.layout("swapcol r"))
-- end)
-- hl.bind(mod .. " + SHIFT + right", hl.dsp.layout("swapcol r"))
-- hl.bind(mod .. " + SHIFT + left", hl.dsp.layout("swapcol l"))
hl.bind(
mod .. " + SHIFT + right",
hl.dsp.window.move({
direction = "right",
follow = true,
group_aware = true,
into_or_create_group = true,
})
)
hl.bind(
mod .. " + SHIFT + left",
hl.dsp.window.move({
direction = "left",
follow = true,
group_aware = true,
into_or_create_group = true,
})
)
hl.bind(
mod .. " + SHIFT + up",
hl.dsp.window.move({ workspace = "r-1", follow = true, group_aware = true })
)
hl.bind(
mod .. " + SHIFT + down",
hl.dsp.window.move({ workspace = "r+1", follow = true, group_aware = true })
)
-- Move windows around with Mod+Ctrl+arrows (mirrors niri's Mod+Ctrl binds).
hl.bind(mod .. " + CTRL + right", hl.dsp.window.move({ direction = "right", follow = true }))
hl.bind(mod .. " + CTRL + left", hl.dsp.window.move({ direction = "left", follow = true }))
hl.bind(mod .. " + CTRL + up", hl.dsp.window.move({ workspace = "r-1", follow = true }))
hl.bind(mod .. " + CTRL + down", hl.dsp.window.move({ workspace = "r+1", follow = true }))
hl.bind(mod .. " + F", hl.dsp.window.fullscreen({ mode = "maximized", action = "toggle" }))
hl.bind(
mod .. " + CTRL + right",
hl.dsp.window.move({ direction = "right", into_or_create_group = "right" })
)
hl.bind(
mod .. " + CTRL + left",
hl.dsp.window.move({ direction = "left", into_or_create_group = "left" })
)
hl.bind(
mod .. " + CTRL + up",
hl.dsp.window.move({ direction = "up", into_or_create_group = "up" })
)
hl.bind(
mod .. " + CTRL + down",
hl.dsp.window.move({ direction = "down", into_or_create_group = "down" })
)
hl.bind(mod .. " + G", hl.dsp.group.toggle())
hl.bind(mod .. " + SHIFT + F", hl.dsp.window.fullscreen({ mode = "fullscreen", action = "toggle" }))
hl.bind(mod .. " + V", hl.dsp.window.float({ action = "toggle" }))
hl.bind(mod .. " + C", hl.dsp.layout("focus current"))
@@ -91,6 +46,7 @@ hl.bind(mod .. " + minus", hl.dsp.layout("colresize -0.1"))
hl.bind(mod .. " + equal", hl.dsp.layout("colresize +0.1"))
hl.bind(mod .. " + SHIFT + minus", hl.dsp.window.resize({ x = 0, y = -50, relative = true }))
hl.bind(mod .. " + SHIFT + equal", hl.dsp.window.resize({ x = 0, y = 50, relative = true }))
hl.bind(mod .. " + CTRL + F", hl.dsp.layout("fit active"))
-- =========================
-- Screenshots & Recording
@@ -134,12 +90,24 @@ hl.bind(
-- Dismiss all notifications
hl.bind(mod .. " + ALT + L", hl.dsp.exec_cmd("noctalia msg notification-clear-active"))
-- Media & volume (mirrors niri's Mod+Shift block)
hl.bind(mod .. " + SHIFT + right", hl.dsp.exec_cmd("playerctl next"))
hl.bind(mod .. " + SHIFT + left", hl.dsp.exec_cmd("playerctl previous"))
hl.bind(mod .. " + SHIFT + up", hl.dsp.exec_cmd("playerctl volume 0.1+"), { locked = true })
hl.bind(mod .. " + SHIFT + down", hl.dsp.exec_cmd("playerctl volume 0.1-"), { locked = true })
hl.bind(mod .. " + SHIFT + Space", hl.dsp.exec_cmd("playerctl play-pause"), { locked = true })
hl.bind(
mod .. " + SHIFT + M",
hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle"),
{ locked = true }
)
hl.bind(
mod .. " + SHIFT + S",
hl.dsp.exec_cmd("wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle"),
{ locked = true }
)
-- Media & brightness
-- hl.bind(mod .. " + M + up", hl.dsp.exec_cmd("noctalia msg volume-up"))
-- hl.bind(mod .. " + M + down", hl.dsp.exec_cmd("noctalia msg volume-down"))
-- hl.bind(mod .. " + M + right", hl.dsp.exec_cmd("playerctl next"))
-- hl.bind(mod .. " + M + left", hl.dsp.exec_cmd("playerctl previous"))
-- hl.bind(mod .. " + M + Space", hl.dsp.exec_cmd("playerctl play-pause"))
hl.bind("XF86AudioPause", hl.dsp.exec_cmd("playerctl play-pause"))
hl.bind("XF86AudioRaiseVolume", hl.dsp.exec_cmd("noctalia msg volume-up"), { locked = true })
hl.bind("XF86AudioLowerVolume", hl.dsp.exec_cmd("noctalia msg volume-down"), { locked = true })
@@ -62,7 +62,6 @@ hl.window_rule({
match = { float = true },
name = "float-style",
no_screen_share = true,
xray = true,
})
hl.window_rule({
match = { class = "^chrome-.*" },
+1 -1
View File
@@ -13,6 +13,7 @@ binds {
Mod+Z { spawn "flatpak" "run" "app.zen_browser.zen"; }
Mod+B { spawn "chromium"; }
Mod+E { spawn "wofi-emoji"; }
Mod+Alt+E { spawn-sh "zeditor ~/.config/niri/shared/binds.kdl"; }
Mod+Q { close-window; }
// =========================
@@ -34,7 +35,6 @@ binds {
Mod+Ctrl+Up { move-window-to-workspace-up; }
Mod+Ctrl+Down { move-window-to-workspace-down; }
Mod+W { toggle-column-tabbed-display; }
Mod+F { maximize-column; }
Mod+Shift+F { fullscreen-window; }
Mod+Ctrl+F { reset-window-height; }