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