feat: add NixOS deployment infrastructure #8

Closed
Hermes wants to merge 13 commits from feat/nix-deployment-infra into master
11 changed files with 863 additions and 1 deletions

View File

@@ -0,0 +1,203 @@
# AI Model Optimization Cron Job - EXECUTION PROMPT
**When this cron runs, follow these instructions exactly:**
---
## Your Role
You are an AI model optimization agent. Your task is to find the best ollama/llama.cpp configuration for maximum context size and hardware utilization.
**Hardware:**
- 2× AMD MI50 GPUs (32GB VRAM each, 64GB total)
- 128GB system RAM
- ROCm: HSA_OVERRIDE_GFX_VERSION=9.0.6, HIP_VISIBLE_DEVICES=0,1
---
## File Locations
```
STATE: /opt/data/infra/assets/ai-optimizer/state.json
RESULTS: /opt/data/infra/assets/ai-optimizer/results.csv
INFRA_REPO: /opt/data/infra
```
---
## Model Queues
### GPU Track (Coding - prioritize speed + context on GPU)
1. `devstral-small-2:24b`
2. `qwen2.5-coder:32b`
3. `codellama:34b-instruct`
### RAM Track (Knowledge - prioritize max context)
1. `qwen2.5:72b`
2. `nemotron-3-nano:30b`
3. `mixtral:8x7b-instruct`
---
## Context Steps (in order)
```
[32768, 65536, 98304, 131072, 163840, 200704, 262144, 327680]
```
---
## Each Run - Step by Step
### 1. Read State
```bash
cd /opt/data/infra
cat assets/ai-optimizer/state.json
```
### 2. Determine Next Test
- Read `track` (gpu or ram)
- Read `current_model` from queue at `model_index`
- Read `current_config` for parameters to test
- Select next context step from `context_steps` based on `phase`
### 3. Pull Model (if needed)
```bash
docker exec ollama ollama list | grep -q "<model>" || docker exec ollama ollama pull <model>
```
### 4. Create Test Modelfile
```bash
docker exec ollama bash -c "cat <<EOF > /root/.ollama/test_${model}.modelfile
FROM ${model}
PARAMETER num_ctx ${current_config.num_ctx}
PARAMETER num_gpu ${current_config.num_gpu}
PARAMETER flash_attn ${current_config.flash_attn}
PARAMETER num_predict 4096
PARAMETER num_keep 1024
PARAMETER repeat_penalty 1.1
EOF"
docker exec ollama ollama create test-model -f /root/.ollama/test_${model}.modelfile
```
### 5. Run Benchmark
```bash
# Warm up
docker exec ollama ollama run test-model "Hello" > /dev/null
# Coding prompt
START=$(date +%s%N)
docker exec ollama ollama run test-model "Write a Python async context manager that retries a function with exponential backoff, max 5 retries, and logs each attempt using structlog. Include type hints."
END=$(date +%s%N)
# Calculate tokens/sec from output
```
### 6. Measure VRAM (if possible)
```bash
# Try host first
rocm-smi --showmeminfo vram 2>/dev/null || \
# Try via docker
docker exec --privileged ollama rocm-smi --showmeminfo vram 2>/dev/null || \
# Fallback
echo "VRAM measurement unavailable"
```
### 7. Record Results
- Parse tokens/sec from ollama output
- Record VRAM/RAM usage
- Determine if this is best config so far for this model
- Update `best_configs` if tokens/sec improved or context increased
### 8. Update State
```python
# Logic:
if test_successful:
if context_step < max_reached:
phase = "context_scaling"
current_config.num_ctx = next_context_step
else:
# Move to next model
model_index += 1
phase = "context_scaling"
current_config.num_ctx = context_steps[0]
else:
# OOM or error - record last good as best
best_configs[track][current_model] = last_good_config
model_index += 1
phase = "context_scaling"
```
### 9. Commit to Repo
```bash
cd /opt/data/infra
git add assets/ai-optimizer/
git commit -m "ai-optimizer: tested ${model} at ${num_ctx} ctx - ${status}"
git push origin master
```
### 10. Matrix Notification (if available)
```python
import os
if os.getenv("MATRIX_HOME_SERVER") and os.getenv("MATRIX_ACCESS_TOKEN"):
# Send notification to Matrix room
# Room ID from env or config
pass
# Else: silent
```
---
## Stop Conditions
1. All models in both queues have `best_configs` recorded
2. Manual intervention needed (error in state.json `error` field)
3. No progress for 3 consecutive runs (stuck)
---
## Error Handling
If any step fails:
1. Log error to state.json: `"error": {"message": "...", "timestamp": "..."}`
2. Do NOT increment model_index (retry next run)
3. Commit state with error field
4. Exit gracefully
---
## Important Notes
- **No num_parallel**: Do not use this parameter
- **Two tracks**: Complete GPU track first, then RAM track
- **Backend**: Start with ollama, llama.cpp testing is optional (requires uncommenting in compose.yml)
- **Host access**: Some commands need host - use docker exec or SSH if available
- **Ask before deploy**: If config changes needed in NixOS modules, show diff and wait for user confirmation before `nh os switch`
---
## Example State Transitions
**Start:**
```json
{"track": "gpu", "model_index": 0, "current_model": "devstral-small-2:24b", "current_config": {"num_ctx": 32768, ...}}
```
**After successful test at 32k:**
```json
{"track": "gpu", "model_index": 0, "current_model": "devstral-small-2:24b", "current_config": {"num_ctx": 65536, ...}}
```
**After OOM at 131k:**
```json
{
"track": "gpu",
"model_index": 1,
"current_model": "qwen2.5-coder:32b",
"best_configs": {
"gpu": {
"devstral-small-2:24b": {"num_ctx": 98304, "num_gpu": 99, "tokens_per_sec": 11.2}
}
}
}
```

