public gitea + nixarchy work
This commit is contained in:
1 parent
8bd66c9975
commit
a7c1b1cc0c
29 files changed
+1192
-97
No files matched your search
+15
-14
@@ -12,20 +12,21 @@ these cases where the source subdir and `~/.config` target differ.
|
||||
|
||||
## Contents
|
||||
|
||||
| Path | Description |
|
||||
| -------------------- | ------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| `niri/` | Niri Wayland compositor config (legacy shared location — will be removed after hosts migrate to `<hostName>/niri/`) |
|
||||
| `fwbook/niri/` | Niri config for `fwbook`; linked to `~/.config/niri` by the `skyg.nixos.desktop.tiler.niri` module (mirrors the hyprland pattern) |
|
||||
| `fwbook/hypr/` | Hyprland config for `fwbook` (scrolling layout + noctalia); linked to `~/.config/hypr` |
|
||||
| `hl-fwdesk/hypr/` | Hyprland config for `hl-fwdesk` (Steam console); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` |
|
||||
| `hl-pi1/hypr/` | Hyprland config for `hl-pi1` (clock box); linked to `~/.config/hypr` |
|
||||
| `hl-fws1/hypr/` | Hyprland config for `hl-fws1` (remote slim desktop); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` |
|
||||
| `hl-pi1/quickshell/` | Quickshell configs for `hl-pi1` (full-screen clock + calendar); linked to `~/.config/quickshell` |
|
||||
| `fwbook/quickshell/` | Quickshell configs for `fwbook` (scrolling overview); linked to `~/.config/quickshell` |
|
||||
| `extra.nu` | Extra NuShell config sourced at shell startup |
|
||||
| `fwbook.knsv` | fwbook-specific Kanshi display profile |
|
||||
| `hypr-types/hl.lua` | Shared EmmyLua type stubs for the `hl` global; each host's Hyprland `.luarc.json` points here via `workspace.library` |
|
||||
| `pki/` | Public certs of the lab internal CA (`lab-ca.crt` + issued leaves), managed by `skyg ca`; **not** symlinked to `~/.config` — see `pki/ABOUTME.md` |
|
||||
| Path | Description |
|
||||
| -------------------- | ----------------------------------------------------------------------------------------------------------------------------------------------------- |
|
||||
| `niri/` | Niri Wayland compositor config (legacy shared location — will be removed after hosts migrate to `<hostName>/niri/`) |
|
||||
| `fwbook/niri/` | Niri config for `fwbook`; linked to `~/.config/niri` by the `skyg.nixos.desktop.tiler.niri` module (mirrors the hyprland pattern) |
|
||||
| `fwbook/hypr/` | Hyprland config for `fwbook` (scrolling layout; Omarchy/nixarchy shell — noctalia binds+rules parked in `conf/noctalia/`); linked to `~/.config/hypr` |
|
||||
| `fwbook/omarchy/` | Omarchy (nixarchy) shell config for `fwbook` (`shell.json`, plugins, backgrounds); linked to `~/.config/omarchy` by `hosts/fwbook/packages.nix` |
|
||||
| `hl-fwdesk/hypr/` | Hyprland config for `hl-fwdesk` (Steam console); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` |
|
||||
| `hl-pi1/hypr/` | Hyprland config for `hl-pi1` (clock box); linked to `~/.config/hypr` |
|
||||
| `hl-fws1/hypr/` | Hyprland config for `hl-fws1` (remote slim desktop); **baked into the build** via `mountAsSource`, linked to `~/.config/hypr` |
|
||||
| `hl-pi1/quickshell/` | Quickshell configs for `hl-pi1` (full-screen clock + calendar); linked to `~/.config/quickshell` |
|
||||
| `fwbook/quickshell/` | Quickshell configs for `fwbook` (scrolling overview); linked to `~/.config/quickshell` |
|
||||
| `extra.nu` | Extra NuShell config sourced at shell startup |
|
||||
| `fwbook.knsv` | fwbook-specific Kanshi display profile |
|
||||
| `hypr-types/hl.lua` | Shared EmmyLua type stubs for the `hl` global; each host's Hyprland `.luarc.json` points here via `workspace.library` |
|
||||
| `pki/` | Public certs of the lab internal CA (`lab-ca.crt` + issued leaves), managed by `skyg ca`; **not** symlinked to `~/.config` — see `pki/ABOUTME.md` |
|
||||
|
||||
## Notes
|
||||
|
||||
|
||||
@@ -26,11 +26,15 @@ split under `conf/` and pulled in with `require()`.
|
||||
|
||||
- **Layout:** Hyprland's native `scrolling` layout (0.54+), no plugins required.
|
||||
This mirrors niri's scrollable-tiling model. See `conf/general.lua`.
|
||||
- **Shell:** noctalia (`noctalia-shell`), autostarted in `conf/autostart.lua`
|
||||
via `hl.on("hyprland.start", ...)`. Launched with `setpriv --ambient-caps -all`
|
||||
to drop capabilities inherited from the compositor; without it, D-Bus calls
|
||||
inside quickshell-based apps fail silently (hyprwm/Hyprland#14844). There is
|
||||
intentionally no waybar/hyprpanel.
|
||||
- **Shell:** the Omarchy (nixarchy) shell, launched as `omarchy-launch-shell` in
|
||||
`conf/autostart.lua` via `hl.on("hyprland.start", ...)`. Launched with
|
||||
`setpriv --ambient-caps -all` to drop capabilities inherited from the
|
||||
compositor; without it, D-Bus calls inside quickshell-based apps fail silently
|
||||
(hyprwm/Hyprland#14844). There is intentionally no waybar/hyprpanel. Noctalia's
|
||||
binds and window rule are parked in `conf/noctalia/` (not required by
|
||||
`hyprland.lua`); see `hosts/fwbook/packages.nix` for the shell package wiring.
|
||||
`conf/omarchy/` maps the same keys to the Omarchy shell's commands
|
||||
(`omarchy-menu` / `omarchy-shell`).
|
||||
- **Keybinds:** `conf/keybindings.lua` mirrors `configs/niri/shared/binds.kdl`
|
||||
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` ->
|
||||
@@ -69,8 +73,12 @@ hypr/
|
||||
├── monitors.lua # hl.monitor per display (from configs/niri/.../outputs.kdl)
|
||||
├── 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; Mod+Ctrl moves windows, Mod+Shift is media/volume
|
||||
└── autostart.lua # noctalia + Quickshell overview via setpriv (hl.on hyprland.start; drops compositor caps)
|
||||
├── keybindings.lua # niri binds, scrolling dispatchers (hl.bind/hl.dsp); Mod+Tab toggles the Quickshell overview; Mod+Ctrl moves windows, Mod+Shift is media/volume
|
||||
├── autostart.lua # Omarchy (nixarchy) shell + Quickshell overview via setpriv (hl.on hyprland.start; drops compositor caps)
|
||||
├── omarchy/ # Omarchy shell binds (index/binds.lua) — same keys as
|
||||
│ # noctalia, mapped to omarchy-menu / omarchy-shell
|
||||
└── noctalia/ # parked noctalia binds + window rule (index/binds/window.lua);
|
||||
# not required by hyprland.lua while the Omarchy shell runs
|
||||
```
|
||||
|
||||
## Bindings without a clean 1:1 niri mapping
|
||||
|
||||
@@ -2,7 +2,8 @@
|
||||
-- Autostart
|
||||
-- =========================
|
||||
local function autostart()
|
||||
hl.exec_cmd("setpriv --ambient-caps -all -- noctalia")
|
||||
-- hl.exec_cmd("setpriv --ambient-caps -all -- noctalia")
|
||||
hl.exec_cmd("setpriv --ambient-caps -all -- omarchy-launch-shell")
|
||||
hl.exec_cmd("setpriv --ambient-caps -all -- qs -c overview")
|
||||
hl.exec_cmd("setpriv --ambient-caps -all -- skygqts workspace-manager")
|
||||
end
|
||||
|
||||
@@ -37,7 +37,6 @@ hl.bind(mod .. " + F", hl.dsp.window.fullscreen({ mode = "maximized", action = "
|
||||
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"))
|
||||
hl.bind("ALT + TAB", hl.dsp.exec_cmd("noctalia msg window-switcher toggle"))
|
||||
|
||||
-- =========================
|
||||
-- Resizing
|
||||
@@ -75,20 +74,11 @@ hl.bind(mod .. " + ALT + up", hl.dsp.window.move({ monitor = "u" }))
|
||||
hl.bind(mod .. " + mouse:272", hl.dsp.window.drag(), { mouse = true })
|
||||
hl.bind(mod .. " + mouse:273", hl.dsp.window.resize(), { mouse = true })
|
||||
|
||||
-- =========================
|
||||
-- Noctalia shell (mirrors configs/niri/noctalia/binds.kdl)
|
||||
-- =========================
|
||||
hl.bind(mod .. " + Space", hl.dsp.exec_cmd("noctalia msg panel-toggle launcher"))
|
||||
hl.bind(mod .. " + S", hl.dsp.exec_cmd("noctalia msg panel-toggle control-center"))
|
||||
hl.bind(mod .. " + comma", hl.dsp.exec_cmd("noctalia msg settings-toggle"))
|
||||
|
||||
-- Clipboard history
|
||||
hl.bind(
|
||||
mod .. " + ALT + P",
|
||||
hl.dsp.exec_cmd('rofi -modi "clipboard:greenclip print" -show clipboard')
|
||||
)
|
||||
-- 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"))
|
||||
|
||||
@@ -0,0 +1,16 @@
|
||||
-- =========================
|
||||
-- Noctalia shell binds
|
||||
-- =========================
|
||||
-- Moved out of conf/keybindings.lua. Mirrors configs/niri/noctalia/binds.kdl.
|
||||
local mod = "SUPER"
|
||||
|
||||
-- Window switcher
|
||||
hl.bind("ALT + TAB", hl.dsp.exec_cmd("noctalia msg window-switcher toggle"))
|
||||
|
||||
-- Launcher / control center / settings
|
||||
hl.bind(mod .. " + Space", hl.dsp.exec_cmd("noctalia msg panel-toggle launcher"))
|
||||
hl.bind(mod .. " + S", hl.dsp.exec_cmd("noctalia msg panel-toggle control-center"))
|
||||
hl.bind(mod .. " + comma", hl.dsp.exec_cmd("noctalia msg settings-toggle"))
|
||||
|
||||
-- Dismiss all notifications
|
||||
hl.bind(mod .. " + ALT + L", hl.dsp.exec_cmd("noctalia msg notification-clear-active"))
|
||||
@@ -0,0 +1,2 @@
|
||||
require("conf.noctalia.binds")
|
||||
require("conf.noctalia.window")
|
||||
@@ -0,0 +1,11 @@
|
||||
-- =========================
|
||||
-- Noctalia window rule
|
||||
-- =========================
|
||||
-- Moved out of conf/window-rules.lua.
|
||||
hl.window_rule({
|
||||
match = { class = "dev.noctalia.Noctalia" },
|
||||
float = true,
|
||||
name = "float-noctalia",
|
||||
center = true,
|
||||
size = { "(monitor_w*0.5)", "(monitor_h*0.9)" },
|
||||
})
|
||||
@@ -0,0 +1,25 @@
|
||||
-- =========================
|
||||
-- Omarchy (nixarchy) shell binds
|
||||
-- =========================
|
||||
-- Same keys as the parked noctalia binds (conf/noctalia/binds.lua), mapped to
|
||||
-- the Omarchy shell's commands. The full set is `omarchy-menu toggle <route>`
|
||||
-- (root, apps, system, theme, background, capture, hardware, share, reminder)
|
||||
-- and `omarchy-shell shell toggle omarchy.<panel>` (audio, bluetooth, network,
|
||||
-- monitor, power, clipboard, emojis, ...).
|
||||
local mod = "SUPER"
|
||||
|
||||
-- Launcher / menu (noctalia: panel-toggle launcher)
|
||||
hl.bind(mod .. " + Space", hl.dsp.exec_cmd("omarchy-menu toggle"))
|
||||
|
||||
-- System menu (noctalia: panel-toggle control-center)
|
||||
hl.bind(mod .. " + S", hl.dsp.exec_cmd("omarchy-menu toggle system"))
|
||||
|
||||
-- Theme menu (noctalia: settings-toggle)
|
||||
hl.bind(mod .. " + comma", hl.dsp.exec_cmd("omarchy-menu toggle theme"))
|
||||
|
||||
-- Dismiss all notifications (noctalia: notification-clear-active)
|
||||
hl.bind(mod .. " + ALT + L", hl.dsp.exec_cmd("omarchy-shell notifications dismissAll"))
|
||||
|
||||
-- ALT + TAB (noctalia's window switcher) has no Omarchy equivalent, so it is
|
||||
-- left out. The shell's own defaults (SUPER + CTRL + A/B/D for audio/bluetooth/
|
||||
-- monitor, SUPER + ESCAPE for the system menu) are not bound here.
|
||||
@@ -0,0 +1,6 @@
|
||||
-- =========================
|
||||
-- Omarchy (nixarchy) shell
|
||||
-- =========================
|
||||
-- Keybinds for the Omarchy shell, mirroring the noctalia binds parked in
|
||||
-- conf/noctalia/. Required from hyprland.lua.
|
||||
require("conf.omarchy.binds")
|
||||
@@ -55,13 +55,6 @@ hl.window_rule({
|
||||
float = true,
|
||||
name = "float-satty",
|
||||
})
|
||||
hl.window_rule({
|
||||
match = { class = "dev.noctalia.Noctalia" },
|
||||
float = true,
|
||||
name = "float-noctalia",
|
||||
center = true,
|
||||
size = { "(monitor_w*0.5)", "(monitor_h*0.9)" },
|
||||
})
|
||||
hl.window_rule({
|
||||
match = { float = true },
|
||||
name = "float-style",
|
||||
|
||||
@@ -10,3 +10,5 @@ require("conf/inputs")
|
||||
require("conf/window-rules")
|
||||
require("conf/keybindings")
|
||||
require("conf/autostart")
|
||||
require("conf.omarchy.index")
|
||||
-- require("conf.noctalia.index")
|
||||
Reference in new issue
Block a user