diff --git a/configs/ABOUTME.md b/configs/ABOUTME.md index 12815fa..8b3439c 100644 --- a/configs/ABOUTME.md +++ b/configs/ABOUTME.md @@ -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 `/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 `/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 diff --git a/configs/fwbook/hypr/ABOUTME.md b/configs/fwbook/hypr/ABOUTME.md index 2cd90d9..2c2dd8b 100644 --- a/configs/fwbook/hypr/ABOUTME.md +++ b/configs/fwbook/hypr/ABOUTME.md @@ -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 diff --git a/configs/fwbook/hypr/conf/autostart.lua b/configs/fwbook/hypr/conf/autostart.lua index 9da70e1..44ea4fe 100644 --- a/configs/fwbook/hypr/conf/autostart.lua +++ b/configs/fwbook/hypr/conf/autostart.lua @@ -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 diff --git a/configs/fwbook/hypr/conf/keybindings.lua b/configs/fwbook/hypr/conf/keybindings.lua index 1d4cc55..0d54064 100644 --- a/configs/fwbook/hypr/conf/keybindings.lua +++ b/configs/fwbook/hypr/conf/keybindings.lua @@ -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")) diff --git a/configs/fwbook/hypr/conf/noctalia/binds.lua b/configs/fwbook/hypr/conf/noctalia/binds.lua new file mode 100644 index 0000000..11108ac --- /dev/null +++ b/configs/fwbook/hypr/conf/noctalia/binds.lua @@ -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")) diff --git a/configs/fwbook/hypr/conf/noctalia/index.lua b/configs/fwbook/hypr/conf/noctalia/index.lua new file mode 100644 index 0000000..3ff5b89 --- /dev/null +++ b/configs/fwbook/hypr/conf/noctalia/index.lua @@ -0,0 +1,2 @@ +require("conf.noctalia.binds") +require("conf.noctalia.window") diff --git a/configs/fwbook/hypr/conf/noctalia/window.lua b/configs/fwbook/hypr/conf/noctalia/window.lua new file mode 100644 index 0000000..78d4e4a --- /dev/null +++ b/configs/fwbook/hypr/conf/noctalia/window.lua @@ -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)" }, +}) diff --git a/configs/fwbook/hypr/conf/omarchy/binds.lua b/configs/fwbook/hypr/conf/omarchy/binds.lua new file mode 100644 index 0000000..6ebd2f8 --- /dev/null +++ b/configs/fwbook/hypr/conf/omarchy/binds.lua @@ -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 ` +-- (root, apps, system, theme, background, capture, hardware, share, reminder) +-- and `omarchy-shell shell toggle omarchy.` (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. diff --git a/configs/fwbook/hypr/conf/omarchy/index.lua b/configs/fwbook/hypr/conf/omarchy/index.lua new file mode 100644 index 0000000..166034c --- /dev/null +++ b/configs/fwbook/hypr/conf/omarchy/index.lua @@ -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") diff --git a/configs/fwbook/hypr/conf/window-rules.lua b/configs/fwbook/hypr/conf/window-rules.lua index 3519ecc..5e26312 100644 --- a/configs/fwbook/hypr/conf/window-rules.lua +++ b/configs/fwbook/hypr/conf/window-rules.lua @@ -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", diff --git a/configs/fwbook/hypr/hyprland.lua b/configs/fwbook/hypr/hyprland.lua index e5af201..e8fe61e 100644 --- a/configs/fwbook/hypr/hyprland.lua +++ b/configs/fwbook/hypr/hyprland.lua @@ -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") diff --git a/flake.lock b/flake.lock index 3897cc5..c9b1b77 100644 --- a/flake.lock +++ b/flake.lock @@ -105,6 +105,43 @@ "type": "github" } }, + "aquamarine_3": { + "inputs": { + "hyprutils": [ + "nixarchy", + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "nixarchy", + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1788444081, + "narHash": "sha256-I8i97p9WBQaZQyyBaHFMt8e01VfgfFZSaO+vAUd0u0A=", + "owner": "hyprwm", + "repo": "aquamarine", + "rev": "36b66db4ddd708ad19f5db850af6a478d8a19b2a", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "aquamarine", + "type": "github" + } + }, "base16": { "inputs": { "fromYaml": "fromYaml" @@ -483,6 +520,28 @@ "type": "github" } }, + "disko_2": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1768920986, + "narHash": "sha256-CNzzBsRhq7gg4BMBuTDObiWDH/rFYHEuDRVOwCcwXw4=", + "owner": "nix-community", + "repo": "disko", + "rev": "de5708739256238fb912c62f03988815db89ec9a", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "latest", + "repo": "disko", + "type": "github" + } + }, "dms": { "inputs": { "dank-qml-common": "dank-qml-common_2", @@ -672,6 +731,22 @@ "type": "github" } }, + "flake-compat_9": { + "flake": false, + "locked": { + "lastModified": 1767039857, + "narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=", + "owner": "NixOS", + "repo": "flake-compat", + "rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { "inputs": { "nixpkgs-lib": [ @@ -1118,6 +1193,50 @@ "type": "github" } }, + "home-manager_4": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "zen-browser", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788229478, + "narHash": "sha256-G0F2rFORVcFkEvVdE/qWQTnYekIc77YP5/vRF9nZlxU=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "1dc2d1f720ab17fc7981e087346bf54b26d284b1", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "hypr-rdp": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1789012155, + "narHash": "sha256-9s5DeiKzmdbXMnGBmXOSxTdaAp7jBxyd7IgVLxZ717Q=", + "owner": "MuNeNiCK", + "repo": "hypr-rdp", + "rev": "8744778de2eb9add74224d57fac399aba6039a26", + "type": "github" + }, + "original": { + "owner": "MuNeNiCK", + "ref": "v0.1.6", + "repo": "hypr-rdp", + "type": "github" + } + }, "hyprcursor": { "inputs": { "hyprlang": [ @@ -1147,6 +1266,38 @@ "type": "github" } }, + "hyprcursor_2": { + "inputs": { + "hyprlang": [ + "nixarchy", + "hyprland", + "hyprlang" + ], + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464181, + "narHash": "sha256-2alOMkLjXANh7unkZnYnCF2K2rApZaOLMoQ3o+VX2CY=", + "owner": "hyprwm", + "repo": "hyprcursor", + "rev": "e4ed7c08123df5af460a0a70961380cbfb872f76", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprcursor", + "type": "github" + } + }, "hyprgraphics": { "inputs": { "hyprutils": [ @@ -1205,6 +1356,38 @@ "type": "github" } }, + "hyprgraphics_3": { + "inputs": { + "hyprutils": [ + "nixarchy", + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464367, + "narHash": "sha256-k58p4wbzIXWyRWrW84pP8tD+iaZSSYiiM+fr0Auk4oU=", + "owner": "hyprwm", + "repo": "hyprgraphics", + "rev": "7c895c44e3ca6d28ed68ddd80ec02b02b925e7fc", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprgraphics", + "type": "github" + } + }, "hyprland": { "inputs": { "aquamarine": "aquamarine", @@ -1281,6 +1464,59 @@ "type": "github" } }, + "hyprland-guiutils_2": { + "inputs": { + "aquamarine": [ + "nixarchy", + "hyprland", + "aquamarine" + ], + "hyprgraphics": [ + "nixarchy", + "hyprland", + "hyprgraphics" + ], + "hyprlang": [ + "nixarchy", + "hyprland", + "hyprlang" + ], + "hyprtoolkit": "hyprtoolkit_3", + "hyprutils": [ + "nixarchy", + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "nixarchy", + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464504, + "narHash": "sha256-7sHwM86KILQyHDHDuE2SDBlQ2jvZ0EW3hY7sW009/cg=", + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "rev": "4c30cf3097ea963c0e250749ee0c59f8b08816d6", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-guiutils", + "type": "github" + } + }, "hyprland-protocols": { "inputs": { "nixpkgs": [ @@ -1306,6 +1542,63 @@ "type": "github" } }, + "hyprland-protocols_2": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1772460177, + "narHash": "sha256-/6G/MsPvtn7bc4Y32pserBT/Z4SUUdBd4XYJpOEKVR4=", + "owner": "hyprwm", + "repo": "hyprland-protocols", + "rev": "1cb6db5fd6bb8aee419f4457402fa18293ace917", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprland-protocols", + "type": "github" + } + }, + "hyprland_2": { + "inputs": { + "aquamarine": "aquamarine_3", + "hyprcursor": "hyprcursor_2", + "hyprgraphics": "hyprgraphics_3", + "hyprland-guiutils": "hyprland-guiutils_2", + "hyprland-protocols": "hyprland-protocols_2", + "hyprlang": "hyprlang_4", + "hyprutils": "hyprutils_3", + "hyprwayland-scanner": "hyprwayland-scanner_3", + "hyprwire": "hyprwire_3", + "nixpkgs": "nixpkgs_12", + "pre-commit-hooks": "pre-commit-hooks_3", + "systems": "systems_4", + "xdph": "xdph_2" + }, + "locked": { + "lastModified": 1788777480, + "narHash": "sha256-F33tKTtFrhst7rc5P20BkpgAJo4Qp3JQeyaHeVxZNJQ=", + "owner": "hyprwm", + "repo": "Hyprland", + "rev": "7ebf13abb3c391604c60c9f627c7a403bcec8d17", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "Hyprland", + "type": "github" + } + }, "hyprlang": { "inputs": { "hyprutils": [ @@ -1396,6 +1689,38 @@ "type": "github" } }, + "hyprlang_4": { + "inputs": { + "hyprutils": [ + "nixarchy", + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464129, + "narHash": "sha256-339AkTlpMYSIvFuG0rnR+8Yg4/AZKeJalshJavlnKfg=", + "owner": "hyprwm", + "repo": "hyprlang", + "rev": "9508458be316a0d70d37ebed1ab725ccd10411ff", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprlang", + "type": "github" + } + }, "hyprlauncher": { "inputs": { "aquamarine": "aquamarine_2", @@ -1516,6 +1841,65 @@ "type": "github" } }, + "hyprtoolkit_3": { + "inputs": { + "aquamarine": [ + "nixarchy", + "hyprland", + "hyprland-guiutils", + "aquamarine" + ], + "hyprgraphics": [ + "nixarchy", + "hyprland", + "hyprland-guiutils", + "hyprgraphics" + ], + "hyprlang": [ + "nixarchy", + "hyprland", + "hyprland-guiutils", + "hyprlang" + ], + "hyprutils": [ + "nixarchy", + "hyprland", + "hyprland-guiutils", + "hyprutils" + ], + "hyprwayland-scanner": [ + "nixarchy", + "hyprland", + "hyprland-guiutils", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "nixarchy", + "hyprland", + "hyprland-guiutils", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "hyprland-guiutils", + "systems" + ] + }, + "locked": { + "lastModified": 1785930473, + "narHash": "sha256-DitTu625BhEYpZjtjxtGpjrEJwPwW+X/+jJvhSZNSJM=", + "owner": "hyprwm", + "repo": "hyprtoolkit", + "rev": "af515b69dfbe366dc7873aa1475cb2f4db3ebad7", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprtoolkit", + "type": "github" + } + }, "hyprutils": { "inputs": { "nixpkgs": [ @@ -1566,6 +1950,33 @@ "type": "github" } }, + "hyprutils_3": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786903207, + "narHash": "sha256-QTwMqLLONRhv9iz6CVeuX6BqQNQCIqI8hL/cPYlR/24=", + "owner": "hyprwm", + "repo": "hyprutils", + "rev": "6cf50415e06dc6bd9f1252f1b745eac6b4a1cc39", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprutils", + "type": "github" + } + }, "hyprwayland-scanner": { "inputs": { "nixpkgs": [ @@ -1616,6 +2027,33 @@ "type": "github" } }, + "hyprwayland-scanner_3": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464033, + "narHash": "sha256-QM8Qe4/L8lpdVN4bgwahmi+jyyc4fisseDMe4afcDxA=", + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "rev": "62e62c1ca23da17612c6890d4ad2064f575643db", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwayland-scanner", + "type": "github" + } + }, "hyprwire": { "inputs": { "hyprutils": [ @@ -1674,6 +2112,83 @@ "type": "github" } }, + "hyprwire_3": { + "inputs": { + "hyprutils": [ + "nixarchy", + "hyprland", + "hyprutils" + ], + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1786464294, + "narHash": "sha256-ZQsZ2WvBdkboCIyh8LStDPdAIARmxzn0XMNxxoOhjPE=", + "owner": "hyprwm", + "repo": "hyprwire", + "rev": "4ce7cd6b6128c1ac41caf23c58a30a26b327f9dd", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "hyprwire", + "type": "github" + } + }, + "mcp-servers-nix": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1789141018, + "narHash": "sha256-0ap34rhjfjXsFV+xfXd56WGxfrbc9QWNUrEqzh1L+co=", + "owner": "natsukium", + "repo": "mcp-servers-nix", + "rev": "11fe2419e274bb223a86dddc9e4803b01ad359e8", + "type": "github" + }, + "original": { + "owner": "natsukium", + "repo": "mcp-servers-nix", + "rev": "11fe2419e274bb223a86dddc9e4803b01ad359e8", + "type": "github" + } + }, + "microvm": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "nixpkgs" + ], + "spectrum": "spectrum" + }, + "locked": { + "lastModified": 1788518164, + "narHash": "sha256-vY71mJCu5NgR+n+V4zpcRzZc6KL6SU9WmyMGzd8kYIA=", + "owner": "microvm-nix", + "repo": "microvm.nix", + "rev": "fdfc1821a0eb76e44a13d206b72e6ca6961fbb7c", + "type": "github" + }, + "original": { + "owner": "microvm-nix", + "repo": "microvm.nix", + "rev": "fdfc1821a0eb76e44a13d206b72e6ca6961fbb7c", + "type": "github" + } + }, "my-nixpkgs": { "locked": { "lastModified": 1789765536, @@ -1747,6 +2262,22 @@ "type": "github" } }, + "nix-flatpak_2": { + "locked": { + "lastModified": 1767983141, + "narHash": "sha256-7ZCulYUD9RmJIDULTRkGLSW1faMpDlPKcbWJLYHoXcs=", + "owner": "gmodena", + "repo": "nix-flatpak", + "rev": "440818969ac2cbd77bfe025e884d0aa528991374", + "type": "github" + }, + "original": { + "owner": "gmodena", + "ref": "v0.7.0", + "repo": "nix-flatpak", + "type": "github" + } + }, "nix-index-database": { "inputs": { "nixpkgs": [ @@ -1767,6 +2298,28 @@ "type": "github" } }, + "nix-index-database_2": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788679149, + "narHash": "sha256-iDPCFLce2G+unG3VHIKMrKznSMEwCHNeeuzdWk0YxRM=", + "owner": "nix-community", + "repo": "nix-index-database", + "rev": "2ddfaa93f2c13a586c673df4c0da0d580f4674a4", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "2026-09-06-071918", + "repo": "nix-index-database", + "type": "github" + } + }, "nix_2": { "inputs": { "flake-parts": "flake-parts_2", @@ -1834,6 +2387,47 @@ "type": "github" } }, + "nixarchy": { + "inputs": { + "disko": "disko_2", + "home-manager": [ + "home-manager" + ], + "home-manager-stable": [ + "home-manager" + ], + "hypr-rdp": "hypr-rdp", + "hyprland": "hyprland_2", + "mcp-servers-nix": "mcp-servers-nix", + "microvm": "microvm", + "nix-flatpak": "nix-flatpak_2", + "nix-index-database": "nix-index-database_2", + "nixi": "nixi", + "nixos-hardware": "nixos-hardware", + "nixpkgs": [ + "nixpkgs" + ], + "nixpkgs-stable": "nixpkgs-stable", + "omarchy": "omarchy", + "sops-nix": "sops-nix", + "systems": "systems_5", + "zen-browser": "zen-browser" + }, + "locked": { + "lastModified": 1789720648, + "narHash": "sha256-cFF/8WW/jJU6lMW4+n8k3QCTI4GD8MQhB0zZbjrHxhw=", + "owner": "olafkfreund", + "repo": "nixarchy", + "rev": "87b9734b97eedae332d4142ca8c1fea899581bbe", + "type": "github" + }, + "original": { + "owner": "olafkfreund", + "ref": "v4.0.4-1", + "repo": "nixarchy", + "type": "github" + } + }, "nixd": { "inputs": { "flake-parts": [ @@ -1862,6 +2456,28 @@ "type": "github" } }, + "nixi": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1789718549, + "narHash": "sha256-S8Hm0f/KXpwCkro150CiWcaCHDOIbYKmlacnkUf3anM=", + "owner": "olafkfreund", + "repo": "nixi-nixarchy", + "rev": "6b5878a427e0bb007fa7c673b4786ad80bf270fd", + "type": "github" + }, + "original": { + "owner": "olafkfreund", + "repo": "nixi-nixarchy", + "rev": "6b5878a427e0bb007fa7c673b4786ad80bf270fd", + "type": "github" + } + }, "nixlib": { "locked": { "lastModified": 1736643958, @@ -1901,7 +2517,28 @@ }, "nixos-hardware": { "inputs": { - "nixpkgs": "nixpkgs_12" + "nixpkgs": [ + "nixarchy", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788335262, + "narHash": "sha256-3jBEq8avfzlrsY4UpW4d5TOmm7ocseZfnitEJhqauyc=", + "owner": "NixOS", + "repo": "nixos-hardware", + "rev": "44d95795ee2d475b3d687325e26dcf4ca9104557", + "type": "github" + }, + "original": { + "owner": "NixOS", + "repo": "nixos-hardware", + "type": "github" + } + }, + "nixos-hardware_2": { + "inputs": { + "nixpkgs": "nixpkgs_13" }, "locked": { "lastModified": 1790321948, @@ -1998,6 +2635,22 @@ "type": "github" } }, + "nixpkgs-stable": { + "locked": { + "lastModified": 1789009968, + "narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "d58a46e3bc02d91ebe04667f8397752a749c0024", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-26.05", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-unstable": { "locked": { "lastModified": 1790046670, @@ -2045,6 +2698,22 @@ } }, "nixpkgs_12": { + "locked": { + "lastModified": 1788404924, + "narHash": "sha256-lhEhY8X5EgkQ/eg6IFz4cc8jRuSYSvnxx1al7d1dvZ0=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "0968519e14f7aa7d3e9b389682bd74d2b51c8ce8", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-unstable", + "repo": "nixpkgs", + "type": "github" + } + }, + "nixpkgs_13": { "locked": { "lastModified": 1789546076, "narHash": "sha256-vWkSk5bbfTqdtMoSgD9FshACO8JCvXTFi+3cqEp0mH0=", @@ -2057,7 +2726,7 @@ "url": "https://channels.nixos.org/nixos-unstable/nixexprs.tar.xz" } }, - "nixpkgs_13": { + "nixpkgs_14": { "locked": { "lastModified": 1789009968, "narHash": "sha256-GB16oaxpsrnGNnGIE+0uYBqMRzB9X6FYDUvjvnJAYew=", @@ -2274,6 +2943,23 @@ "type": "github" } }, + "omarchy": { + "flake": false, + "locked": { + "lastModified": 1789450452, + "narHash": "sha256-nstxM+CP6al2I4N1LAKdYBvJ4tytD1m8jssiCD7PXTY=", + "owner": "basecamp", + "repo": "omarchy", + "rev": "c668141e9c42b13c80c9ca4ea108e11708c5e8a5", + "type": "github" + }, + "original": { + "owner": "basecamp", + "ref": "v4.0.4", + "repo": "omarchy", + "type": "github" + } + }, "pre-commit-hooks": { "inputs": { "flake-compat": "flake-compat_3", @@ -2319,6 +3005,29 @@ "type": "github" } }, + "pre-commit-hooks_3": { + "inputs": { + "flake-compat": "flake-compat_9", + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788267358, + "narHash": "sha256-nt+lUqYVpc9Y6JeMd2WmXzCDojasdadKo0mWcluvY2Y=", + "owner": "cachix", + "repo": "git-hooks.nix", + "rev": "27555e2624241fb116b49095df4caaee85a25691", + "type": "github" + }, + "original": { + "owner": "cachix", + "repo": "git-hooks.nix", + "type": "github" + } + }, "pyproject-build-systems": { "inputs": { "nixpkgs": [ @@ -2389,13 +3098,14 @@ "nix-darwin": "nix-darwin", "nix-flatpak": "nix-flatpak", "nix-index-database": "nix-index-database", - "nixos-hardware": "nixos-hardware", - "nixpkgs": "nixpkgs_13", + "nixarchy": "nixarchy", + "nixos-hardware": "nixos-hardware_2", + "nixpkgs": "nixpkgs_14", "nixpkgs-unstable": "nixpkgs-unstable", "noctalia": "noctalia", "skygqts": "skygqts", "stylix": "stylix", - "systems": "systems_5", + "systems": "systems_7", "tether": "tether" } }, @@ -2479,6 +3189,44 @@ "url": "ssh://gitea@gitea.app.internal:22/ari/skygqts.git" } }, + "sops-nix": { + "inputs": { + "nixpkgs": [ + "nixarchy", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1786629091, + "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", + "owner": "Mic92", + "repo": "sops-nix", + "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", + "type": "github" + }, + "original": { + "owner": "Mic92", + "repo": "sops-nix", + "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", + "type": "github" + } + }, + "spectrum": { + "flake": false, + "locked": { + "lastModified": 1785761586, + "narHash": "sha256-MWOMVqJJERwjQGgRIv8d6rlEBqbLM3VZWxHkNKIIZNw=", + "ref": "refs/heads/main", + "rev": "a7762d6f54b40560dd5255ce902e6e6a5d980fe9", + "revCount": 1416, + "type": "git", + "url": "https://spectrum-os.org/git/spectrum" + }, + "original": { + "type": "git", + "url": "https://spectrum-os.org/git/spectrum" + } + }, "stylix": { "inputs": { "base16": "base16", @@ -2492,7 +3240,7 @@ "nixpkgs" ], "nur": "nur", - "systems": "systems_4", + "systems": "systems_6", "tinted-kitty": "tinted-kitty", "tinted-schemes": "tinted-schemes", "tinted-tmux": "tinted-tmux", @@ -2559,6 +3307,36 @@ } }, "systems_4": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_5": { + "locked": { + "lastModified": 1689347949, + "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=", + "owner": "nix-systems", + "repo": "default-linux", + "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default-linux", + "type": "github" + } + }, + "systems_6": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2573,7 +3351,7 @@ "type": "github" } }, - "systems_5": { + "systems_7": { "locked": { "lastModified": 1681028828, "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", @@ -2781,6 +3559,76 @@ "repo": "xdg-desktop-portal-hyprland", "type": "github" } + }, + "xdph_2": { + "inputs": { + "hyprland-protocols": [ + "nixarchy", + "hyprland", + "hyprland-protocols" + ], + "hyprlang": [ + "nixarchy", + "hyprland", + "hyprlang" + ], + "hyprutils": [ + "nixarchy", + "hyprland", + "hyprutils" + ], + "hyprwayland-scanner": [ + "nixarchy", + "hyprland", + "hyprwayland-scanner" + ], + "nixpkgs": [ + "nixarchy", + "hyprland", + "nixpkgs" + ], + "systems": [ + "nixarchy", + "hyprland", + "systems" + ] + }, + "locked": { + "lastModified": 1788025068, + "narHash": "sha256-TBqronrrc/F2Ry/E37d/1TLldDLJDFNSwvJjgk+cXzU=", + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "rev": "ba31964ee42b56bcb0d3b78a64ead5d8a1c3c6f6", + "type": "github" + }, + "original": { + "owner": "hyprwm", + "repo": "xdg-desktop-portal-hyprland", + "type": "github" + } + }, + "zen-browser": { + "inputs": { + "home-manager": "home-manager_4", + "nixpkgs": [ + "nixarchy", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1788672837, + "narHash": "sha256-FgtxJIiNZfqNkLeIz30/CDE6v6gbou0MhuiFLt2En7w=", + "owner": "0xc000022070", + "repo": "zen-browser-flake", + "rev": "ec2c94c95846c36130edb9872a8ca4c203028c84", + "type": "github" + }, + "original": { + "owner": "0xc000022070", + "ref": "ec2c94c95846", + "repo": "zen-browser-flake", + "type": "github" + } } }, "root": "root", diff --git a/flake.nix b/flake.nix index 40fba6f..b8da087 100644 --- a/flake.nix +++ b/flake.nix @@ -40,6 +40,16 @@ url = "github:noctalia-dev/noctalia-shell"; inputs.nixpkgs.follows = "nixpkgs"; }; + # Nixarchy — Omarchy vendored for NixOS. Used only on fwbook, for the + # Omarchy shell package (no nixarchy modules; see hosts/fwbook/packages.nix). + nixarchy = { + url = "github:olafkfreund/nixarchy/v4.0.4-1"; + inputs.nixpkgs.follows = "nixpkgs"; + # nixarchy's own home-manager checkouts are unused here; follow ours so + # they don't sit in the lock. + inputs.home-manager.follows = "home-manager"; + inputs.home-manager-stable.follows = "home-manager"; + }; # Hermes hermes-agent.url = "github:NousResearch/hermes-agent"; # Flatpak @@ -100,6 +110,7 @@ , dms , dank-greeter , noctalia + , nixarchy , git-hooks , nix-index-database , agenix @@ -142,8 +153,6 @@ portainer-tls-key = ./secrets/portainer-tls-key.age; stack1 = ./secrets/stack1.age; stack2 = ./secrets/stack2.age; - nitw-gc = ./secrets/nitw-gc.age; - nitw-gc-home = ./secrets/nitw-gc-home.age; portainer-agent-minipc3 = ./secrets/portainer-agent-minipc3.age; portainer-cert = ./configs/pki/portainer.app.internal.crt; }; @@ -155,6 +164,7 @@ dms dank-greeter noctalia + nixarchy nix-index-database hermes-agent skygqts diff --git a/hosts/fwbook/packages.nix b/hosts/fwbook/packages.nix index 34e85a6..4a6087b 100644 --- a/hosts/fwbook/packages.nix +++ b/hosts/fwbook/packages.nix @@ -1,16 +1,58 @@ -{ pkgs, unstablePkgs, ai-usagebar, hermes-agent, ... }: +{ pkgs, unstablePkgs, ai-usagebar, hermes-agent, nixarchy, skygUtils, config, ... }: +let + # Omarchy (nixarchy) shell, hand-wired — no nixarchy modules. The shell is + # launched from configs/fwbook/hypr/conf/autostart.lua (omarchy-launch-shell). + # + # Workaround for an upstream bug in nixarchy v4.0.4-1: the omarchy package's + # installPhase is one '' string whose least-indented lines are the shell-quoted + # omarchy-theme-set patterns (indent 4), so Nix dedents the whole string by 4 + # and the inline `python3 -c '...'` menu check stays indented -> IndentationError. + # Wrap that one invocation so its code is dedented before Python sees it. + dedent = "${pkgs.gawk}/bin/awk 'BEGIN{m=9999} {l[NR]=$0; match($0,/^ */); if ($0 ~ /[^ ]/ && RLENGTH configs/fwbook/omarchy (same pattern as hypr/noctalia). + system.userActivationScripts.omarchyConfig.text = + skygUtils.makeHyperlinkScriptToConfigs { + filePath = "fwbook/omarchy"; + targetPath = "omarchy"; + configSource = "/home/${config.skyg.user.name}/nixos-setup/configs"; + }; + environment.systemPackages = - let - gdk = pkgs.google-cloud-sdk.withExtraComponents ( - with pkgs.google-cloud-sdk.components; - [ - gke-gcloud-auth-plugin - kubectl - ] - ); - in - (with pkgs; [ + [ omarchy ] + ++ omarchyRuntime + # Theme application: omarchy-theme-set-gnome writes gsettings, and every + # theme names a Yaru icon variant. + ++ (with pkgs; [ + glib + gsettings-desktop-schemas + gnome-themes-extra + yaru-theme + adwaita-icon-theme + ]) + ++ (with pkgs; [ grim slurp wl-clipboard diff --git a/hosts/hl-fwdesk/services/hermenix.nix b/hosts/hl-fwdesk/services/hermenix.nix index 40d5bab..b8bcb35 100644 --- a/hosts/hl-fwdesk/services/hermenix.nix +++ b/hosts/hl-fwdesk/services/hermenix.nix @@ -36,7 +36,7 @@ in { address = "10.0.101.3"; port = 3000; } { address = "10.0.101.3"; port = 8080; } { address = "10.0.101.3"; port = 9102; } - { address = "10.0.10.6"; port = 3000; } + { address = "10.0.101.8"; port = 3000; } ]; publish = [ { hostPort = ports.hermes; guestPort = 8642; } diff --git a/hosts/hl-minipc1/services/default.nix b/hosts/hl-minipc1/services/default.nix index aa50c5e..eb84fe1 100644 --- a/hosts/hl-minipc1/services/default.nix +++ b/hosts/hl-minipc1/services/default.nix @@ -5,7 +5,7 @@ ./docker-registry.nix ./gitea.nix ./gitea-container.nix - ./nitw-gc.nix + ./public-gitea.nix ./acme.nix ./portainer.nix ./iu.nix diff --git a/hosts/hl-minipc1/services/nitw-gc.nix b/hosts/hl-minipc1/services/nitw-gc.nix deleted file mode 100644 index b0528de..0000000 --- a/hosts/hl-minipc1/services/nitw-gc.nix +++ /dev/null @@ -1,14 +0,0 @@ -{ config, skyg-secrets, ... }: -{ - # Secret app. The whole container definition lives in the agenix secret - # (see secrets/nitw-gc.age); this file only points at it. - age.secrets.nitw-gc.file = skyg-secrets.nitw-gc; - age.secrets.nitw-gc-home.file = skyg-secrets.nitw-gc-home; - - skyg.nixos.common.container-services.nitw-gc = { - enable = true; - autoUpdate.enable = true; - composeFile = config.age.secrets.nitw-gc.path; - networks.lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose; - }; -} diff --git a/hosts/hl-minipc1/services/public-gitea-home.tmpl b/hosts/hl-minipc1/services/public-gitea-home.tmpl new file mode 100644 index 0000000..9a7655f --- /dev/null +++ b/hosts/hl-minipc1/services/public-gitea-home.tmpl @@ -0,0 +1,100 @@ +{{template "base/head" .}} +
+
+ +
+ +

Ariel Sosnovsky's Personal Projects and stuff

+
+ + + +
+
+{{template "base/footer" .}} diff --git a/hosts/hl-minipc1/services/public-gitea.nix b/hosts/hl-minipc1/services/public-gitea.nix new file mode 100644 index 0000000..75617a8 --- /dev/null +++ b/hosts/hl-minipc1/services/public-gitea.nix @@ -0,0 +1,34 @@ +{ config, ... }: +let + app = config.skyg.internalNetworkingMap.apps.public-gitea; + domain = "gitea.skyg.ca"; +in +{ + skyg.nixos.common.container-services.public-gitea = { + enable = true; + autoUpdate.enable = true; + networks.lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose; + volumes.public-gitea-data = { + driver = "local"; + driver_opts = { + type = "nfs"; + o = "addr=tnas1.lab.internal,rw,nfsvers=4.0,nolock,hard,noatime"; + device = ":/mnt/SmallG/public-gitea-data"; + }; + }; + services.public-gitea = { + image = "gitea/gitea:latest"; + networks.lan.ipv4_address = app.ip; + environment = { + GITEA_CUSTOM = "/data/custom"; + GITEA__server__DOMAIN = domain; + GITEA__server__ROOT_URL = "https://${domain}/"; + GITEA__server__HTTP_PORT = "80"; + GITEA__service__DISABLE_REGISTRATION = "true"; + }; + volumes = [ "public-gitea-data:/data" ]; + files."/data/custom/templates/home.tmpl" = + builtins.readFile ./public-gitea-home.tmpl; + }; + }; +} diff --git a/hosts/hl-minipc3/services/acme.nix b/hosts/hl-minipc3/services/acme.nix index b658c77..195ee95 100644 --- a/hosts/hl-minipc3/services/acme.nix +++ b/hosts/hl-minipc3/services/acme.nix @@ -10,5 +10,9 @@ postRun = "${pkgs.docker}/bin/docker restart caddy-caddy-1"; orderBefore = [ "container-services-caddy" ]; }; + certs."gitea.skyg.ca" = { + postRun = "${pkgs.docker}/bin/docker restart caddy-caddy-1"; + orderBefore = [ "container-services-caddy" ]; + }; }; } diff --git a/hosts/hl-minipc3/services/caddy.nix b/hosts/hl-minipc3/services/caddy.nix index f8e3dd5..b8f7e5a 100644 --- a/hosts/hl-minipc3/services/caddy.nix +++ b/hosts/hl-minipc3/services/caddy.nix @@ -4,7 +4,9 @@ let nvr = config.skyg.internalNetworkingMap.apps.nvr; jellyfin = config.skyg.internalNetworkingMap.apps.jellyfin; portainer = config.skyg.internalNetworkingMap.apps.portainer; + publicGitea = config.skyg.internalNetworkingMap.apps.public-gitea; certDomain = "home.sosnovsky.ca"; + giteaCertDomain = "gitea.skyg.ca"; in { skyg.nixos.common.container-services.caddy = { @@ -27,10 +29,16 @@ in tls /etc/caddy/tls/fullchain.pem /etc/caddy/tls/key.pem reverse_proxy ${portainer.ip}:9000 } + gitea.skyg.ca { + tls /etc/caddy/tls/gitea/fullchain.pem /etc/caddy/tls/gitea/key.pem + reverse_proxy ${publicGitea.ip}:80 + } ''; volumes = [ "/var/lib/acme/${certDomain}/fullchain.pem:/etc/caddy/tls/fullchain.pem:ro" "/var/lib/acme/${certDomain}/key.pem:/etc/caddy/tls/key.pem:ro" + "/var/lib/acme/${giteaCertDomain}/fullchain.pem:/etc/caddy/tls/gitea/fullchain.pem:ro" + "/var/lib/acme/${giteaCertDomain}/key.pem:/etc/caddy/tls/gitea/key.pem:ro" ]; }; }; diff --git a/modules/core/ABOUTME.md b/modules/core/ABOUTME.md index 5a0fbeb..c502a8b 100644 --- a/modules/core/ABOUTME.md +++ b/modules/core/ABOUTME.md @@ -26,8 +26,8 @@ core/ `skyg.home-manager.{version,extraImports}`. When `skyg.user.enable` is set it wires up Home Manager for both `root` and the named user using the functions in `modules/home`. - **Substituters** (`nix-substituters.nix`): the standing list of caches (local `minipc1` - and `bigbox2` caches, cache.nixos.org, cachix caches for cuda/cosmic/ai/noctalia, flox, - devenv) and the trusted public keys. Extra entries can be appended per-host via + and `bigbox2` caches, cache.nixos.org, cachix caches for cuda/cosmic/ai/noctalia/nixarchy, + flox, devenv) and the trusted public keys. Extra entries can be appended per-host via `skyg.core.substituters.{urls,keys}`. - **Lab CA trust** (`lab-ca.nix`): adds `configs/pki/lab-ca.crt` to `security.pki.certificateFiles` so every machine trusts the lab internal CA diff --git a/modules/core/nix-substituters.nix b/modules/core/nix-substituters.nix index ccd7c5f..411e0f9 100644 --- a/modules/core/nix-substituters.nix +++ b/modules/core/nix-substituters.nix @@ -32,6 +32,7 @@ in "https://ai.cachix.org" "https://noctalia.cachix.org" "https://hyprland.cachix.org" + "https://nixarchy.cachix.org" ] ++ cfg.urls; nix.settings.trusted-substituters = [ "https://cache.flox.dev" @@ -48,6 +49,7 @@ in "cosmic.cachix.org-1:Dya9IyXD4xdBehWjrkPv6rtxpmMdRel02smYzA85dPE=" "noctalia.cachix.org-1:pCOR47nnMEo5thcxNDtzWpOxNFQsBRglJzxWPp3dkU4=" "hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc=" + "nixarchy.cachix.org-1:05JOuIlsQOWY2/5DQMq7JEA1hwlhgvmMWowMfka8mMM=" "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M=" ] ++ cfg.keys; nix.settings.trusted-users = [ "root" skygUser.name ]; diff --git a/modules/main.nix b/modules/main.nix index 05fbcd9..06828e6 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -108,7 +108,7 @@ in buzz = { ip = "10.0.101.3"; aliases = [ "buzz.home.sosnovsky.ca" ]; }; audiobooks = { ip = "10.0.101.4"; }; gitea = { ip = "10.0.101.8"; }; - nitw-gc = { ip = "10.0.101.9"; }; + public-gitea = { ip = "10.0.101.9"; }; jellyfin = { ip = "10.0.101.5"; }; nvr = { ip = "10.0.101.6"; }; portainer = { ip = "10.0.101.241"; }; @@ -118,6 +118,7 @@ in "nvr.home.sosnovsky.ca" "jellyfin.home.sosnovsky.ca" "portainer.home.sosnovsky.ca" + "gitea.skyg.ca" ]; }; }; diff --git a/modules/nixos/desktop/tiler/ABOUTME.md b/modules/nixos/desktop/tiler/ABOUTME.md index fe3248c..393bd25 100644 --- a/modules/nixos/desktop/tiler/ABOUTME.md +++ b/modules/nixos/desktop/tiler/ABOUTME.md @@ -12,7 +12,7 @@ tiler/ ├── niri.nix # skyg.nixos.desktop.tiler.niri — niri compositor (sets tiler.enable) ├── niri-touchscreen-gestures.nix # skyg.nixos.desktop.tiler.niri.touchscreen-gestures — touchscreen swipe support ├── hyprland.nix # skyg.nixos.desktop.tiler.hyprland — Hyprland via flake (sets tiler.enable) -├── noctalia.nix # skyg.nixos.desktop.tiler.noctalia — noctalia shell + per-host config symlink; libqalculate pinned from nixpkgs-unstable (stable 5.10.0 segfaults on teardown) +├── noctalia.nix # skyg.nixos.desktop.tiler.noctalia — noctalia shell + per-host config symlink; libqalculate pinned from nixpkgs-unstable (stable 5.10.0 segfaults on teardown). Still installed for niri; fwbook's Hyprland runs the Omarchy (nixarchy) shell instead ├── quickshell.nix # skyg.nixos.desktop.tiler.quickshell — qs package + per-host config symlink └── swww.nix # skyg.nixos.desktop.tiler.background — swww/waypaper wallpaper tools ``` @@ -57,8 +57,9 @@ skyg.nixos.desktop.tiler.background.enable `hyprland.nix` runs the latest Hyprland from the `hyprland` flake input (package + `xdg-desktop-portal-hyprland` kept in sync), launched via UWSM. It: -- Installs the noctalia shell and autostart-friendly tools (grim/slurp/satty, - wofi/rofi, wl-clipboard). There is no waybar/hyprpanel — the shell is noctalia. +- Installs autostart-friendly tools (grim/slurp/satty, wofi/rofi, wl-clipboard). + There is no waybar/hyprpanel — the shell is noctalia, except on hosts that run + the Omarchy (nixarchy) shell from their own autostart (`fwbook`; see below). - `noctalia.nix` overrides Noctalia's `libqalculate` to the `nixpkgs-unstable` build (5.12.0). Stable 26.05 ships 5.10.0, which segfaults in `clear_randstate` on every teardown where the launcher calculator was never used (fixed upstream @@ -97,6 +98,16 @@ The shell/utility apps that were previously installed unconditionally with Hyprl whose Hyprland config actually invokes these (e.g. `fwbook`) enable the flag; a pure clock box (`hl-pi1`) does not. +### Omarchy (nixarchy) shell — fwbook + +`fwbook` installs the Omarchy (nixarchy) shell package directly — no nixarchy +NixOS/HM modules — in `hosts/fwbook/packages.nix` (the `omarchy` package + its +runtime deps + `OMARCHY_PATH` + `userActivationScripts.omarchyConfig` linking +`~/.config/omarchy` -> `configs/fwbook/omarchy`), and launches it via +`omarchy-launch-shell` from `configs/fwbook/hypr/conf/autostart.lua` instead of +noctalia. Noctalia stays installed (niri is untouched) but its binds and float +window rule are parked, un-required, under `configs/fwbook/hypr/conf/noctalia/`. + ## Conventions - Don't set `tiler.enable` directly — enable a compositor and let it flip the shared switch. diff --git a/secrets.nix b/secrets.nix index c9273d2..5d97098 100644 --- a/secrets.nix +++ b/secrets.nix @@ -35,10 +35,6 @@ in "secrets/stack1.age".publicKeys = [ ari minipc2 ]; "secrets/stack2.age".publicKeys = [ ari minipc2 ]; - # nitw-gc container definition + landing page — minipc1 - "secrets/nitw-gc.age".publicKeys = [ ari minipc1 ]; - "secrets/nitw-gc-home.age".publicKeys = [ ari minipc1 ]; - # portainer agent envs "secrets/portainer-agent-bigbox1.age".publicKeys = [ ari bigbox1 ]; "secrets/portainer-agent-minipc1.age".publicKeys = [ ari minipc1 ]; diff --git a/secrets/ABOUTME.md b/secrets/ABOUTME.md index f0f9c9b..2832eea 100644 --- a/secrets/ABOUTME.md +++ b/secrets/ABOUTME.md @@ -4,18 +4,16 @@ Age-encrypted secret files managed with [agenix](https://github.com/ryantm/ageni ## Contents -| File | Description | -| ----------------------------- | -------------------------------------------------- | -| `dns-addresses.conf.age` | DNS address overrides for the dnsmasq module | -| `glmain.json.age` | OpenWrt router credentials/config for `glmain` | -| `hermes-env.age` | Hermes agent env vars (fwbook + fwdesk) | -| `hermes-env` | Unencrypted working copy of `hermes-env.age` | -| `iu-project.age` | iu-project credentials (minipc1) | -| `nitw-gc.age` | Compose definition for the secret app (minipc1) | -| `nitw-gc-home.age` | Landing-page template for the secret app (minipc1) | -| `portainer-agent-bigbox1.age` | Portainer agent env vars (bigbox1) | -| `stack1.age` | Compose definition for stack1 (minipc2) | -| `stack2.age` | Compose definition for stack2 (minipc2) | +| File | Description | +| ----------------------------- | ---------------------------------------------- | +| `dns-addresses.conf.age` | DNS address overrides for the dnsmasq module | +| `glmain.json.age` | OpenWrt router credentials/config for `glmain` | +| `hermes-env.age` | Hermes agent env vars (fwbook + fwdesk) | +| `hermes-env` | Unencrypted working copy of `hermes-env.age` | +| `iu-project.age` | iu-project credentials (minipc1) | +| `portainer-agent-bigbox1.age` | Portainer agent env vars (bigbox1) | +| `stack1.age` | Compose definition for stack1 (minipc2) | +| `stack2.age` | Compose definition for stack2 (minipc2) | The authoritative list of names + authorized keys is `secrets.nix` in the repo root. diff --git a/secrets/nitw-gc-home.age b/secrets/nitw-gc-home.age deleted file mode 100644 index 23cf09e..0000000 Binary files a/secrets/nitw-gc-home.age and /dev/null differ diff --git a/secrets/nitw-gc.age b/secrets/nitw-gc.age deleted file mode 100644 index d14f035..0000000 Binary files a/secrets/nitw-gc.age and /dev/null differ