View File

@@ -0,0 +1,283 @@
# AI Model Optimization Cron Job
**Goal:** Find optimal configurations for maximum context size with full hardware utilization.
**Hardware:**
- 2× AMD MI50 GPUs (32GB VRAM each, 64GB total)
- 128GB system RAM
- ROCm: HSA_OVERRIDE_GFX_VERSION=9.0.6, HIP_VISIBLE_DEVICES=0,1
---
## Model Queue
### GPU-Optimized (Coding - prioritize speed + context on GPU)
1. `devstral-small-2:24b` - Best coding model
2. `qwen2.5-coder:32b` - Strong coder, fits on GPU+offload
3. `codellama:34b-instruct` - Legacy but solid
### RAM-Optimized (Knowledge - prioritize max context, accept slower)
1. `qwen2.5:72b` - Best knowledge, needs heavy offload
2. `nemotron-3-nano:30b` - Good general knowledge
3. `mixtral:8x7b-instruct` - MoE, efficient for knowledge
---
## Optimization Strategy
**Two separate tracks:**
### Track A: GPU-Focused (Coding)
```
Baseline: num_ctx=32768, num_gpu=99, flash_attn=true
Steps:
1. Increase context: 32k → 65k → 98k → 131k → 163k
2. At each step, verify VRAM usage < 60GB (leave headroom)
3. If OOM: reduce num_gpu until stable, record best
4. Measure tokens/sec - if < 5 tok/s, consider context too high
```
### Track B: RAM-Focused (Knowledge)
```
Baseline: num_ctx=65536, num_gpu=50, flash_attn=true
Steps:
1. Increase context: 65k → 131k → 200k → 262k → 327k
2. Allow heavy RAM offload (system RAM up to 100GB)
3. If OOM: reduce context or num_gpu
4. Speed less critical - focus on max stable context
```
---
## Backend-Specific Configs
### Ollama (Modelfile parameters)
```
PARAMETER num_ctx <value>
PARAMETER num_gpu <layers>
PARAMETER flash_attn true/false
PARAMETER num_predict 4096
PARAMETER num_keep 1024
PARAMETER repeat_penalty 1.1
```
### Llama.cpp (CLI flags)
```
--ctx-size <value>
--n-gpu-layers <layers>
--flash-attn on/off
--n-predict 4096
--batch-size 4096
--ubatch-size 512
--cache-type-k f16
--cache-type-v f16
--split-mode layer
--no-mmap
```
---
## Host Test Instructions
**The cron runs inside the hermes container. Some tests require host access:**
### 1. VRAM Monitoring (HOST)
```bash
# Run on host to check VRAM usage during/after benchmark
sudo rocm-smi --showmeminfo vram
# Or via docker exec if rocm-smi available in container
docker exec --privileged ollama rocm-smi --showmeminfo vram
```
### 2. Running Ollama Benchmarks (CONTAINER)
```bash
# Pull model
docker exec ollama ollama pull <model>
# Create custom modelfile
docker exec ollama bash -c 'cat <<EOF > /root/.ollama/test.modelfile
FROM <model>
PARAMETER num_ctx 65536
PARAMETER num_gpu 99
PARAMETER flash_attn true
EOF'
# Create model from modelfile
docker exec ollama ollama create test-model -f /root/.ollama/test.modelfile
# Run benchmark (warm model first)
docker exec ollama ollama run test-model "Write a Python async context manager with exponential backoff"
# Cleanup
docker exec ollama ollama rm test-model
```
### 3. Running Llama.cpp Benchmarks (CONTAINER - needs llama.cpp container)
```bash
# Uncomment llama_cpp_devstral in compose.yml first
# Then rebuild: sudo nh os switch --flake .#lazyworkhorse
# Test via HTTP API
curl http://localhost:8300/v1/completions \
-H "Content-Type: application/json" \
-d '{
"model": "devstral-2-small-llama_cpp",
"prompt": "Write a Python function",
"max_tokens": 100
}'
```
### 4. Deploying Changes (HOST via ai-worker)
```bash
# After optimization, commit results
cd /home/ai-worker/infra
git add assets/ai-optimizer/
git commit -m "ai-optimizer: new best config for <model>"
git push
# If config changes needed in ollama_init_custom_models.nix:
# 1. Edit the file
# 2. nixpkgs-fmt .
# 3. Show diff to user
# 4. Wait for confirmation
# 5. sudo nh os switch --flake .#lazyworkhorse
```
### 5. Accessing Host from Hermes Container
```bash
# SSH to host as ai-worker (key should be mounted)
ssh -i /path/to/key ai-worker@host.docker.internal
# Or via docker socket if mounted
# (not recommended for security)
```
---
## Benchmark Prompts
### Coding (Track A)
```
"Write a Python async context manager that retries a function with exponential backoff, max 5 retries, and logs each attempt using structlog. Include type hints and error handling."
```
### Knowledge (Track B)
```
"Explain the complete memory hierarchy in modern GPUs, from registers through L1/L2 caches to VRAM, and how data moves between them during matrix multiplication. Include bandwidth considerations for each level."
```
### Measurement
- Tokens per second (generation speed)
- Time to first token (latency)
- VRAM usage (via rocm-smi)
- System RAM usage (via free -h)
- Context success (did it complete without OOM?)
---
## State File Structure
`/opt/data/infra/assets/ai-optimizer/state.json`
```json
{
"track": "gpu",
"current_model": "devstral-small-2:24b",
"model_index": 0,
"phase": "context_scaling",
"backend": "ollama",
"current_config": {
"num_ctx": 65536,
"num_gpu": 99,
"flash_attn": true
},
"best_configs": {
"gpu": {
"devstral-small-2:24b": {
"backend": "ollama",
"num_ctx": 131072,
"num_gpu": 99,
"flash_attn": true,
"tokens_per_sec": 12.5,
"vram_used_gb": 58.2,
"tested_at": "2026-04-28T17:00:00Z"
}
},
"ram": {}
},
"completed_models": [],
"gpu_queue": ["devstral-small-2:24b", "qwen2.5-coder:32b", "codellama:34b-instruct"],
"ram_queue": ["qwen2.5:72b", "nemotron-3-nano:30b", "mixtral:8x7b-instruct"]
}
```
---
## Results CSV
`/opt/data/infra/assets/ai-optimizer/results.csv`
```csv
timestamp,track,model,backend,phase,num_ctx,num_gpu,flash_attn,tokens_per_sec,vram_gb,ram_gb,status,is_best
2026-04-28T17:00:00Z,gpu,devstral-small-2:24b,ollama,context_scaling,65536,99,true,15.2,52.1,18.4,success,false
```
---
## Cron Job Flow
```
1. Read state.json
2. If both queues empty → STOP (all models tested)
3. Select next model from current track queue
4. Pull model if needed (docker exec ollama ollama pull)
5. Create Modelfile / llama.cpp config with current test params
6. Run benchmark (both prompts)
7. Measure: tokens/sec, VRAM (rocm-smi), RAM (free -h)
8. If successful:
- Increase context (next step)
- Update current_config in state
9. If OOM/error:
- Record last good config as best_configs[track][model]
- Move to next model in queue
10. Update state.json
11. Append to results.csv
12. Git commit + push to /opt/data/infra
13. Send Matrix notification if available, else silent
```
---
## Matrix Notification (Optional)
```python
# If matrix credentials available in environment
if os.getenv("MATRIX_HOME_SERVER") and os.getenv("MATRIX_ACCESS_TOKEN"):
# Send completion notification
# Room: !ai-optimizer:lazyworkhorse.net (or similar)
pass
# Else: silent, just commit
```
---
## Files to Create
```
/opt/data/infra/assets/ai-optimizer/
├── state.json # Current progress
├── results.csv # All test results
├── best_configs.json # Final best configs (human-readable)
└── CRON_JOB_DRAFT.md # This file
```
---
## Notes
- **No num_parallel**: Removed to avoid limiting other settings
- **Two tracks**: GPU (coding/speed) vs RAM (knowledge/context)
- **Both backends**: Test ollama first, then llama.cpp if available
- **Host tests**: rocm-smi must run on host or privileged container
- **Deploy**: ai-worker has sudo for nh/nixos-rebuild, must ask user first

