Compare commits
10
Commits
09e2e03423
...
a7c1b1cc0c
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
a7c1b1cc0c | ||
|
|
8bd66c9975 | ||
|
|
3dfc1643e6 | ||
|
|
2f281b354a | ||
|
|
eb213e56e5 | ||
|
|
35b66f5435 | ||
|
|
aa81ecdb3d | ||
|
|
d514939e37 | ||
|
|
4f396d93c4 | ||
|
|
045702e909 |
No files matched your search
+2
-1
@@ -14,7 +14,7 @@ bin/
|
||||
├── cmds.nu # All subcommand implementations (NuShell — source of truth); commands only
|
||||
├── helpers.nu # Shared helpers: REPO_ROOT const + internal functions used by commands
|
||||
├── profile.nu # Profile helpers and tab-completion data
|
||||
└── types.nu # Type definitions
|
||||
└── types.nu # Type definitions + tab-completion data
|
||||
```
|
||||
|
||||
## Key Commands
|
||||
@@ -40,6 +40,7 @@ bin/
|
||||
| `skyg compare-secret <secret>` | Diff the working copy against the stored secret |
|
||||
| `skyg ca init` | Generate the lab root CA: key → `secrets/lab-ca-key.age`, cert → `configs/pki/lab-ca.crt` (see `configs/pki/ABOUTME.md`) |
|
||||
| `skyg ca issue <domain> --for <host>` | Mint a TLS leaf cert signed by the lab CA: cert → `configs/pki/<domain>.crt`, key → `secrets/<name>-tls-key.age`. Auto-registers missing `secrets.nix` entries. |
|
||||
| `skyg render html-tpl <file>` | Render a Gitea `.tmpl` (swaps `base/head`/`base/footer` for a minimal shell, strips `{{ … }}`) and serve it on `127.0.0.1` for preview. Foreground — Ctrl+C to stop. `<file>` tab-completes from `**/*.tmpl`. |
|
||||
|
||||
## Agent Note
|
||||
|
||||
|
||||
@@ -607,3 +607,28 @@ export def "skyg pkgs update" [
|
||||
git --no-pager diff pkgs/ | print
|
||||
}
|
||||
}
|
||||
|
||||
# Render a Gitea HTML template and serve it locally for preview.
|
||||
# Runs in the foreground — Ctrl+C to stop. Wrap it in nohup yourself to detach.
|
||||
export def "skyg render html-tpl" [
|
||||
file: string@html-tpl-files # Template to render (e.g. hosts/hl-minipc1/services/gitea-home.tmpl)
|
||||
--port: int = 8787 # Port for the local preview server
|
||||
] {
|
||||
cd $REPO_ROOT
|
||||
let src = ($file | path expand)
|
||||
if not ($src | path exists) {
|
||||
error make {msg: $"Template not found: ($file)"}
|
||||
}
|
||||
|
||||
let out_dir = ".tmp/render-html-tpl"
|
||||
mkdir $out_dir
|
||||
let name = ($src | path basename | str replace -r '\.tmpl$' '')
|
||||
let out = $"($out_dir)/($name).html"
|
||||
render-html-tpl $src $out
|
||||
|
||||
print $"Rendered ($file) -> ($out)"
|
||||
print $"Preview: http://127.0.0.1:($port)/($name).html"
|
||||
print "Press Ctrl+C to stop."
|
||||
|
||||
^python3 -m http.server $port --bind 127.0.0.1 --directory $out_dir
|
||||
}
|
||||
@@ -19,3 +19,18 @@ export def ensure-secret-entry [secret_path: string, recipients: list<string>] {
|
||||
($new_lines | str join "\n") + "\n" | save -f $file
|
||||
print $"📝 Registered ($secret_path) in secrets.nix — review with git diff"
|
||||
}
|
||||
|
||||
# Render a Gitea-style Go template to a standalone HTML file for local preview.
|
||||
# Swaps the base/head + base/footer includes for a minimal shell and drops any
|
||||
# remaining {{ ... }} directives so the page opens in a plain browser.
|
||||
export def render-html-tpl [src: string, out: string] {
|
||||
let head = '<!DOCTYPE html>
|
||||
<html lang="en"><head><meta charset="utf-8"><meta name="viewport" content="width=device-width, initial-scale=1"><title>Template preview</title><style>html,body{margin:0;background:#f6f8fa;font-family:system-ui,-apple-system,"Segoe UI",Roboto,sans-serif;color:#1f2328;}</style></head><body>'
|
||||
let foot = '</body></html>'
|
||||
# Read via external cat — `open` is aliased to xdg-open in some Nu configs.
|
||||
^cat $src
|
||||
| str replace -a '{{template "base/head" .}}' $head
|
||||
| str replace -a '{{template "base/footer" .}}' $foot
|
||||
| str replace -a -r '\{\{[^}]*\}\}' ''
|
||||
| save -f $out
|
||||
}
|
||||
@@ -29,3 +29,11 @@ export def updatable-pkgs [] {
|
||||
glob "pkgs/*/update.sh"
|
||||
| each {|f| $f | path dirname | path basename }
|
||||
}
|
||||
|
||||
# Gitea HTML templates, for `skyg render html-tpl` tab-completion.
|
||||
export def html-tpl-files [] {
|
||||
cd $REPO_ROOT
|
||||
glob "**/*.tmpl"
|
||||
| each {|f| $f | path relative-to $REPO_ROOT }
|
||||
| sort
|
||||
}
|
||||
+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
|
||||
|
||||
@@ -1,5 +1,5 @@
|
||||
-- =========================
|
||||
-- General / Layout — Liquid Glass
|
||||
-- General / Layout
|
||||
-- =========================
|
||||
hl.config({
|
||||
general = {
|
||||
@@ -22,10 +22,9 @@ hl.config({
|
||||
},
|
||||
|
||||
scrolling = {
|
||||
column_width = 0.5,
|
||||
fullscreen_on_one_column = true,
|
||||
focus_fit_method = 0,
|
||||
follow_focus = true,
|
||||
focus_fit_method = 1,
|
||||
},
|
||||
|
||||
cursor = {
|
||||
|
||||
@@ -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")
|
||||
Generated
+879
-31
File diff suppressed because it is too large.
Load diff
@@ -1,9 +1,9 @@
|
||||
{
|
||||
inputs = {
|
||||
# my apps
|
||||
skygqts.url = "git+ssh://gitea@minipc1.lab.internal:22/ari/skygqts.git";
|
||||
skygqts.url = "git+ssh://gitea@gitea.app.internal:22/ari/skygqts.git";
|
||||
skygqts.inputs.nixpkgs.follows = "nixpkgs";
|
||||
hermenix.url = "git+ssh://gitea@minipc1.lab.internal:22/ari/hermenix.git";
|
||||
hermenix.url = "git+ssh://gitea@gitea.app.internal:22/ari/hermenix.git";
|
||||
# Hardware
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware/master";
|
||||
systems.url = "github:nix-systems/default";
|
||||
@@ -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
|
||||
@@ -153,6 +164,7 @@
|
||||
dms
|
||||
dank-greeter
|
||||
noctalia
|
||||
nixarchy
|
||||
nix-index-database
|
||||
hermes-agent
|
||||
skygqts
|
||||
|
||||
+14
-14
@@ -28,20 +28,20 @@ hosts/
|
||||
|
||||
## Managed Hosts
|
||||
|
||||
| Folder | Host | Role |
|
||||
| ------------- | ---------- | ------------------------------------------------------------------------ |
|
||||
| `fwbook/` | fwbook | Framework 13 AMD — personal laptop / daily driver |
|
||||
| `hl-fwdesk/` | hl-fwdesk | Framework Desktop AI Max 300 — AI workstation |
|
||||
| `hl-fws1/` | hl-fws1 | Framework 11th Intel — K3s server node |
|
||||
| `hl-bigbox1/` | hl-bigbox1 | AI/compute server (NVIDIA + AMD) |
|
||||
| `hl-bigbox2/` | hl-bigbox2 | NFS storage server |
|
||||
| `hl-minipc1/` | hl-minipc1 | Core infra: Gitea, nix-serve, registry, Buzz (docker, `buzz-manage` CLI) |
|
||||
| `hl-minipc2/` | hl-minipc2 | Container/media server |
|
||||
| `hl-minipc3/` | hl-minipc3 | K3s worker node |
|
||||
| `hl-pi1/` | hl-pi1 | Raspberry Pi CM4 (aarch64) — headless server, SSH only |
|
||||
| `hl-pi2/` | hl-pi2 | Raspberry Pi 4 (aarch64) — headless server, SSH only |
|
||||
| `hl-terra1/` | hl-terra1 | NFS storage + Jellyfin backup |
|
||||
| `iso/` | iso | Bootable NixOS installer image |
|
||||
| Folder | Host | Role |
|
||||
| ------------- | ---------- | -------------------------------------------------------------------------------------------------- |
|
||||
| `fwbook/` | fwbook | Framework 13 AMD — personal laptop / daily driver |
|
||||
| `hl-fwdesk/` | hl-fwdesk | Framework Desktop AI Max 300 — AI workstation |
|
||||
| `hl-fws1/` | hl-fws1 | Framework 11th Intel — K3s server node |
|
||||
| `hl-bigbox1/` | hl-bigbox1 | AI/compute server (NVIDIA + AMD) |
|
||||
| `hl-bigbox2/` | hl-bigbox2 | NFS storage server |
|
||||
| `hl-minipc1/` | hl-minipc1 | Core infra: Gitea (native or containerized), nix-serve, registry, Buzz (docker, `buzz-manage` CLI) |
|
||||
| `hl-minipc2/` | hl-minipc2 | Container/media server |
|
||||
| `hl-minipc3/` | hl-minipc3 | K3s worker node; central Caddy reverse-proxy (`*.home.sosnovsky.ca`) |
|
||||
| `hl-pi1/` | hl-pi1 | Raspberry Pi CM4 (aarch64) — headless server, SSH only |
|
||||
| `hl-pi2/` | hl-pi2 | Raspberry Pi 4 (aarch64) — headless server, SSH only |
|
||||
| `hl-terra1/` | hl-terra1 | NFS storage + Jellyfin backup |
|
||||
| `iso/` | iso | Bootable NixOS installer image |
|
||||
|
||||
## Rules
|
||||
|
||||
|
||||
@@ -49,7 +49,7 @@
|
||||
enable = true;
|
||||
configLink.enable = false;
|
||||
touchscreen-gestures = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
touchOutput = "eDP-1";
|
||||
};
|
||||
};
|
||||
|
||||
@@ -20,9 +20,16 @@
|
||||
"rtc_cmos.use_acpi_alarm=1"
|
||||
"acpi.prefer_microsoft_dsm_guid=1"
|
||||
"amd_pstate=active"
|
||||
# Disable the old and new display power-saving features (PSR and Panel Replay).
|
||||
"amdgpu.dcdebugmask=0x410"
|
||||
# arms the hard-lockup detector
|
||||
"nmi_watchdog=1"
|
||||
];
|
||||
boot.kernel.sysctl = {
|
||||
"kernel.panic_on_oops" = 1;
|
||||
"kernel.panic" = 60; # currently 0 = hang forever after panic
|
||||
"kernel.softlockup_panic" = 1; # CPU stuck >20s in kernel -> panic
|
||||
"kernel.hardlockup_panic" = 1; # CPU wedged with IRQs off -> panic
|
||||
"kernel.sysrq" = 1; # currently 16 (sync only)
|
||||
};
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.plymouth = {
|
||||
enable = true;
|
||||
|
||||
@@ -7,6 +7,19 @@
|
||||
|
||||
boot.binfmt.emulatedSystems = [ "aarch64-linux" ];
|
||||
|
||||
# Reserve RAM for pstore/ramoops so a panic/oops backtrace survives a hard
|
||||
# reset even if the disk/journal never gets a chance to sync. Archived to
|
||||
# /var/lib/systemd/pstore on next boot by systemd-pstore.service.
|
||||
boot.kernelParams = [
|
||||
"reserve_mem=8M:4096:ramoops"
|
||||
"ramoops.mem_name=ramoops"
|
||||
"ramoops.console_size=0x400000"
|
||||
"ramoops.record_size=0x200000"
|
||||
"ramoops.dump_oops=1"
|
||||
"ramoops.ftrace_size=0"
|
||||
"ramoops.pmsg_size=0"
|
||||
];
|
||||
|
||||
services.fprintd.enable = true;
|
||||
services.libinput.enable = true;
|
||||
services.yubikey-agent.enable = true;
|
||||
|
||||
+55
-11
@@ -1,16 +1,58 @@
|
||||
{ pkgs, unstablePkgs, ai-usagebar, ... }:
|
||||
{ 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<m) m=RLENGTH} END{for(i=1;i<=NR;i++) print substr(l[i],m+1)}'";
|
||||
omarchy = ((pkgs.extend nixarchy.overlays.default).omarchy).overrideAttrs (old: {
|
||||
installPhase = builtins.replaceStrings
|
||||
[ "python3 -c '" "' $menu\n" ]
|
||||
[ "python3 -c \"$(printf '%s' '" "' | ${dedent})\" $menu\n" ]
|
||||
old.installPhase;
|
||||
});
|
||||
# The shell's runtime deps, minus hyprland (we keep the flake's Hyprland).
|
||||
omarchyRuntime = builtins.filter
|
||||
(d: !(pkgs.lib.hasPrefix "hyprland-" (d.name or "")))
|
||||
omarchy.passthru.runtimeDeps;
|
||||
gdk = pkgs.google-cloud-sdk.withExtraComponents (
|
||||
with pkgs.google-cloud-sdk.components;
|
||||
[
|
||||
gke-gcloud-auth-plugin
|
||||
kubectl
|
||||
]
|
||||
);
|
||||
in
|
||||
{
|
||||
# The shell resolves everything through OMARCHY_PATH.
|
||||
environment.sessionVariables.OMARCHY_PATH = "${omarchy}/share/omarchy";
|
||||
environment.sessionVariables.OMARCHY_SCREENSHOT_EDITOR = "satty-edit";
|
||||
|
||||
# ~/.config/omarchy -> 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
|
||||
@@ -70,6 +112,7 @@
|
||||
betterdiscordctl
|
||||
discord
|
||||
signal-desktop
|
||||
telegram-desktop
|
||||
|
||||
python313
|
||||
python314
|
||||
@@ -119,6 +162,7 @@
|
||||
herdr
|
||||
superset-desktop
|
||||
ai-usagebar.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.default
|
||||
|
||||
skygqts
|
||||
hermenix
|
||||
|
||||
@@ -1,46 +0,0 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/6302dadf-57b7-4213-a7a5-2ba97f941e49";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/mnt/Data" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/b1c83d70-4d81-4d0f-a61a-38a78b943bd8";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/BBF9-1744";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [{
|
||||
device = "/var/lib/swapfile";
|
||||
size = 32 * 1024;
|
||||
}];
|
||||
boot.kernel.sysctl =
|
||||
{
|
||||
"kernel.unprivileged_userns_clone" = 1;
|
||||
};
|
||||
zramSwap.enable = true;
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
@@ -27,7 +27,10 @@
|
||||
};
|
||||
networkDrives.enable = true;
|
||||
};
|
||||
|
||||
skyg.nixos.common.containers.networks.ipvlanLab = {
|
||||
enable = true;
|
||||
parent = "enp6s0";
|
||||
};
|
||||
services.displayManager.defaultSession = "gnome";
|
||||
services.displayManager.autoLogin = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,4 +1,7 @@
|
||||
{ ... }:
|
||||
{ config, ... }:
|
||||
let
|
||||
app = config.skyg.internalNetworkingMap.apps.jellyfin;
|
||||
in
|
||||
{
|
||||
skyg.nixos.common.container-services.jellyfin = {
|
||||
enable = true;
|
||||
|
||||
@@ -1,64 +0,0 @@
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ahci" "ohci_pci" "ehci_pci" "pata_atiixp" "xhci_pci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
boot.loader.grub = {
|
||||
enable = true;
|
||||
device = "/dev/sda"; # install GRUB to MBR
|
||||
efiSupport = false;
|
||||
};
|
||||
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/5bf4a352-412f-47e1-9455-68f3aa629722";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=@root" "compress=zstd" "noatime" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/ccc80fd2-b38b-412b-9988-12a3194a5b57";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/var" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/5bf4a352-412f-47e1-9455-68f3aa629722";
|
||||
fsType = "btrfs";
|
||||
options = [ "compress=zstd" "subvol=@var" "noatime" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/8cd6e560-4db9-4cf1-8048-27a7c6308965";
|
||||
fsType = "btrfs";
|
||||
options = [ "compress=zstd" "subvol=@nix" "noatime" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/6f4b2adc-5818-41ea-a4ba-720fb96b8f98";
|
||||
fsType = "btrfs";
|
||||
options = [ "compress=zstd" "subvol=@home" "noatime" ];
|
||||
};
|
||||
|
||||
fileSystems."/data/fourTerra" =
|
||||
{
|
||||
device = "/dev/sde1";
|
||||
fsType = "btrfs";
|
||||
options = [ "compress=zstd" "subvol=@data" "noatime" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
@@ -1,62 +0,0 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "thunderbolt" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/e903eb56-160d-4b77-ba66-ef54a18207f2";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=root" ];
|
||||
};
|
||||
|
||||
fileSystems."/home" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/e903eb56-160d-4b77-ba66-ef54a18207f2";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=home" ];
|
||||
};
|
||||
|
||||
fileSystems."/nix" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/e903eb56-160d-4b77-ba66-ef54a18207f2";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=nix" ];
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/1D9A-20EC";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
fileSystems."/data" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/f241ec6e-939c-4f10-bc72-3094b99de4eb";
|
||||
fsType = "btrfs";
|
||||
options = [ "subvol=data" ];
|
||||
};
|
||||
swapDevices = [ ];
|
||||
|
||||
# Enables DHCP on each ethernet and wireless interface. In case of scripted networking
|
||||
# (the default) this is the recommended approach. When using systemd-networkd it's
|
||||
# still possible to use this option, but it's recommended to use it in conjunction
|
||||
# with explicit per-interface declarations with `networking.interfaces.<interface>.useDHCP`.
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.enp191s0.useDHCP = lib.mkDefault true;
|
||||
# networking.interfaces.wlp192s0.useDHCP = lib.mkDefault true;
|
||||
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
@@ -11,6 +11,7 @@ in
|
||||
{
|
||||
services.hermenix = {
|
||||
enable = true;
|
||||
devices.video.enable = true;
|
||||
disk.baseDir = "/var/lib/hermes-vm";
|
||||
disk.stateSize = "60G";
|
||||
network = {
|
||||
@@ -20,8 +21,8 @@ in
|
||||
hostLanAddress = "10.0.10.11";
|
||||
lanGateway = "10.0.0.1";
|
||||
};
|
||||
vcpu = 3;
|
||||
mem = 5000;
|
||||
vcpu = 2;
|
||||
mem = 8000;
|
||||
hermesHome = "/var/lib/hermes/.hermes";
|
||||
hostCache.port = ports.hermesCache;
|
||||
hostAccess = [
|
||||
@@ -35,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; }
|
||||
|
||||
@@ -1,36 +0,0 @@
|
||||
# Do not modify this file! It was generated by ‘nixos-generate-config’
|
||||
# and may be overwritten by future invocations. Please make changes
|
||||
# to /etc/nixos/configuration.nix instead.
|
||||
{ config, lib, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
# Bootloader.
|
||||
boot.loader.systemd-boot.enable = true;
|
||||
boot.loader.efi.canTouchEfiVariables = true;
|
||||
boot.initrd.availableKernelModules =
|
||||
[ "ahci" "xhci_pci" "usbhid" "usb_storage" "sd_mod" "sdhci_pci" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/142c88f4-b1bc-4ed9-92ee-2c52cdfa4274";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/01FE-EDCC";
|
||||
fsType = "vfat";
|
||||
};
|
||||
fileSystems."/nix" = {
|
||||
device = "/dev/disk/by-uuid/ee4a60a8-b0d1-4f5c-a554-1d1d84c89e34";
|
||||
fsType = "ext4";
|
||||
neededForBoot = true;
|
||||
options = [ "noatime" ];
|
||||
};
|
||||
swapDevices = [ ];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode =
|
||||
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
@@ -48,7 +48,6 @@ in
|
||||
skyg.nixos.common.containers.networks.ipvlanLab = {
|
||||
enable = true;
|
||||
parent = "eno1";
|
||||
ipRange = "10.0.101.16/28";
|
||||
};
|
||||
skyg.server.admin.enable = true;
|
||||
skyg.server.exporters.enable = true;
|
||||
|
||||
@@ -10,7 +10,7 @@ let
|
||||
app = config.skyg.internalNetworkingMap.apps.buzz;
|
||||
buzz = {
|
||||
domain = app.effectiveDns;
|
||||
publicDomain = app.aliasDns;
|
||||
publicDomain = builtins.elemAt app.aliases 0;
|
||||
port = 3000;
|
||||
ip = app.ip;
|
||||
bucket = "buzz-media";
|
||||
@@ -19,8 +19,8 @@ let
|
||||
caddy = "caddy:2-alpine";
|
||||
posgres = "postgres:17-alpine";
|
||||
redis = "redis:7-alpine";
|
||||
minio = "quay.io/minio/minio:RELEASE.2025-09-07T16-13-09Z@sha256:14cea493d9a34af32f524e538b8346cf79f3321eff8e708c1e2960462bd8936e";
|
||||
mc = "quay.io/minio/mc:RELEASE.2025-08-13T08-35-41Z@sha256:a7fe349ef4bd8521fb8497f55c6042871b2ae640607cf99d9bede5e9bdf11727";
|
||||
minio = "chainguard/minio:latest-dev@sha256:8d5a0265f0e18fb3b29f95598147f1cc2a86b782181668bad176b0e90cce9569";
|
||||
mc = "chainguard/minio-client:latest-dev@sha256:a552f9a01603b3db647712ae056e8bb4c04800365707f5bd4abffa05c9e4198e";
|
||||
};
|
||||
};
|
||||
in
|
||||
@@ -151,7 +151,7 @@ in
|
||||
volumes = [ "s3:/data" ];
|
||||
command = [ "server" "/data" "--console-address" ":9001" ];
|
||||
healthcheck = {
|
||||
test = [ "CMD" "curl" "-f" "http://127.0.0.1:9000/minio/health/live" ];
|
||||
test = [ "CMD-SHELL" "wget -q -O /dev/null http://127.0.0.1:9000/minio/health/live" ];
|
||||
interval = "5s";
|
||||
timeout = "5s";
|
||||
retries = 12;
|
||||
|
||||
@@ -4,6 +4,8 @@
|
||||
./nix-serve.nix
|
||||
./docker-registry.nix
|
||||
./gitea.nix
|
||||
./gitea-container.nix
|
||||
./public-gitea.nix
|
||||
./acme.nix
|
||||
./portainer.nix
|
||||
./iu.nix
|
||||
|
||||
@@ -0,0 +1,86 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
let
|
||||
gitea = {
|
||||
user = "gitea";
|
||||
group = "gitea";
|
||||
stateDir = "/var/lib/sosnovsky/gitea";
|
||||
sshDir = "/var/lib/sosnovsky/gitea-ssh";
|
||||
httpPort = 3000;
|
||||
sshPort = 22;
|
||||
};
|
||||
app = config.skyg.internalNetworkingMap.apps.gitea;
|
||||
containerMode = !config.services.gitea.enable;
|
||||
uidEnvFile = "/run/gitea-container.env";
|
||||
in
|
||||
{
|
||||
users.users.gitea = lib.mkIf containerMode {
|
||||
isSystemUser = true;
|
||||
group = gitea.group;
|
||||
home = gitea.stateDir;
|
||||
useDefaultShell = true;
|
||||
};
|
||||
users.groups.gitea = lib.mkIf containerMode { };
|
||||
|
||||
systemd.services.gitea-container-uid = lib.mkIf containerMode {
|
||||
description = "Resolve gitea uid/gid for the container";
|
||||
wantedBy = [ "container-services-gitea.service" ];
|
||||
before = [ "container-services-gitea.service" ];
|
||||
path = [ pkgs.coreutils ];
|
||||
serviceConfig = {
|
||||
Type = "oneshot";
|
||||
RemainAfterExit = true;
|
||||
};
|
||||
script = ''
|
||||
printf 'USER_UID=%s\nUSER_GID=%s\n' \
|
||||
"$(id -u ${gitea.user})" "$(id -g ${gitea.user})" > ${uidEnvFile}
|
||||
'';
|
||||
};
|
||||
|
||||
systemd.tmpfiles.rules = lib.mkIf containerMode [
|
||||
"d ${gitea.stateDir} 0750 ${gitea.user} ${gitea.group} -"
|
||||
"d ${gitea.sshDir} 0750 ${gitea.user} ${gitea.group} -"
|
||||
# Pre-created so the read-only template mount lands in gitea-owned dirs
|
||||
# instead of root-owned ones docker would create on demand.
|
||||
"d ${gitea.stateDir}/custom 0755 ${gitea.user} ${gitea.group} -"
|
||||
"d ${gitea.stateDir}/custom/templates 0755 ${gitea.user} ${gitea.group} -"
|
||||
];
|
||||
|
||||
skyg.nixos.common.container-services.gitea = {
|
||||
enable = containerMode;
|
||||
autoUpdate.enable = true;
|
||||
networks.lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose;
|
||||
services.gitea = {
|
||||
# Match the native package so toggling never triggers a DB migration.
|
||||
image = "gitea/gitea:${pkgs.gitea.version}";
|
||||
networks.lan.ipv4_address = app.ip;
|
||||
environmentFiles = [ uidEnvFile ];
|
||||
environment = {
|
||||
GITEA_WORK_DIR = gitea.stateDir;
|
||||
GITEA_CUSTOM = "${gitea.stateDir}/custom";
|
||||
# The image renames its `git` user to $USER, so this makes RUN_USER,
|
||||
# sshd AllowUsers and the container's runtime user all `gitea`.
|
||||
USER = gitea.user;
|
||||
HOME = "/data/git";
|
||||
GITEA__server__APP_DATA_PATH = "${gitea.stateDir}/data";
|
||||
GITEA__server__SSH_ROOT_PATH = "/data/git/.ssh";
|
||||
GITEA__repository__ROOT = "${gitea.stateDir}/repositories";
|
||||
GITEA__database__PATH = "${gitea.stateDir}/data/gitea.db";
|
||||
GITEA__log__ROOT_PATH = "${gitea.stateDir}/log";
|
||||
GITEA__server__START_SSH_SERVER = "false";
|
||||
GITEA__server__SSH_PORT = toString gitea.sshPort;
|
||||
GITEA__server__SSH_USER = gitea.user;
|
||||
GITEA__server__DOMAIN = app.effectiveDns;
|
||||
GITEA__server__HTTP_PORT = toString gitea.httpPort;
|
||||
GITEA__server__ROOT_URL = "http://${app.effectiveDns}:${toString gitea.httpPort}/";
|
||||
GITEA__service__DISABLE_REGISTRATION = "true";
|
||||
};
|
||||
volumes = [
|
||||
"${gitea.stateDir}:${gitea.stateDir}"
|
||||
"${gitea.sshDir}:/data"
|
||||
];
|
||||
# Custom landing page, mounted read-only over GITEA_CUSTOM/templates.
|
||||
files."${gitea.stateDir}/custom/templates/home.tmpl" =
|
||||
builtins.readFile ./gitea-home.tmpl;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,371 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="page-content home">
|
||||
<div class="ui container">
|
||||
|
||||
<div class="snv-hero">
|
||||
<h1 class="snv-title">Sosnovsky Gitea</h1>
|
||||
<p class="snv-subtitle">Ariel's Sosnovsky personal project hub</p>
|
||||
</div>
|
||||
|
||||
<div class="snv-scene" aria-hidden="true">
|
||||
<span class="snv-comet"></span>
|
||||
<div class="snv-stars">
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
<span></span>
|
||||
</div>
|
||||
<div class="snv-glow"></div>
|
||||
<div class="snv-robot">
|
||||
<div class="snv-antenna"><span class="snv-antenna-tip"></span></div>
|
||||
<div class="snv-head">
|
||||
<span class="snv-ear snv-ear-l"></span>
|
||||
<span class="snv-ear snv-ear-r"></span>
|
||||
<span class="snv-eye snv-eye-l"></span>
|
||||
<span class="snv-eye snv-eye-r"></span>
|
||||
<span class="snv-mouth"></span>
|
||||
</div>
|
||||
<div class="snv-neck"></div>
|
||||
<div class="snv-torso"><span class="snv-core"></span></div>
|
||||
<div class="snv-arm snv-arm-l"></div>
|
||||
<div class="snv-arm snv-arm-r"></div>
|
||||
<div class="snv-legs">
|
||||
<span class="snv-leg"></span>
|
||||
<span class="snv-leg"></span>
|
||||
</div>
|
||||
</div>
|
||||
<div class="snv-shadow"></div>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
/* Sosnovsky Gitea landing page — pure CSS, no JS, theme-independent. */
|
||||
|
||||
.snv-hero {
|
||||
text-align: center;
|
||||
padding: 48px 12px 4px;
|
||||
}
|
||||
.snv-title {
|
||||
margin: 0 0 10px;
|
||||
font-size: 3rem;
|
||||
font-weight: 800;
|
||||
line-height: 1.1;
|
||||
letter-spacing: .01em;
|
||||
background: linear-gradient(90deg, #2563eb, #7c3aed, #db2777, #7c3aed, #2563eb);
|
||||
background-size: 200% auto;
|
||||
-webkit-background-clip: text;
|
||||
background-clip: text;
|
||||
-webkit-text-fill-color: transparent;
|
||||
color: #2563eb;
|
||||
animation: snv-shimmer 7s linear infinite, snv-rise .7s ease both;
|
||||
}
|
||||
.snv-subtitle {
|
||||
margin: 0;
|
||||
font-size: 1.2rem;
|
||||
opacity: .7;
|
||||
animation: snv-rise .7s .12s ease both;
|
||||
}
|
||||
|
||||
.snv-scene {
|
||||
position: relative;
|
||||
overflow: hidden;
|
||||
max-width: 640px;
|
||||
height: 340px;
|
||||
margin: 20px auto 60px;
|
||||
border-radius: 24px;
|
||||
border: 1px solid rgba(125, 165, 255, .16);
|
||||
background:
|
||||
radial-gradient(120% 90% at 50% 115%, rgba(56, 130, 246, .2), transparent 60%),
|
||||
linear-gradient(180deg, #0b1224, #111c37 55%, #0b1224);
|
||||
box-shadow: 0 24px 60px -32px rgba(37, 99, 235, .5);
|
||||
}
|
||||
|
||||
.snv-stars span {
|
||||
position: absolute;
|
||||
width: 3px;
|
||||
height: 3px;
|
||||
border-radius: 50%;
|
||||
background: #cfe3ff;
|
||||
opacity: .2;
|
||||
animation: snv-twinkle 3.2s ease-in-out infinite;
|
||||
}
|
||||
.snv-stars span:nth-child(1) { top: 12%; left: 10%; }
|
||||
.snv-stars span:nth-child(2) { top: 22%; left: 80%; animation-delay: .5s; }
|
||||
.snv-stars span:nth-child(3) { top: 7%; left: 52%; animation-delay: 1s; }
|
||||
.snv-stars span:nth-child(4) { top: 34%; left: 16%; animation-delay: 1.5s; }
|
||||
.snv-stars span:nth-child(5) { top: 16%; left: 90%; animation-delay: .9s; }
|
||||
.snv-stars span:nth-child(6) { top: 44%; left: 6%; animation-delay: 2s; }
|
||||
.snv-stars span:nth-child(7) { top: 48%; left: 92%; animation-delay: .3s; }
|
||||
.snv-stars span:nth-child(8) { top: 6%; left: 30%; animation-delay: 1.8s; }
|
||||
.snv-stars span:nth-child(9) { top: 62%; left: 12%; animation-delay: 2.4s; }
|
||||
.snv-stars span:nth-child(10) { top: 58%; left: 86%; animation-delay: 1.2s; }
|
||||
|
||||
.snv-comet {
|
||||
position: absolute;
|
||||
top: 14%;
|
||||
left: -12%;
|
||||
width: 90px;
|
||||
height: 2px;
|
||||
border-radius: 2px;
|
||||
background: linear-gradient(90deg, transparent, #bfdbfe);
|
||||
filter: drop-shadow(0 0 4px rgba(191, 219, 254, .9));
|
||||
opacity: 0;
|
||||
animation: snv-comet 11s linear infinite;
|
||||
}
|
||||
|
||||
.snv-glow {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
top: 56%;
|
||||
width: 320px;
|
||||
height: 320px;
|
||||
transform: translate(-50%, -50%);
|
||||
background: radial-gradient(circle, rgba(59, 130, 246, .3), rgba(124, 58, 237, .14) 45%, transparent 70%);
|
||||
opacity: .8;
|
||||
transition: opacity .4s ease;
|
||||
}
|
||||
.snv-scene:hover .snv-glow { opacity: 1; }
|
||||
|
||||
.snv-robot {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
bottom: 58px;
|
||||
width: 200px;
|
||||
height: 246px;
|
||||
margin-left: -100px;
|
||||
animation: snv-float 4.5s ease-in-out infinite;
|
||||
}
|
||||
|
||||
.snv-antenna {
|
||||
position: absolute;
|
||||
top: 0;
|
||||
left: 50%;
|
||||
width: 4px;
|
||||
height: 34px;
|
||||
margin-left: -2px;
|
||||
border-radius: 2px;
|
||||
background: linear-gradient(180deg, #93c5fd, #3b82f6);
|
||||
}
|
||||
.snv-antenna-tip {
|
||||
position: absolute;
|
||||
top: -9px;
|
||||
left: 50%;
|
||||
width: 16px;
|
||||
height: 16px;
|
||||
margin-left: -8px;
|
||||
border-radius: 50%;
|
||||
background: radial-gradient(circle at 35% 35%, #bfdbfe, #60a5fa 60%, #2563eb);
|
||||
animation: snv-beacon 2.4s ease-in-out infinite;
|
||||
}
|
||||
|
||||
.snv-head {
|
||||
position: absolute;
|
||||
top: 32px;
|
||||
left: 50%;
|
||||
width: 108px;
|
||||
height: 82px;
|
||||
margin-left: -54px;
|
||||
border-radius: 20px 20px 26px 26px;
|
||||
background: linear-gradient(180deg, #eaf1ff, #bccbee 68%, #96abd2);
|
||||
border: 1px solid rgba(255, 255, 255, .4);
|
||||
box-shadow: inset 0 -8px 14px rgba(30, 58, 138, .18), 0 10px 24px -12px rgba(15, 23, 42, .6);
|
||||
}
|
||||
.snv-ear {
|
||||
position: absolute;
|
||||
top: 27px;
|
||||
width: 10px;
|
||||
height: 28px;
|
||||
border-radius: 5px;
|
||||
background: linear-gradient(180deg, #60a5fa, #2563eb);
|
||||
box-shadow: 0 0 8px rgba(59, 130, 246, .55);
|
||||
}
|
||||
.snv-ear-l { left: -9px; }
|
||||
.snv-ear-r { right: -9px; }
|
||||
.snv-eye {
|
||||
position: absolute;
|
||||
top: 24px;
|
||||
width: 18px;
|
||||
height: 18px;
|
||||
border-radius: 50%;
|
||||
background: radial-gradient(circle at 35% 35%, #e0f2fe, #22d3ee 55%, #0891b2);
|
||||
box-shadow: 0 0 10px 2px rgba(34, 211, 238, .6);
|
||||
animation: snv-blink 5.5s ease-in-out infinite;
|
||||
}
|
||||
.snv-eye-l { left: 23px; }
|
||||
.snv-eye-r { right: 23px; }
|
||||
.snv-mouth {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
bottom: 13px;
|
||||
width: 30px;
|
||||
height: 8px;
|
||||
margin-left: -15px;
|
||||
border-radius: 4px;
|
||||
background: linear-gradient(90deg, #334155, #475569);
|
||||
animation: snv-talk 4.5s ease-in-out infinite;
|
||||
}
|
||||
|
||||
.snv-neck {
|
||||
position: absolute;
|
||||
top: 104px;
|
||||
left: 50%;
|
||||
width: 26px;
|
||||
height: 18px;
|
||||
margin-left: -13px;
|
||||
border-radius: 5px;
|
||||
background: linear-gradient(180deg, #94a3b8, #64748b);
|
||||
}
|
||||
|
||||
.snv-torso {
|
||||
position: absolute;
|
||||
top: 120px;
|
||||
left: 50%;
|
||||
width: 124px;
|
||||
height: 92px;
|
||||
margin-left: -62px;
|
||||
border-radius: 22px;
|
||||
background: linear-gradient(180deg, #dfe9fc, #b2c3e4 65%, #8fa5cb);
|
||||
border: 1px solid rgba(255, 255, 255, .4);
|
||||
box-shadow: inset 0 -10px 16px rgba(30, 58, 138, .2), 0 14px 28px -14px rgba(15, 23, 42, .65);
|
||||
}
|
||||
.snv-core {
|
||||
position: absolute;
|
||||
top: 50%;
|
||||
left: 50%;
|
||||
width: 36px;
|
||||
height: 36px;
|
||||
margin: -18px 0 0 -18px;
|
||||
border-radius: 50%;
|
||||
background: radial-gradient(circle at 35% 35%, #fef9c3, #fbbf24 55%, #d97706);
|
||||
animation: snv-core 2.2s ease-in-out infinite;
|
||||
}
|
||||
|
||||
.snv-arm {
|
||||
position: absolute;
|
||||
top: 126px;
|
||||
width: 16px;
|
||||
height: 62px;
|
||||
border-radius: 8px;
|
||||
background: linear-gradient(180deg, #cbd5e1, #8fa0b6);
|
||||
border: 1px solid rgba(255, 255, 255, .28);
|
||||
transform-origin: 50% 9px;
|
||||
}
|
||||
.snv-arm-l { left: 24px; animation: snv-sway 4.5s ease-in-out infinite; }
|
||||
.snv-arm-r { right: 24px; animation: snv-wave 2.6s ease-in-out infinite; }
|
||||
|
||||
.snv-legs {
|
||||
position: absolute;
|
||||
top: 206px;
|
||||
left: 50%;
|
||||
width: 64px;
|
||||
height: 36px;
|
||||
margin-left: -32px;
|
||||
display: flex;
|
||||
justify-content: space-between;
|
||||
}
|
||||
.snv-leg {
|
||||
width: 18px;
|
||||
height: 36px;
|
||||
border-radius: 7px 7px 9px 9px;
|
||||
background: linear-gradient(180deg, #9fb0c6, #64748b);
|
||||
border: 1px solid rgba(255, 255, 255, .22);
|
||||
animation: snv-kick 4.5s ease-in-out infinite;
|
||||
}
|
||||
.snv-leg:first-child { animation-delay: .12s; }
|
||||
|
||||
.snv-shadow {
|
||||
position: absolute;
|
||||
left: 50%;
|
||||
bottom: 20px;
|
||||
width: 160px;
|
||||
height: 20px;
|
||||
margin-left: -80px;
|
||||
border-radius: 50%;
|
||||
background: radial-gradient(ellipse, rgba(59, 130, 246, .45), transparent 70%);
|
||||
animation: snv-shadow 4.5s ease-in-out infinite;
|
||||
}
|
||||
|
||||
@keyframes snv-rise {
|
||||
from { opacity: 0; transform: translateY(14px); }
|
||||
to { opacity: 1; transform: translateY(0); }
|
||||
}
|
||||
@keyframes snv-shimmer {
|
||||
from { background-position: 0% 50%; }
|
||||
to { background-position: 200% 50%; }
|
||||
}
|
||||
@keyframes snv-twinkle {
|
||||
0%, 100% { opacity: .15; transform: scale(1); }
|
||||
50% { opacity: .9; transform: scale(1.35); }
|
||||
}
|
||||
@keyframes snv-comet {
|
||||
0% { transform: translate(0, 0) rotate(9deg); opacity: 0; }
|
||||
3% { opacity: 1; }
|
||||
16% { transform: translate(460px, 74px) rotate(9deg); opacity: 0; }
|
||||
100% { transform: translate(460px, 74px) rotate(9deg); opacity: 0; }
|
||||
}
|
||||
@keyframes snv-float {
|
||||
0%, 100% { transform: translateY(0); }
|
||||
50% { transform: translateY(-16px); }
|
||||
}
|
||||
@keyframes snv-beacon {
|
||||
0%, 100% { box-shadow: 0 0 6px 1px rgba(96, 165, 250, .45); transform: scale(1); }
|
||||
50% { box-shadow: 0 0 18px 6px rgba(96, 165, 250, .95); transform: scale(1.18); }
|
||||
}
|
||||
@keyframes snv-blink {
|
||||
0%, 90%, 100% { transform: scaleY(1); }
|
||||
93% { transform: scaleY(.08); }
|
||||
96% { transform: scaleY(1); }
|
||||
}
|
||||
@keyframes snv-talk {
|
||||
0%, 86%, 100% { height: 8px; }
|
||||
89% { height: 4px; }
|
||||
92% { height: 11px; }
|
||||
95% { height: 5px; }
|
||||
}
|
||||
@keyframes snv-core {
|
||||
0%, 100% { transform: scale(1); box-shadow: 0 0 10px 3px rgba(251, 191, 36, .45); }
|
||||
50% { transform: scale(1.12); box-shadow: 0 0 22px 8px rgba(251, 191, 36, .8); }
|
||||
}
|
||||
@keyframes snv-sway {
|
||||
0%, 100% { transform: rotate(4deg); }
|
||||
50% { transform: rotate(-4deg); }
|
||||
}
|
||||
@keyframes snv-wave {
|
||||
0%, 100% { transform: rotate(10deg); }
|
||||
20% { transform: rotate(-62deg); }
|
||||
40% { transform: rotate(-24deg); }
|
||||
60% { transform: rotate(-56deg); }
|
||||
80% { transform: rotate(-18deg); }
|
||||
}
|
||||
@keyframes snv-kick {
|
||||
0%, 100% { transform: translateY(0); }
|
||||
50% { transform: translateY(3px); }
|
||||
}
|
||||
@keyframes snv-shadow {
|
||||
0%, 100% { transform: scale(1); opacity: .85; }
|
||||
50% { transform: scale(.85); opacity: .5; }
|
||||
}
|
||||
|
||||
@media (max-width: 480px) {
|
||||
.snv-title { font-size: 2.2rem; }
|
||||
.snv-scene { height: 300px; }
|
||||
}
|
||||
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.snv-title,
|
||||
.snv-subtitle,
|
||||
.snv-scene,
|
||||
.snv-scene * {
|
||||
animation: none !important;
|
||||
}
|
||||
}
|
||||
</style>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{{template "base/footer" .}}
|
||||
@@ -10,7 +10,7 @@ let
|
||||
in
|
||||
{
|
||||
services.gitea = {
|
||||
enable = true;
|
||||
enable = false;
|
||||
appName = "Sosnovsky gitea";
|
||||
stateDir = gitea.stateDir;
|
||||
user = gitea.user;
|
||||
|
||||
@@ -0,0 +1,100 @@
|
||||
{{template "base/head" .}}
|
||||
<div class="page-content home">
|
||||
<div class="ui container">
|
||||
|
||||
<div class="skyg-hero">
|
||||
<div class="skyg-logo">
|
||||
<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 780 300" role="img" aria-label="SkyG logo">
|
||||
<defs>
|
||||
<linearGradient id="sky" x1="140" y1="24" x2="140" y2="250" gradientUnits="userSpaceOnUse">
|
||||
<stop offset="0" stop-color="#7EBAE4"/>
|
||||
<stop offset="0.42" stop-color="#B7DCF6"/>
|
||||
<stop offset="1" stop-color="#F4FBFF"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="shardA" x1="0" y1="0" x2="1" y2="1">
|
||||
<stop offset="0" stop-color="#7EBAE4"/>
|
||||
<stop offset="1" stop-color="#5277C3"/>
|
||||
</linearGradient>
|
||||
<linearGradient id="shardB" x1="0" y1="0" x2="0" y2="1">
|
||||
<stop offset="0" stop-color="#649AFA"/>
|
||||
<stop offset="1" stop-color="#415E9A"/>
|
||||
</linearGradient>
|
||||
<clipPath id="hexClip">
|
||||
<polygon points="146,36 236,86 236,186 146,236 56,186 56,86"/>
|
||||
</clipPath>
|
||||
</defs>
|
||||
<g id="mark">
|
||||
<polygon points="146,28 244,82 244,190 146,244 48,190 48,82" fill="url(#sky)"/>
|
||||
<g clip-path="url(#hexClip)">
|
||||
<path d="M48 168 L86 136 L112 154 L146 118 L176 146 L206 128 L244 162 L244 244 L48 244 Z" fill="#D5EEFB"/>
|
||||
<path d="M92.0 168.0 L120.8 244.0 L100.1 242.3 L92.6 221.5 L77.4 239.1 L66.0 237.5 L61.7 226.5 L85.2 199.6 L76.4 179.7 Z" fill="#7EB1DD"/>
|
||||
<path d="M150.0 108.0 L202.7 204.1 L174.8 205.7 L160.8 179.3 L143.8 205.7 L128.3 205.7 L120.5 191.7 L146.9 151.4 L131.4 126.6 Z" fill="url(#shardA)"/>
|
||||
<path d="M198.0 150.0 L248.4 222.6 L226.1 226.2 L212.7 206.3 L201.3 228.8 L188.8 230.1 L181.4 219.6 L199.2 185.1 L184.7 166.5 Z" fill="url(#shardB)"/>
|
||||
<path d="M56 214 L108 168 L128 190 L146 156 L170 196 L196 166 L230 198 L244 214 L244 244 L56 244 Z" fill="#415E9A" opacity="0.92"/>
|
||||
<path d="M108 168 L128 190 L112 206 Z" fill="#7EBAE4"/>
|
||||
<path d="M170 196 L196 166 L214 188 Z" fill="#649AFA"/>
|
||||
<path d="M132 176 L150 148 L164 170" fill="none" stroke="#F4FBFF" stroke-width="3" stroke-linejoin="round" stroke-linecap="round"/>
|
||||
</g>
|
||||
<polygon points="146,28 244,82 244,190 146,244 48,190 48,82" fill="none" stroke="#5277C3" stroke-width="3.25" stroke-linejoin="round"/>
|
||||
<g fill="none" stroke="#4A6BAF" stroke-width="1.35" stroke-linecap="round">
|
||||
<path d="M146 62 V78"/>
|
||||
<path d="M146 62 H172 L184 74"/>
|
||||
<path d="M172 62 V50"/>
|
||||
</g>
|
||||
<g fill="#649AFA">
|
||||
<circle cx="146" cy="56" r="3"/>
|
||||
<circle cx="172" cy="62" r="2.1"/>
|
||||
<circle cx="184" cy="74" r="2.1"/>
|
||||
<circle cx="150" cy="108" r="2.4"/>
|
||||
</g>
|
||||
</g>
|
||||
<g id="wordmark">
|
||||
<text x="286" y="176" font-family="Montserrat, Segoe UI, Century Gothic, Futura, sans-serif" font-size="92" font-weight="600" letter-spacing="-1.2" fill="#1E3A66">Sky<tspan fill="#5277C3">G</tspan></text>
|
||||
<path d="M290 196 H408" fill="none" stroke="#7EBAE4" stroke-width="1.7" stroke-linecap="round"/>
|
||||
<circle cx="418" cy="196" r="2.2" fill="#649AFA"/>
|
||||
<path d="M428 196 H452" fill="none" stroke="#7EBAE4" stroke-width="1.7" stroke-linecap="round"/>
|
||||
</g>
|
||||
</svg>
|
||||
</div>
|
||||
<p class="skyg-tagline">Ariel Sosnovsky's Personal Projects and stuff</p>
|
||||
</div>
|
||||
|
||||
<style>
|
||||
.skyg-hero {
|
||||
text-align: center;
|
||||
padding: 56px 12px 24px;
|
||||
}
|
||||
.skyg-logo {
|
||||
max-width: 520px;
|
||||
margin: 0 auto;
|
||||
animation: skyg-rise .7s ease both;
|
||||
}
|
||||
.skyg-logo svg {
|
||||
display: block;
|
||||
width: 100%;
|
||||
height: auto;
|
||||
}
|
||||
.skyg-tagline {
|
||||
margin: 24px 0 0;
|
||||
font-size: 1.35rem;
|
||||
font-weight: 500;
|
||||
opacity: .75;
|
||||
animation: skyg-rise .7s .12s ease both;
|
||||
}
|
||||
@keyframes skyg-rise {
|
||||
from { opacity: 0; transform: translateY(14px); }
|
||||
to { opacity: 1; transform: translateY(0); }
|
||||
}
|
||||
@media (max-width: 480px) {
|
||||
.skyg-hero { padding-top: 32px; }
|
||||
.skyg-tagline { font-size: 1.1rem; }
|
||||
}
|
||||
@media (prefers-reduced-motion: reduce) {
|
||||
.skyg-logo,
|
||||
.skyg-tagline { animation: none !important; }
|
||||
}
|
||||
</style>
|
||||
|
||||
</div>
|
||||
</div>
|
||||
{{template "base/footer" .}}
|
||||
@@ -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;
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -1,31 +0,0 @@
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "usb_storage" "usbhid" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-intel" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/2c1a9e86-5b82-4545-bea1-c1b6b688fdf8";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/6583-1C43";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
|
||||
swapDevices = [ ];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
@@ -14,16 +14,15 @@ in
|
||||
|
||||
skyg.user.enable = true;
|
||||
skyg.nixos.common.ssh-server.enable = true;
|
||||
skyg.nixos.common.containers.networks.ipvlanLab = {
|
||||
enable = true;
|
||||
parent = "enp2s0";
|
||||
};
|
||||
skyg.server.dns.routing = {
|
||||
enable = false;
|
||||
openFirewall = true;
|
||||
addressesSecretName = "dns-addresses.conf";
|
||||
};
|
||||
skyg.nixos.common.containers.networks.ipvlanLab = {
|
||||
enable = true;
|
||||
parent = "enp2s0";
|
||||
ipRange = "10.0.101.240/28";
|
||||
};
|
||||
skyg.nixos.common.containers.openMetricsPort = true;
|
||||
skyg.server.exporters.enable = true;
|
||||
skyg.networkDrives.enable = true;
|
||||
|
||||
@@ -1,10 +1,15 @@
|
||||
{ config, ... }:
|
||||
let
|
||||
app = config.skyg.internalNetworkingMap.apps.nvr;
|
||||
in
|
||||
{
|
||||
skyg.nixos.common.container-services.scrypted = {
|
||||
enable = true;
|
||||
autoUpdate.enable = true;
|
||||
networks.lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose;
|
||||
services.scrypted = {
|
||||
image = "ghcr.io/koush/scrypted";
|
||||
networks.lan.ipv4_address = app.ip;
|
||||
volumes = [
|
||||
"/var/run/dbus:/var/run/dbus"
|
||||
"/var/run/avahi-daemon/socket:/var/run/avahi-daemon/socket"
|
||||
@@ -12,7 +17,6 @@
|
||||
"scrypted-nvr:/nvr"
|
||||
];
|
||||
environment.SCRYPTED_NVR_VOLUME = "/nvr";
|
||||
network_mode = "host";
|
||||
};
|
||||
volumes.scrypted-nvr = {
|
||||
driver = "local";
|
||||
|
||||
@@ -1,31 +0,0 @@
|
||||
{ config, lib, modulesPath, ... }:
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "nvme" "xhci_pci" "ahci" "usbhid" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.kernelModules = [ "kvm-amd" ];
|
||||
boot.extraModulePackages = [ ];
|
||||
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/5a468faa-b149-4ae2-9106-f0b5216d6d95";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/6CC4-8800";
|
||||
fsType = "vfat";
|
||||
};
|
||||
|
||||
swapDevices =
|
||||
[{ device = "/dev/disk/by-uuid/e847bdf2-e049-428b-a203-8a1eae77ce56"; }];
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.amd.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
}
|
||||
@@ -1,9 +1,10 @@
|
||||
{ config, skyg-secrets, ... }:
|
||||
{ skyg-secrets, ... }:
|
||||
{
|
||||
imports = [
|
||||
./hardware-configuration
|
||||
./hardware.nix
|
||||
./systemd.nix
|
||||
./services
|
||||
];
|
||||
|
||||
skyg.user.enable = true;
|
||||
@@ -19,7 +20,10 @@
|
||||
enable = true;
|
||||
envPath = "/opt/k3s/k3s.env";
|
||||
};
|
||||
|
||||
skyg.nixos.common.containers.networks.ipvlanLab = {
|
||||
enable = true;
|
||||
parent = "eno1";
|
||||
};
|
||||
age.secrets.portainer-agent-minipc3.file = skyg-secrets.portainer-agent-minipc3;
|
||||
skyg.nixos.server.portainer = {
|
||||
enable = true;
|
||||
|
||||
@@ -0,0 +1,18 @@
|
||||
{ config, pkgs, skyg-secrets, ... }:
|
||||
{
|
||||
age.secrets.cloudflare-dns.file = skyg-secrets.cloudflare-dns;
|
||||
|
||||
skyg.server.acme = {
|
||||
enable = true;
|
||||
credentialsFile = config.age.secrets.cloudflare-dns.path;
|
||||
certs."home.sosnovsky.ca" = {
|
||||
extraDomains = [ "*.home.sosnovsky.ca" ];
|
||||
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" ];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,45 @@
|
||||
{ config, ... }:
|
||||
let
|
||||
app = config.skyg.internalNetworkingMap.apps.caddy;
|
||||
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 = {
|
||||
enable = true;
|
||||
autoUpdate.enable = true;
|
||||
networks.lan = config.skyg.nixos.common.containers.networks.ipvlanLab.compose;
|
||||
services.caddy = {
|
||||
image = "caddy:2-alpine";
|
||||
networks.lan.ipv4_address = app.ip;
|
||||
files."/etc/caddy/Caddyfile" = ''
|
||||
nvr.home.sosnovsky.ca {
|
||||
tls /etc/caddy/tls/fullchain.pem /etc/caddy/tls/key.pem
|
||||
reverse_proxy ${nvr.ip}:11080
|
||||
}
|
||||
jellyfin.home.sosnovsky.ca {
|
||||
tls /etc/caddy/tls/fullchain.pem /etc/caddy/tls/key.pem
|
||||
reverse_proxy bigbox1.lab.internal:8096
|
||||
}
|
||||
portainer.home.sosnovsky.ca {
|
||||
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"
|
||||
];
|
||||
};
|
||||
};
|
||||
}
|
||||
@@ -0,0 +1,6 @@
|
||||
{
|
||||
imports = [
|
||||
./caddy.nix
|
||||
./acme.nix
|
||||
];
|
||||
}
|
||||
@@ -1,71 +0,0 @@
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
let
|
||||
kernel = config.boot.kernelPackages.kernel;
|
||||
hddled = pkgs.stdenv.mkDerivation rec {
|
||||
name = "hddled_tmj33-${version}-${kernel.version}";
|
||||
version = "0.3";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "arnarg";
|
||||
repo = "hddled_tmj33";
|
||||
rev = version;
|
||||
sha256 = "sha256-sQ8fLK8NP5sHw/9gJTO6lqgWfwmi1G5KDwWuWujNCZw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
# We don't want to depmod yet, just build and package the module
|
||||
preConfigure = ''
|
||||
sed -i 's|depmod|#depmod|' Makefile
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"TARGET=${kernel.modDirVersion}"
|
||||
"KERNEL_MODULES=${kernel.dev}/lib/modules/${kernel.modDirVersion}"
|
||||
"MODDESTDIR=$(out)/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc"
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
imports =
|
||||
[
|
||||
(modulesPath + "/installer/scan/not-detected.nix")
|
||||
];
|
||||
|
||||
boot.initrd.availableKernelModules = [ "ahci" "xhci_pci" "usbhid" "uas" "usb_storage" "sd_mod" ];
|
||||
boot.initrd.kernelModules = [ ];
|
||||
boot.extraModulePackages = with pkgs.linuxPackages; [
|
||||
it87
|
||||
hddled
|
||||
];
|
||||
boot.kernelModules = [
|
||||
"kvm-intel"
|
||||
"coretemp"
|
||||
"drivetemp"
|
||||
"it87"
|
||||
"hddled_tmj33"
|
||||
];
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/a3b275b4-96d4-4eb4-b01f-d80370899791";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/AAA7-BCE9";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
fileSystems."/mnt/Data" =
|
||||
{
|
||||
device = "/dev/sda1";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
swapDevices = [ ];
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
nix.settings.max-jobs = 2;
|
||||
powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
|
||||
}
|
||||
@@ -2,6 +2,32 @@
|
||||
# Clanker ! Do not modify this file!
|
||||
#
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
let
|
||||
kernel = config.boot.kernelPackages.kernel;
|
||||
hddled = pkgs.stdenv.mkDerivation rec {
|
||||
name = "hddled_tmj33-${version}-${kernel.version}";
|
||||
version = "0.3";
|
||||
|
||||
src = pkgs.fetchFromGitHub {
|
||||
owner = "arnarg";
|
||||
repo = "hddled_tmj33";
|
||||
rev = version;
|
||||
sha256 = "sha256-sQ8fLK8NP5sHw/9gJTO6lqgWfwmi1G5KDwWuWujNCZw=";
|
||||
};
|
||||
|
||||
nativeBuildInputs = kernel.moduleBuildDependencies;
|
||||
|
||||
preConfigure = ''
|
||||
sed -i 's|depmod|#depmod|' Makefile
|
||||
'';
|
||||
|
||||
makeFlags = [
|
||||
"TARGET=${kernel.modDirVersion}"
|
||||
"KERNEL_MODULES=${kernel.dev}/lib/modules/${kernel.modDirVersion}"
|
||||
"MODDESTDIR=$(out)/lib/modules/${kernel.modDirVersion}/kernel/drivers/misc"
|
||||
];
|
||||
};
|
||||
in
|
||||
{
|
||||
imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
|
||||
|
||||
@@ -18,7 +44,6 @@
|
||||
"it87"
|
||||
"hddled_tmj33"
|
||||
];
|
||||
|
||||
networking.useDHCP = lib.mkDefault true;
|
||||
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||
hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||
|
||||
@@ -3,18 +3,22 @@
|
||||
#
|
||||
{ config, lib, pkgs, modulesPath, ... }:
|
||||
{
|
||||
fileSystems."/" = {
|
||||
device = "/dev/disk/by-uuid/a3b275b4-96d4-4eb4-b01f-d80370899791";
|
||||
fsType = "ext4";
|
||||
};
|
||||
fileSystems."/boot" = {
|
||||
device = "/dev/disk/by-uuid/AAA7-BCE9";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
fileSystems."/mnt/Data" = {
|
||||
device = "/dev/sda1";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
fileSystems."/" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/a3b275b4-96d4-4eb4-b01f-d80370899791";
|
||||
fsType = "ext4";
|
||||
};
|
||||
|
||||
fileSystems."/boot" =
|
||||
{
|
||||
device = "/dev/disk/by-uuid/AAA7-BCE9";
|
||||
fsType = "vfat";
|
||||
options = [ "fmask=0022" "dmask=0022" ];
|
||||
};
|
||||
fileSystems."/mnt/Data" =
|
||||
{
|
||||
device = "/dev/sda1";
|
||||
fsType = "btrfs";
|
||||
};
|
||||
swapDevices = [ ];
|
||||
}
|
||||
+1
-1
@@ -10,7 +10,7 @@ modules/
|
||||
├── lib.nix # makeNixOs / makeIso / makeHomeManagerUsers / makeDarwinModule / eachSystem
|
||||
│ # (registers the `tether` flake input's NixOS module → programs.tether.*)
|
||||
├── main.nix # Base module imported by every host: core/ + nixos/ + network-drives.nix
|
||||
│ # + skyg.internalNetworkingMap (global app registry)
|
||||
│ # + skyg.internalNetworkingMap (global app registry + appNetwork)
|
||||
├── internal-networking.nix # Renders skyg.internalNetworkingMap → router generalMappings
|
||||
├── skyg-utils.nix # makeHyperlinkScriptToConfigs (symlinks configs/ → ~/.config/;
|
||||
│ # backs up an existing real dir to <path>.backup.<timestamp>)
|
||||
|
||||
@@ -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
|
||||
|
||||
@@ -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 ];
|
||||
|
||||
@@ -15,7 +15,7 @@ let
|
||||
# behaviour the generator expects for Nix-declared names.
|
||||
toRecord = name: app: {
|
||||
ip = app.ip;
|
||||
domains = [ app.effectiveDns ] ++ lib.optional (app.aliasDns != null) app.aliasDns;
|
||||
domains = [ app.effectiveDns ] ++ app.aliases;
|
||||
wildcard = false;
|
||||
source = "internalNetworkingMap/${name}";
|
||||
};
|
||||
|
||||
+3
-2
@@ -138,8 +138,8 @@ in
|
||||
inherit
|
||||
user
|
||||
rootDir
|
||||
hostName
|
||||
configsDir
|
||||
hostName
|
||||
systemStateVersion
|
||||
homeManagerVersion
|
||||
;
|
||||
@@ -165,8 +165,8 @@ in
|
||||
inherit
|
||||
user
|
||||
rootDir
|
||||
hostName
|
||||
configsDir
|
||||
hostName
|
||||
systemStateVersion
|
||||
homeManagerVersion
|
||||
;
|
||||
@@ -202,6 +202,7 @@ in
|
||||
inherit
|
||||
user
|
||||
rootDir
|
||||
configsDir
|
||||
homeManagerVersion
|
||||
hostName
|
||||
systemStateVersion;
|
||||
|
||||
+52
-13
@@ -20,11 +20,11 @@ let
|
||||
description = "LAN IPv4 address of the app.";
|
||||
};
|
||||
|
||||
aliasDns = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
example = "buzz.home.sosnovsky.ca";
|
||||
description = "Optional public/alternate DNS name for the app.";
|
||||
aliases = lib.mkOption {
|
||||
type = lib.types.listOf lib.types.str;
|
||||
default = [ ];
|
||||
example = [ "buzz.home.sosnovsky.ca" ];
|
||||
description = "Optional public/alternate DNS names for the app.";
|
||||
};
|
||||
|
||||
effectiveDns = lib.mkOption {
|
||||
@@ -54,11 +54,33 @@ in
|
||||
description = "Suffix appended to each app name to form its internal DNS name.";
|
||||
};
|
||||
|
||||
subnet = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
example = "10.0.101.0/24";
|
||||
description = "LAN subnet the apps live on (informational).";
|
||||
appNetwork = lib.mkOption {
|
||||
default = { };
|
||||
description = ''
|
||||
The lab network the apps live on. Consumed as the defaults for the
|
||||
ipvlan/macvlan container networks (skyg.nixos.common.containers.networks).
|
||||
'';
|
||||
type = lib.types.submodule {
|
||||
options = {
|
||||
subnet = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "10.0.0.0/16";
|
||||
description = "IPv4 subnet (--subnet).";
|
||||
};
|
||||
|
||||
gateway = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "10.0.0.1";
|
||||
description = "IPv4 gateway (--gateway).";
|
||||
};
|
||||
|
||||
ipRange = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
description = "IPv4 range for dynamic address allocation (--ip-range).";
|
||||
};
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
apps = lib.mkOption {
|
||||
@@ -76,12 +98,29 @@ in
|
||||
# Global internal app registry.
|
||||
skyg.internalNetworkingMap = {
|
||||
rootDns = ".app.internal";
|
||||
subnet = "10.0.101.0/24";
|
||||
appNetwork = {
|
||||
subnet = "10.0.0.0/16";
|
||||
gateway = "10.0.0.1";
|
||||
ipRange = "10.0.101.16/28";
|
||||
};
|
||||
apps = {
|
||||
audiobooks = { ip = "10.0.101.4"; };
|
||||
buzz = { ip = "10.0.101.3"; aliasDns = "buzz.home.sosnovsky.ca"; };
|
||||
drawdb = { ip = "10.0.101.2"; };
|
||||
buzz = { ip = "10.0.101.3"; aliases = [ "buzz.home.sosnovsky.ca" ]; };
|
||||
audiobooks = { ip = "10.0.101.4"; };
|
||||
gitea = { ip = "10.0.101.8"; };
|
||||
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"; };
|
||||
caddy = {
|
||||
ip = "10.0.101.7";
|
||||
aliases = [
|
||||
"nvr.home.sosnovsky.ca"
|
||||
"jellyfin.home.sosnovsky.ca"
|
||||
"portainer.home.sosnovsky.ca"
|
||||
"gitea.skyg.ca"
|
||||
];
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
|
||||
@@ -64,14 +64,12 @@ Two predefined lab networks are available:
|
||||
skyg.nixos.common.containers.networks.macvlanLab = {
|
||||
enable = true;
|
||||
parent = "eno1";
|
||||
ipRange = "10.0.101.16/28";
|
||||
};
|
||||
|
||||
# ipvlan L2 mode (host can reach its own containers — preferred)
|
||||
skyg.nixos.common.containers.networks.ipvlanLab = {
|
||||
enable = true;
|
||||
parent = "eno1";
|
||||
ipRange = "10.0.101.16/28";
|
||||
};
|
||||
```
|
||||
|
||||
@@ -93,8 +91,10 @@ skyg.nixos.common.containers.networks.extra.myNet = {
|
||||
};
|
||||
```
|
||||
|
||||
Predefined fields: `enable`, `parent`, `subnet` (default `10.0.0.0/16`), `gateway` (default
|
||||
`10.0.0.1`), `ipRange`, `internal`. Extra networks also have `name`, `driver`, `driverOpts`.
|
||||
Predefined fields: `enable`, `parent`, `subnet`, `gateway`, `ipRange`, `internal`. `subnet`,
|
||||
`gateway`, and `ipRange` default to `skyg.internalNetworkingMap.appNetwork` (see
|
||||
`modules/main.nix`), so the lab network is declared once. Extra networks also have `name`,
|
||||
`driver`, `driverOpts`.
|
||||
Works with both docker and podman.
|
||||
|
||||
## Container service groups (`skyg.nixos.common.container-services`)
|
||||
|
||||
@@ -70,19 +70,19 @@ in
|
||||
|
||||
subnet = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "10.0.0.0/16";
|
||||
default = config.skyg.internalNetworkingMap.appNetwork.subnet;
|
||||
description = "IPv4 subnet.";
|
||||
};
|
||||
|
||||
gateway = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "10.0.0.1";
|
||||
default = config.skyg.internalNetworkingMap.appNetwork.gateway;
|
||||
description = "IPv4 gateway.";
|
||||
};
|
||||
|
||||
ipRange = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
default = config.skyg.internalNetworkingMap.appNetwork.ipRange;
|
||||
description = "IPv4 range for dynamic address allocation (--ip-range).";
|
||||
};
|
||||
|
||||
@@ -124,19 +124,19 @@ in
|
||||
|
||||
subnet = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "10.0.0.0/16";
|
||||
default = config.skyg.internalNetworkingMap.appNetwork.subnet;
|
||||
description = "IPv4 subnet.";
|
||||
};
|
||||
|
||||
gateway = lib.mkOption {
|
||||
type = lib.types.str;
|
||||
default = "10.0.0.1";
|
||||
default = config.skyg.internalNetworkingMap.appNetwork.gateway;
|
||||
description = "IPv4 gateway.";
|
||||
};
|
||||
|
||||
ipRange = lib.mkOption {
|
||||
type = lib.types.nullOr lib.types.str;
|
||||
default = null;
|
||||
default = config.skyg.internalNetworkingMap.appNetwork.ipRange;
|
||||
description = "IPv4 range for dynamic address allocation (--ip-range).";
|
||||
};
|
||||
|
||||
|
||||
@@ -236,11 +236,11 @@ skyg.nixos.common.container-services.drawdb.services.drawdb = {
|
||||
};
|
||||
```
|
||||
|
||||
| Field | Notes |
|
||||
| -------------- | ---------------------------------------------------------------------- |
|
||||
| `ip` | LAN IPv4 address the app's names resolve to. |
|
||||
| `aliasDns` | Optional extra name (e.g. a public domain) that also resolves to `ip`. |
|
||||
| `effectiveDns` | Read-only; computed as `<app-name>` + `rootDns`. |
|
||||
| Field | Notes |
|
||||
| -------------- | --------------------------------------------------------------------- |
|
||||
| `ip` | LAN IPv4 address the app's names resolve to. |
|
||||
| `aliases` | Optional extra names (e.g. public domains) that also resolve to `ip`. |
|
||||
| `effectiveDns` | Read-only; computed as `<app-name>` + `rootDns`. |
|
||||
|
||||
Verify and deploy:
|
||||
|
||||
|
||||
@@ -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.
|
||||
|
||||
@@ -78,33 +78,18 @@ in
|
||||
|
||||
environment.systemPackages = [
|
||||
pkgs.niri-touchscreen-gestures
|
||||
# dotool provides the absolute pointer positioning used to forward taps.
|
||||
# ydotool is deliberately not used here: its `mousemove --absolute` is
|
||||
# really a warp-to-corner plus a *relative* delta, so the compositor's
|
||||
# pointer acceleration scales it (measured at exactly 2x on this layout,
|
||||
# saturating at the screen edge). dotool registers a uinput device with a
|
||||
# declared absolute axis range instead, which no acceleration curve can
|
||||
# distort.
|
||||
pkgs.dotool
|
||||
];
|
||||
|
||||
# dotool writes to /dev/uinput, which this makes group-accessible (0660,
|
||||
# group "uinput") and loads the kernel module for. Note that dotool ships no
|
||||
# udev rules of its own in nixpkgs, so this is the only thing granting access.
|
||||
hardware.uinput.enable = true;
|
||||
|
||||
# "input" is already granted by tiler.enable (needed to read /dev/input for
|
||||
# the touchscreen); "uinput" is what hardware.uinput.enable creates.
|
||||
users.users.${skygUser.name}.extraGroups = [ "input" "uinput" ];
|
||||
|
||||
systemd.user.services = {
|
||||
# Registering a uinput device costs a noticeable startup delay, so keep one
|
||||
# long-running daemon rather than paying it on every tap.
|
||||
dotoold = {
|
||||
description = "dotoold - uinput backend for absolute pointer positioning";
|
||||
after = [ "graphical-session.target" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
unitConfig.ConditionEnvironment = "NIRI_SOCKET";
|
||||
serviceConfig = {
|
||||
ExecStart = lib.getExe' pkgs.dotool "dotoold";
|
||||
Restart = "on-failure";
|
||||
@@ -114,16 +99,16 @@ in
|
||||
|
||||
niri-touchscreen-gestures = {
|
||||
description = "Touchscreen gesture bridge for niri";
|
||||
# Needs the niri IPC socket, which only exists once the compositor is up,
|
||||
# and dotoold's virtual device before it can forward a tap.
|
||||
after = [ "graphical-session.target" "dotoold.service" ];
|
||||
wants = [ "dotoold.service" ];
|
||||
partOf = [ "graphical-session.target" ];
|
||||
wantedBy = [ "graphical-session.target" ];
|
||||
unitConfig.ConditionEnvironment = "NIRI_SOCKET";
|
||||
serviceConfig = {
|
||||
ExecStart = "${lib.getExe pkgs.niri-touchscreen-gestures} ${lib.escapeShellArgs gestureArgs}";
|
||||
Restart = "on-failure";
|
||||
RestartSec = 2;
|
||||
RestartSec = 5; # widen the cycle
|
||||
StartLimitBurst = 3;
|
||||
};
|
||||
};
|
||||
};
|
||||
|
||||
+1
-1
@@ -29,7 +29,7 @@ in
|
||||
"secrets/buzz-env.age".publicKeys = [ ari minipc1 ];
|
||||
|
||||
# Cloudflare DNS API token for ACME DNS-01 (skyg.server.acme)
|
||||
"secrets/cloudflare-dns.age".publicKeys = [ ari minipc1 ];
|
||||
"secrets/cloudflare-dns.age".publicKeys = [ ari minipc1 minipc3 ];
|
||||
|
||||
# stack compose definition — minipc2
|
||||
"secrets/stack1.age".publicKeys = [ ari minipc2 ];
|
||||
|
||||
+10
-10
@@ -4,16 +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) |
|
||||
| `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.
|
||||
|
||||
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
@@ -1,8 +1,7 @@
|
||||
age-encryption.org/v1
|
||||
-> ssh-ed25519 CIR0mA RyS/sxPxXWdb6q5asrgqNlF6Bsc4vUsXlgvuowHcDUk
|
||||
egUa2BN2Beqj0wo/tTWV61BmWqesX4W8IGiIUWvRcwY
|
||||
-> ssh-ed25519 LuJNQA MPx6UOrVyrJjbuxYARFGp0OFXD5iMFypCsDtjXTJYUc
|
||||
UCXdNZU2YqjkROdmHdiAhja0eo3DEorhgWjsumxgbww
|
||||
--- FHjBtaqTnM8QZmyOuxMLzFc2P0WpePbyhmrXTxXcdgo
|
||||
gÇ`Ú¶E«ôm´Î#cô5¤+BŞüİwi›îcš�d5Œ´®- {®:•¤sÈ`æN–xı‚É•×Ìšvteöa¨
|
||||
ÇX!ºn2kA™ÿϨ6·Ükxü©¿"FıØHxÛœÉpâÒâãªĞ�¤Û£&ô¨Ò±8ƒ{Ğú‹Ç�
|
||||
-> ssh-ed25519 CIR0mA wbZRuR6TE7oD+sTfCZU561XShPsv0CMxMEpLebi+1hw
|
||||
b1McWvJNoxYG6K5hjiuc0WLPViyCtgdyvmjwhxPfpZ0
|
||||
-> ssh-ed25519 LuJNQA aTL4kxlpMBqABK/CJ5KjAiBDpL3m5ETnlK8hDF61cgw
|
||||
gFIydWCNJH/iur3L7pj0R9cl+/i63jcHhVh0AlJwQvA
|
||||
--- q2VnKs8u6d4NbPJoTDd0dJLuYVW8Ne3NaanbGlCakbQ
|
||||
Q§ËÃï`·Ÿ�þgæëø¶ôPIqA•Ôjâø6bù*`÷"Ly¿Nt£Ôýð›ºgS÷ƒbz({Š�a®£¹(ƒR×Ò¤mT,ÀÔÓù~Œ×¦ÃŒÄÇ5ä‹£¸ï_t8ö!·èF¤*vï £÷&i<œ
|
||||
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Binary file not shown.
Reference in new issue
Block a user