public gitea + nixarchy work
This commit is contained in:
1 parent
8bd66c9975
commit
a7c1b1cc0c
29 files changed
+1192
-97
No files matched your search
@@ -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.
|
||||
|
||||
Reference in new issue
Block a user