View File

@@ -0,0 +1 @@
timestamp,track,model,backend,phase,num_ctx,num_gpu,flash_attn,tokens_per_sec,vram_gb,ram_gb,status,is_best
1 timestamp track model backend phase num_ctx num_gpu flash_attn tokens_per_sec vram_gb ram_gb status is_best

View File

@@ -0,0 +1,21 @@
{
"track": "gpu",
"current_model": "devstral-small-2:24b",
"model_index": 0,
"phase": "context_scaling",
"backend": "ollama",
"current_config": {
"num_ctx": 32768,
"num_gpu": 99,
"flash_attn": true
},
"best_configs": {
"gpu": {},
"ram": {}
},
"completed_models": [],
"gpu_queue": ["devstral-small-2:24b", "qwen2.5-coder:32b", "codellama:34b-instruct"],
"ram_queue": ["qwen2.5:72b", "nemotron-3-nano:30b", "mixtral:8x7b-instruct"],
"context_steps": [32768, 65536, 98304, 131072, 163840, 200704, 262144, 327680],
"last_updated": "2026-04-28T17:00:00Z"
}

View File

@@ -0,0 +1,57 @@
# Multi-Agent Worktree Policy
## Rule: Each Agent Session Gets Its Own Worktree
To prevent conflicts when multiple agents work on the same repository:
### Before Starting Work
```bash
# Create isolated worktree in /tmp
WORKTREE_ID=$(date +%s)-$$
WORKTREE_PATH="/tmp/infra-worktree-$WORKTREE_ID"
git worktree add -b "agent/$WORKTREE_ID" "$WORKTREE_PATH"
cd "$WORKTREE_PATH"
# Do your work...
git add .
git commit -m "..."
# Push when done
git push origin "agent/$WORKTREE_ID"
# Cleanup
cd /opt/data/infra
git worktree remove "$WORKTREE_PATH"
```
### Benefits
- No branch conflicts between agents
- Each agent has isolated working directory
- Automatic cleanup after session
- Easy to track which agent did what
### For Hermes Agent
Add to agent system prompt or skill:
```
Before modifying any git repository:
1. Check if worktree already exists for this session
2. If not, create one: git worktree add -b "agent/$SESSION_ID" /tmp/repo-worktree-$SESSION_ID
3. Do all work in the worktree
4. Push branch when complete
5. Remove worktree on cleanup
```
### Manual Cleanup (if needed)
```bash
# List all worktrees
git worktree list
# Remove stale ones
git worktree prune
git worktree remove /tmp/infra-worktree-XXX
```

