mirror of
https://github.com/ryan4yin/nix-config.git
synced 2026-11-19 22:28:27 +01:00
The CanoKey resident SSH key (`ryan@canokey-moe`, the backup once a new primary key is enrolled) is now authorized for ryan and root on every host, and sudo on server and agent hosts accepts its touch through the forwarded agent (`pam_rssh`). Without the key or a forwarded agent, sudo asks for the password and login falls back to the file keys. Only `canokeySshKeys` can satisfy sudo. Risks to weigh: - Colmena deploys need one touch per host connection, since the agent offers the CanoKey key first. - Desktops now forward the agent to every `hostsAddr` alias, as they already did for `192.168.*`; while a session is open, root there can request signatures, each needing a touch. ### Verification - `just test` exits 0; CI passed on the first commit. - Evaluated: sudo PAM stack `rssh` → `unix` → `deny` on shoryu, kana, akane and k3s-test-1-master-1, ai-niri keeps `pam_u2f`; shoryu root and ryan list `ryan@canokey-moe`. - Not yet verified on a running host. ### Manual step after merge Deploy the servers, then `just niri`; close old multiplexed connections (`ssh -O exit <host>`) and try `sudo true` over SSH. AI assistance: DeepSeek Harness (claude-opus-5-5). Assisted-by: DeepSeek Harness (claude-opus-5-5)
31 lines
762 B
Nix
31 lines
762 B
Nix
{
|
|
mylib,
|
|
...
|
|
}:
|
|
{
|
|
imports = [
|
|
../base/btrbk.nix
|
|
../base/btop.nix
|
|
../base/core.nix
|
|
../base/i18n.nix
|
|
(mylib.relativeToRoot "hardening/kernel-hardening.nix")
|
|
../base/monitoring.nix
|
|
../base/nix.nix
|
|
../nushell-login.nix
|
|
../base/packages.nix
|
|
../base/ssh.nix
|
|
../base/user-group.nix
|
|
./ssh-agent-sudo.nix
|
|
|
|
# This server imports base files individually instead of the whole
|
|
# modules/nixos/base group, so pull the shared firewall in explicitly.
|
|
../base/networking/firewall.nix
|
|
|
|
../../base
|
|
# AppArmor is wired via modules/nixos/base/default.nix for other hosts; this
|
|
# aarch64 server imports base files individually, so add it explicitly.
|
|
(mylib.relativeToRoot "hardening/apparmor")
|
|
];
|
|
|
|
}
|