View File

@@ -0,0 +1,32 @@
# Nix Installation for Hermes Agent Container
# Add these lines to the Dockerfile to bake Nix into the container image
# --- ADD AFTER BASE IMAGE AND BEFORE USER SETUP ---
# Install Nix (Determinate Systems installer)
# This provides nix, nixos-rebuild, and the Nix package manager
RUN apt-get update && apt-get install -y --no-install-recommends \
curl \
xz-utils \
&& rm -rf /var/lib/apt/lists/*
# Download and run Nix installer (non-interactive)
RUN curl --proto '=https' --tlsv1.2 -sSf -L https://install.determinate.systems/nix \
-o /tmp/nix-install.sh \
&& chmod +x /tmp/nix-install.sh \
&& sh /tmp/nix-install.sh install --no-confirm \
&& rm /tmp/nix-install.sh
# Configure Nix for flakes
RUN mkdir -p /root/.config/nix \
&& echo 'experimental-features = nix-command flakes' > /root/.config/nix/nix.conf \
&& echo 'substituters = https://cache.nixos.org/' >> /root/.config/nix/nix.conf
# Add Nix to PATH for all users
ENV PATH="/nix/var/nix/profiles/default/bin:$PATH"
# Optional: Expose Nix daemon socket if you want to use host's Nix (less secure)
# VOLUME ["/nix/store"]
# Note: Not recommended for security - builds run in container instead
# --- CONTINUE WITH EXISTENT DOCKERFILE ---

View File

@@ -12,10 +12,23 @@
url = "git+https://git.lix.systems/lix-project/lix?ref=main"; url = "git+https://git.lix.systems/lix-project/lix?ref=main";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# uConsole CM5 hardware support
nixpkgs-uconsole.url = "github:nixos/nixpkgs/nixos-25.05";
nixos-uconsole = {
url = "github:nixos-uconsole/nixos-uconsole";
inputs.nixpkgs.follows = "nixpkgs-uconsole";
};
# nixos-raspberrypi provides hardware.raspberry-pi options that uconsole-cm5 needs
nixos-raspberrypi = {
url = "github:nvmd/nixos-raspberrypi/v1.20260317.0";
inputs.nixpkgs.follows = "nixpkgs-uconsole";
};
# Raspberry Pi 5 hardware support
nixos-hardware.url = "github:nixos/nixos-hardware/master";
self.submodules = true; self.submodules = true;
}; };
outputs = { self, nixpkgs, agenix, lix, ... }@inputs: outputs = { self, nixpkgs, nixpkgs-uconsole, agenix, lix, nixos-uconsole, nixos-raspberrypi, nixos-hardware, ... }@inputs:
let let
system = "x86_64-linux"; system = "x86_64-linux";
keys = import ./lib/keys.nix; keys = import ./lib/keys.nix;
@@ -79,6 +92,24 @@
./hosts/cyt-pi/hardware-configuration.nix ./hosts/cyt-pi/hardware-configuration.nix
]; ];
}; };
uConsole = nixpkgs-uconsole.lib.nixosSystem {
system = "aarch64-linux";
specialArgs = { inherit self keys paths inputs; };
modules = [
{
nixpkgs.config.allowUnfree = true;
nixpkgs.hostPlatform = "aarch64-linux";
nix.package = lix.packages."aarch64-linux".default;
}
# Raspberry Pi 5 base (provides hardware.raspberry-pi options)
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
# uConsole CM5 hardware support (display, kernel, config)
nixos-uconsole.nixosModules.uconsole-cm5
./hosts/uconsole/configuration.nix
./hosts/uconsole/hardware-configuration.nix
];
};
}; };
devShells.${system}.default = devShell; devShells.${system}.default = devShell;
}; };

View File

@@ -0,0 +1,116 @@
{ config, lib, pkgs, paths, self, keys, inputs, ... }:
{
# --- CORE HARDWARE (CM5 / RPi5) ---
# nixos-raspberrypi.nixosModules.raspberry-pi-5.base + nixos-uconsole.nixosModules.uconsole-cm5 imported in flake.nix
# --- BASIC HOST INFO ---
networking.hostName = "uConsole";
networking.networkmanager.enable = true;
time.timeZone = "America/Montreal";
i18n.defaultLocale = "en_CA.UTF-8";
# --- GPS DAEMON ---
services.gpsd = {
enable = true;
devices = [ "/dev/ttyAMA0" ]; # Default port for RPi5/CM5 GPS
nowait = true;
};
# --- USER CONFIGURATION ---
users.users.thierry = {
isNormalUser = true;
description = "Thierry";
extraGroups = [
"wheel" # Sudo
"dialout" # Access to serial/HAM rigs
"plugdev" # Access to USB SDRs
"wireshark" # Packet capture without root
"video" # Hardware acceleration access
"networkmanager"
];
openssh.authorizedKeys.keys = [
keys.users.gortium.main
keys.users.gortium.gitea
];
};
# --- INTERFACE (WAYLAND/SWAY) ---
# Sway is recommended for the uConsole's low resources
programs.sway = {
enable = true;
extraOptions = [ "--unsupported-gpu" ]; # Often needed for RPi
};
# --- SOFTWARE TOOLKITS ---
environment.systemPackages = with pkgs; [
# Base Tools (for your Doom Emacs environment)
emacs-pgtk # Emacs with Wayland support
git # Required for Doom Emacs / Flakes
ripgrep # Fast searching for Emacs/CLI
fd # Better find for Emacs
htop # Resource monitor
tmux # Terminal multiplexer
neovim # Alternative editor
# HAM RADIO (Digital Modes)
js8call # Weak-signal keyboard messaging
wsjtx # FT8, JT65, etc.
fldigi # Digital modem (PSK, RTTY)
pat # Winlink client (Use 'pat configure' after install)
direwolf # Software TNC for APRS
chirp # Radio programming
hamlib # Rig control (rigctl)
trustedqsl # LotW log signing
# SDR + RF ANALYSIS
sdrpp # Modern SDR GUI (Best for uConsole)
gqrx # Classic SDR receiver
rtl-sdr # Drivers for RTL2832U
inspectrum # Offline signal analysis
soapysdr-with-plugins # Hardware abstraction layer
# LORA, MESH & RETICULUM
meshtastic # CLI tools for Meshtastic nodes
reticulum-network-stack # The RNS stack (rnsd, rnsh)
nomadnet # Reticulum browser/messaging
lxmf # Lightweight Mesh Exchange Protocol
sidechannel-rns # Visual UI for Reticulum communication
# HACKING & SECURITY (Kali-like suite)
nmap # Port scanning
metasploit # Exploitation framework
aircrack-ng # Wi-Fi auditing
kismet # Wireless sniffer (Essential for your Pi Zero project)
bettercap # MITM and network attack tool
wireshark # Protocol analyzer
burpsuite # Web vulnerability scanner
hashcat # Password recovery
john # John the Ripper (password cracking)
sqlmap # Automated SQL injection
# GPS & OFFLINE MAPPING
foxtrotgps # Lightweight map viewer (Perfect for small screens)
viking # GPS data editor and map viewer
gpsbabel # GPS data conversion
marble # KDE Virtual Globe (supports offline tiles)
];
# Udev rules for SDR and Radio hardware access
services.udev.packages = [
pkgs.rtl-sdr
pkgs.librtlsdr
];
# Enable Wireshark privilege separation
programs.wireshark.enable = true;
# Enable OpenSSH
services.openssh = {
enable = true;
settings.PermitRootLogin = "prohibit-password";
};
# System state version
system.stateVersion = "23.11";
}

View File

@@ -0,0 +1,30 @@
{ config, lib, pkgs, modulesPath, ... }:
{
imports =
[ (modulesPath + "/installer/scan/not-detected.nix")
];
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "sdhci_pci" ];
boot.initrd.kernelModules = [ ];
boot.kernelModules = [ ];
boot.extraModulePackages = [ ];
# uConsole CM5 specific filesystem (eMMC boot)
fileSystems."/" =
{ device = "/dev/disk/by-label/NIXOS_SD";
fsType = "ext4";
options = [ "noatime" ];
};
fileSystems."/boot" =
{ device = "/dev/disk/by-label/FIRMWARE";
fsType = "vfat";
};
swapDevices = [ ];
# uConsole CM5 is ARM64
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
hardware.enableRedistributableFirmware = true;
}

30
scripts/deploy-ssh-config Normal file
View File

@@ -0,0 +1,30 @@
# Hermes Container SSH Configuration
# For NixOS deployment to remote hosts
Host lazyworkhorse
HostName localhost
User gortium
IdentityFile /opt/data/home/.ssh/id_hermes_gitea
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
Host cyt-pi
HostName cyt-pi.local
User thierry
IdentityFile /opt/data/home/.ssh/id_hermes_gitea
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
Host uconsole
HostName uconsole.local
User thierry
IdentityFile /opt/data/home/.ssh/id_hermes_gitea
StrictHostKeyChecking no
UserKnownHostsFile /dev/null
# Generic pattern for .local hosts
Host *.local
User thierry
IdentityFile /opt/data/home/.ssh/id_hermes_gitea
StrictHostKeyChecking no
UserKnownHostsFile /dev/null

58
scripts/deploy.sh Normal file
View File

@@ -0,0 +1,58 @@
#!/usr/bin/env bash
# NixOS Deployment Helper Script
# Usage: ./deploy.sh <hostname> [branch] [action]
# Example: ./deploy.sh uConsole feat/test switch
set -e
HOSTNAME="${1:-}"
BRANCH="${2:-main}"
ACTION="${3:-switch}"
if [ -z "$HOSTNAME" ]; then
echo "Usage: $0 <hostname> [branch] [action]"
echo " hostname: lazyworkhorse, cyt-pi, uConsole"
echo " branch: git branch to deploy (default: main)"
echo " action: switch, test, boot (default: switch)"
exit 1
fi
# Environment setup
export GIT_SSH_COMMAND="ssh -i /opt/data/home/.ssh/id_hermes_gitea -o StrictHostKeyChecking=no"
export PATH="/nix/var/nix/profiles/default/bin:$PATH"
cd /opt/data/infra
echo "=== NixOS Deployment ==="
echo "Host: $HOSTNAME"
echo "Branch: $BRANCH"
echo "Action: $ACTION"
echo ""
# Checkout branch
echo "[1/4] Checking out branch..."
git fetch origin "$BRANCH" 2>/dev/null || true
git checkout "$BRANCH" 2>/dev/null || git checkout -b "$BRANCH"
# Update submodules
echo "[2/4] Updating submodules..."
git submodule update --init --recursive
# Build configuration
echo "[3/4] Building configuration..."
if [ "$ACTION" = "switch" ]; then
nixos-rebuild switch --flake ".#$HOSTNAME" --target-host "thierry@$HOSTNAME" --use-remote-sudo
elif [ "$ACTION" = "test" ]; then
nixos-rebuild test --flake ".#$HOSTNAME" --target-host "thierry@$HOSTNAME" --use-remote-sudo
elif [ "$ACTION" = "boot" ]; then
nixos-rebuild boot --flake ".#$HOSTNAME" --target-host "thierry@$HOSTNAME" --use-remote-sudo
else
echo "Unknown action: $ACTION"
exit 1
fi
echo ""
echo "[4/4] Deployment complete!"
echo "Host: $HOSTNAME"
echo "Branch: $BRANCH"
echo "Time: $(date -Iseconds)"