Compare commits
5
Commits
master
..
f5c1625295
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f5c1625295 | ||
|
|
39b6e6e2c4 | ||
|
|
1a8310fc9a | ||
|
|
1b05ed5dc0 | ||
|
|
b7dd7f2bf7 |
No files matched your search
@@ -1,3 +0,0 @@
|
|||||||
node_modules/
|
|
||||||
runs/
|
|
||||||
*.log
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"nixosConfigDir": "/home/m3tam3re/p/NIX/nixos-config",
|
|
||||||
"m3taHomeDir": "/home/m3tam3re/p/NIX/m3ta-home",
|
|
||||||
"specPath": "/home/m3tam3re/p/NIX/nixos-config/.a5c/inputs/fix-eval-warnings-spec.md"
|
|
||||||
}
|
|
||||||
@@ -1,10 +0,0 @@
|
|||||||
Fix the following Nix/Home Manager evaluation warnings except for the gc/nh conflict warning:
|
|
||||||
|
|
||||||
- `evaluation warning: 'system' has been renamed to/replaced by 'stdenv.hostPlatform.system'`
|
|
||||||
- `evaluation warning: m3tam3re profile: programs.ssh.matchBlocks defined in /nix/store/...-users/m3tam3re/identities/private.nix is deprecated. Use programs.ssh.settings.`
|
|
||||||
|
|
||||||
Do not fix or change the warning:
|
|
||||||
|
|
||||||
- `evaluation warning: programs.nh.clean.enable and nix.gc.automatic are both enabled. Please use one or the other to avoid conflict.`
|
|
||||||
|
|
||||||
The private identity source file is in `/home/m3tam3re/p/NIX/m3ta-home/users/m3tam3re/identities/private.nix`.
|
|
||||||
@@ -1,5 +0,0 @@
|
|||||||
{
|
|
||||||
"projectRoot": "/home/m3tam3re/p/NIX/nixos-config",
|
|
||||||
"isNewProject": false,
|
|
||||||
"additionalContext": "Install and configure babysitter for this existing NixOS flake configuration repository. Respect AGENTS.md instructions, Beads workflow, Nix conventions, and avoid interactive/destructive operations unless explicitly approved."
|
|
||||||
}
|
|
||||||
Generated
-4570
File diff suppressed because it is too large.
Load diff
@@ -1,9 +0,0 @@
|
|||||||
{
|
|
||||||
"name": "nixos-config-a5c",
|
|
||||||
"version": "1.0.0",
|
|
||||||
"private": true,
|
|
||||||
"type": "module",
|
|
||||||
"dependencies": {
|
|
||||||
"@a5c-ai/babysitter-sdk": "latest"
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -1,301 +0,0 @@
|
|||||||
/**
|
|
||||||
* @process local/fix-nix-eval-warnings
|
|
||||||
* @description Fix Nix/Home Manager evaluation warnings except the nh/gc conflict warning.
|
|
||||||
* @skill systematic-debugging methodologies/superpowers/systematic-debugging.js
|
|
||||||
* @skill verification-before-completion methodologies/superpowers/verification-before-completion.js
|
|
||||||
* @skill root-cause-diagnosis methodologies/shared/root-cause-diagnosis.js
|
|
||||||
*/
|
|
||||||
|
|
||||||
import { defineTask } from '@a5c-ai/babysitter-sdk';
|
|
||||||
|
|
||||||
const q = (value) => `'${String(value).replace(/'/g, `'\\''`)}'`;
|
|
||||||
|
|
||||||
export async function process(inputs, ctx) {
|
|
||||||
const nixosConfigDir = inputs.nixosConfigDir || '/home/m3tam3re/p/NIX/nixos-config';
|
|
||||||
const m3taHomeDir = inputs.m3taHomeDir || '/home/m3tam3re/p/NIX/m3ta-home';
|
|
||||||
const specPath = inputs.specPath || `${nixosConfigDir}/.a5c/inputs/fix-eval-warnings-spec.md`;
|
|
||||||
|
|
||||||
const spec = await ctx.task(readSpecTask, { specPath });
|
|
||||||
|
|
||||||
const inspection = await ctx.task(inspectWarningSourcesTask, {
|
|
||||||
nixosConfigDir,
|
|
||||||
m3taHomeDir,
|
|
||||||
});
|
|
||||||
|
|
||||||
const implementation = await ctx.task(implementFixesTask, {
|
|
||||||
nixosConfigDir,
|
|
||||||
m3taHomeDir,
|
|
||||||
spec: spec.stdout,
|
|
||||||
inspection: inspection.stdout,
|
|
||||||
});
|
|
||||||
|
|
||||||
const formatting = await ctx.task(formatChangedNixTask, {
|
|
||||||
m3taHomeDir,
|
|
||||||
});
|
|
||||||
|
|
||||||
const verification = await ctx.task(verifyWarningsTask, {
|
|
||||||
nixosConfigDir,
|
|
||||||
m3taHomeDir,
|
|
||||||
});
|
|
||||||
|
|
||||||
const artifacts = await ctx.task(collectArtifactsTask, {
|
|
||||||
nixosConfigDir,
|
|
||||||
m3taHomeDir,
|
|
||||||
verifyStdout: verification.stdout || '',
|
|
||||||
verifyStderr: verification.stderr || '',
|
|
||||||
});
|
|
||||||
|
|
||||||
const acceptance = await ctx.task(acceptanceReviewTask, {
|
|
||||||
spec: spec.stdout,
|
|
||||||
artifacts: artifacts.stdout,
|
|
||||||
});
|
|
||||||
|
|
||||||
if (!acceptance.accepted) {
|
|
||||||
await ctx.breakpoint({
|
|
||||||
title: 'Warning fix acceptance review failed',
|
|
||||||
question: `Acceptance review did not approve the changes: ${acceptance.reason}`,
|
|
||||||
context: {
|
|
||||||
runId: ctx.runId,
|
|
||||||
files: [
|
|
||||||
{ path: `${m3taHomeDir}/users/m3tam3re/identities/private.nix`, format: 'nix', label: 'Private SSH identity' },
|
|
||||||
{ path: `${m3taHomeDir}/profiles/sets/coding/agents/agents.nix`, format: 'nix', label: 'Agent packages' },
|
|
||||||
{ path: `${m3taHomeDir}/profiles/contexts/desktop/default.nix`, format: 'nix', label: 'Desktop packages' },
|
|
||||||
],
|
|
||||||
},
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
return {
|
|
||||||
success: acceptance.accepted,
|
|
||||||
summary: implementation.summary,
|
|
||||||
changedFiles: implementation.changedFiles,
|
|
||||||
verification: {
|
|
||||||
formatting: formatting.stdout,
|
|
||||||
warnings: verification.stdout,
|
|
||||||
review: acceptance,
|
|
||||||
},
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
||||||
export const readSpecTask = defineTask('read-spec', (args, taskCtx) => ({
|
|
||||||
kind: 'shell',
|
|
||||||
title: 'Read warning-fix spec',
|
|
||||||
shell: {
|
|
||||||
command: `cat ${q(args.specPath)}`,
|
|
||||||
expectedExitCode: 0,
|
|
||||||
timeout: 10000,
|
|
||||||
},
|
|
||||||
io: {
|
|
||||||
inputJsonPath: `tasks/${taskCtx.effectId}/input.json`,
|
|
||||||
outputJsonPath: `tasks/${taskCtx.effectId}/output.json`,
|
|
||||||
},
|
|
||||||
labels: ['spec', 'shell'],
|
|
||||||
}));
|
|
||||||
|
|
||||||
export const inspectWarningSourcesTask = defineTask('inspect-warning-sources', (args, taskCtx) => ({
|
|
||||||
kind: 'shell',
|
|
||||||
title: 'Inspect current warning sources',
|
|
||||||
shell: {
|
|
||||||
command: [
|
|
||||||
'set -euo pipefail',
|
|
||||||
`echo '== nixos-config status =='`,
|
|
||||||
`cd ${q(args.nixosConfigDir)} && git status --short`,
|
|
||||||
`echo`,
|
|
||||||
`echo '== m3ta-home status =='`,
|
|
||||||
`cd ${q(args.m3taHomeDir)} && git status --short`,
|
|
||||||
`echo`,
|
|
||||||
`echo '== active pkgs.system-style package selectors =='`,
|
|
||||||
`grep -RIn --include='*.nix' -E 'packages[.]\\$\\{pkgs[.]system\\}|packages[.]\\$\\{prev[.]system\\}|packages[.]\\$\\{final[.]system\\}' ${q(args.nixosConfigDir)} ${q(args.m3taHomeDir)} || true`,
|
|
||||||
`echo`,
|
|
||||||
`echo '== SSH matchBlocks in m3ta-home identities =='`,
|
|
||||||
`grep -RIn --include='*.nix' 'matchBlocks' ${q(`${args.m3taHomeDir}/users/m3tam3re/identities`)} || true`,
|
|
||||||
].join('\n'),
|
|
||||||
expectedExitCode: 0,
|
|
||||||
timeout: 30000,
|
|
||||||
},
|
|
||||||
io: {
|
|
||||||
inputJsonPath: `tasks/${taskCtx.effectId}/input.json`,
|
|
||||||
outputJsonPath: `tasks/${taskCtx.effectId}/output.json`,
|
|
||||||
},
|
|
||||||
labels: ['diagnosis', 'shell'],
|
|
||||||
}));
|
|
||||||
|
|
||||||
export const implementFixesTask = defineTask('implement-warning-fixes', (args, taskCtx) => ({
|
|
||||||
kind: 'agent',
|
|
||||||
title: 'Implement requested warning fixes',
|
|
||||||
agent: {
|
|
||||||
name: 'worker',
|
|
||||||
prompt: {
|
|
||||||
role: 'Nix/Home Manager maintenance engineer',
|
|
||||||
task: 'Edit the repositories to remove the requested evaluation warnings, excluding the nh/gc warning by request.',
|
|
||||||
context: {
|
|
||||||
nixosConfigDir: args.nixosConfigDir,
|
|
||||||
m3taHomeDir: args.m3taHomeDir,
|
|
||||||
specVerbatim: args.spec,
|
|
||||||
inspectionStdout: args.inspection,
|
|
||||||
},
|
|
||||||
instructions: [
|
|
||||||
'Execute the task fully; do not just provide a plan.',
|
|
||||||
'Do not invoke the babysit skill or create another babysitter run.',
|
|
||||||
'Read every file before editing it.',
|
|
||||||
'Preserve unrelated existing user changes, especially any dirty files in nixos-config such as flake.nix or flake.lock.',
|
|
||||||
'Fix active uses of pkgs.system/prev.system/final.system that trigger the Nixpkgs deprecation warning by using stdenv.hostPlatform.system through the appropriate package set.',
|
|
||||||
'Migrate /home/m3tam3re/p/NIX/m3ta-home/users/m3tam3re/identities/private.nix from programs.ssh.matchBlocks to programs.ssh.settings.',
|
|
||||||
'For programs.ssh.settings, use OpenSSH directive names such as HostName, User, Port, and IdentityFile; do not keep legacy camelCase option names under settings.',
|
|
||||||
'Do not change programs.nh.clean.enable or nix.gc.automatic; the user explicitly excluded that warning.',
|
|
||||||
'Keep the change minimal and focused on the warnings in the spec.',
|
|
||||||
'Run a quick static check of the edited files if practical, but leave deterministic verification to the process quality gate.',
|
|
||||||
],
|
|
||||||
outputFormat: 'JSON with summary, changedFiles, and verificationNotes.',
|
|
||||||
},
|
|
||||||
outputSchema: {
|
|
||||||
type: 'object',
|
|
||||||
required: ['summary', 'changedFiles', 'verificationNotes'],
|
|
||||||
properties: {
|
|
||||||
summary: { type: 'string' },
|
|
||||||
changedFiles: { type: 'array', items: { type: 'string' } },
|
|
||||||
verificationNotes: { type: 'array', items: { type: 'string' } },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
io: {
|
|
||||||
inputJsonPath: `tasks/${taskCtx.effectId}/input.json`,
|
|
||||||
outputJsonPath: `tasks/${taskCtx.effectId}/output.json`,
|
|
||||||
},
|
|
||||||
labels: ['implementation', 'agent', 'nix'],
|
|
||||||
}));
|
|
||||||
|
|
||||||
export const formatChangedNixTask = defineTask('format-changed-nix', (args, taskCtx) => ({
|
|
||||||
kind: 'shell',
|
|
||||||
title: 'Format changed Nix files',
|
|
||||||
shell: {
|
|
||||||
command: [
|
|
||||||
'set -euo pipefail',
|
|
||||||
`cd ${q(args.m3taHomeDir)}`,
|
|
||||||
`if command -v alejandra >/dev/null 2>&1; then`,
|
|
||||||
` alejandra users/m3tam3re/identities/private.nix profiles/sets/coding/agents/agents.nix profiles/contexts/desktop/default.nix`,
|
|
||||||
`else`,
|
|
||||||
` nix run nixpkgs#alejandra -- users/m3tam3re/identities/private.nix profiles/sets/coding/agents/agents.nix profiles/contexts/desktop/default.nix`,
|
|
||||||
`fi`,
|
|
||||||
].join('\n'),
|
|
||||||
expectedExitCode: 0,
|
|
||||||
timeout: 120000,
|
|
||||||
},
|
|
||||||
io: {
|
|
||||||
inputJsonPath: `tasks/${taskCtx.effectId}/input.json`,
|
|
||||||
outputJsonPath: `tasks/${taskCtx.effectId}/output.json`,
|
|
||||||
},
|
|
||||||
labels: ['format', 'shell'],
|
|
||||||
}));
|
|
||||||
|
|
||||||
export const verifyWarningsTask = defineTask('verify-warning-removal', (args, taskCtx) => ({
|
|
||||||
kind: 'shell',
|
|
||||||
title: 'Verify requested warnings are gone',
|
|
||||||
shell: {
|
|
||||||
command: [
|
|
||||||
'set -euo pipefail',
|
|
||||||
`echo '== static checks =='`,
|
|
||||||
`! grep -RIn --include='*.nix' -E 'packages[.]\\$\\{pkgs[.]system\\}|packages[.]\\$\\{prev[.]system\\}|packages[.]\\$\\{final[.]system\\}' ${q(`${args.m3taHomeDir}/profiles`)} || { echo 'Found deprecated package system selector' >&2; exit 1; }`,
|
|
||||||
`! grep -n 'matchBlocks' ${q(`${args.m3taHomeDir}/users/m3tam3re/identities/private.nix`)} || { echo 'private.nix still uses matchBlocks' >&2; exit 1; }`,
|
|
||||||
`grep -n 'settings = {' ${q(`${args.m3taHomeDir}/users/m3tam3re/identities/private.nix`)}`,
|
|
||||||
`echo`,
|
|
||||||
`echo '== nix eval m3-ares =='`,
|
|
||||||
`cd ${q(args.nixosConfigDir)}`,
|
|
||||||
`eval_stdout=$(mktemp)`,
|
|
||||||
`eval_stderr=$(mktemp)`,
|
|
||||||
`set +e`,
|
|
||||||
`nix eval .#nixosConfigurations.m3-ares.config.system.build.toplevel.drvPath --show-trace >"$eval_stdout" 2>"$eval_stderr"`,
|
|
||||||
`status=$?`,
|
|
||||||
`set -e`,
|
|
||||||
`cat "$eval_stdout"`,
|
|
||||||
`cat "$eval_stderr" >&2`,
|
|
||||||
`if [ "$status" -ne 0 ]; then exit "$status"; fi`,
|
|
||||||
`if grep -F "'system' has been renamed" "$eval_stderr"; then echo 'Deprecated system warning still present' >&2; exit 1; fi`,
|
|
||||||
`if grep -F 'programs.ssh.matchBlocks' "$eval_stderr"; then echo 'Deprecated SSH matchBlocks warning still present' >&2; exit 1; fi`,
|
|
||||||
`if grep -F 'programs.nh.clean.enable and nix.gc.automatic' "$eval_stderr" >/dev/null; then echo 'Allowed nh/gc warning remains by request.'; fi`,
|
|
||||||
].join('\n'),
|
|
||||||
expectedExitCode: 0,
|
|
||||||
timeout: 300000,
|
|
||||||
},
|
|
||||||
io: {
|
|
||||||
inputJsonPath: `tasks/${taskCtx.effectId}/input.json`,
|
|
||||||
outputJsonPath: `tasks/${taskCtx.effectId}/output.json`,
|
|
||||||
},
|
|
||||||
labels: ['verification', 'shell', 'nix'],
|
|
||||||
}));
|
|
||||||
|
|
||||||
export const collectArtifactsTask = defineTask('collect-artifacts', (args, taskCtx) => ({
|
|
||||||
kind: 'shell',
|
|
||||||
title: 'Collect diffs and verification output',
|
|
||||||
shell: {
|
|
||||||
command: [
|
|
||||||
'set -euo pipefail',
|
|
||||||
`echo '== m3ta-home diff =='`,
|
|
||||||
`cd ${q(args.m3taHomeDir)} && git diff -- users/m3tam3re/identities/private.nix profiles/sets/coding/agents/agents.nix profiles/contexts/desktop/default.nix`,
|
|
||||||
`echo`,
|
|
||||||
`echo '== nixos-config diff (should not include warning fix unless needed) =='`,
|
|
||||||
`cd ${q(args.nixosConfigDir)} && git diff -- overlays/default.nix flake.nix flake.lock || true`,
|
|
||||||
`echo`,
|
|
||||||
`echo '== verification stdout =='`,
|
|
||||||
`cat <<'VERIFY_STDOUT'`,
|
|
||||||
args.verifyStdout || '',
|
|
||||||
`VERIFY_STDOUT`,
|
|
||||||
`echo`,
|
|
||||||
`echo '== verification stderr =='`,
|
|
||||||
`cat <<'VERIFY_STDERR'`,
|
|
||||||
args.verifyStderr || '',
|
|
||||||
`VERIFY_STDERR`,
|
|
||||||
].join('\n'),
|
|
||||||
expectedExitCode: 0,
|
|
||||||
timeout: 30000,
|
|
||||||
},
|
|
||||||
io: {
|
|
||||||
inputJsonPath: `tasks/${taskCtx.effectId}/input.json`,
|
|
||||||
outputJsonPath: `tasks/${taskCtx.effectId}/output.json`,
|
|
||||||
},
|
|
||||||
labels: ['artifacts', 'shell'],
|
|
||||||
}));
|
|
||||||
|
|
||||||
export const acceptanceReviewTask = defineTask('acceptance-review', (args, taskCtx) => ({
|
|
||||||
kind: 'agent',
|
|
||||||
title: 'Review changes against requested warning fixes',
|
|
||||||
agent: {
|
|
||||||
name: 'reviewer',
|
|
||||||
prompt: {
|
|
||||||
role: 'Acceptance reviewer for a Nix/Home Manager warning fix',
|
|
||||||
task: 'Compare SPEC to ARTIFACTS directly and decide whether the requested warnings were fixed without touching the excluded nh/gc warning.',
|
|
||||||
instructions: [
|
|
||||||
'Ignore any narrative in your context about how ARTIFACTS were built.',
|
|
||||||
'Do not ask for additional changes unless they are required by the SPEC.',
|
|
||||||
'Accept if the system deprecation warning and private SSH matchBlocks warning are addressed, and the nh/gc conflict remains untouched.',
|
|
||||||
'',
|
|
||||||
'SPEC (verbatim):',
|
|
||||||
'---',
|
|
||||||
args.spec,
|
|
||||||
'---',
|
|
||||||
'',
|
|
||||||
'ARTIFACTS (verbatim):',
|
|
||||||
'---',
|
|
||||||
args.artifacts,
|
|
||||||
'---',
|
|
||||||
'',
|
|
||||||
'Compare SPEC to ARTIFACTS directly. Ignore any narrative in your context about how ARTIFACTS were built.',
|
|
||||||
],
|
|
||||||
outputFormat: 'JSON with accepted boolean, reason string, and checkedCriteria array.',
|
|
||||||
},
|
|
||||||
outputSchema: {
|
|
||||||
type: 'object',
|
|
||||||
required: ['accepted', 'reason', 'checkedCriteria'],
|
|
||||||
properties: {
|
|
||||||
accepted: { type: 'boolean' },
|
|
||||||
reason: { type: 'string' },
|
|
||||||
checkedCriteria: { type: 'array', items: { type: 'string' } },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
},
|
|
||||||
io: {
|
|
||||||
inputJsonPath: `tasks/${taskCtx.effectId}/input.json`,
|
|
||||||
outputJsonPath: `tasks/${taskCtx.effectId}/output.json`,
|
|
||||||
},
|
|
||||||
labels: ['acceptance', 'agent', 'review'],
|
|
||||||
}));
|
|
||||||
@@ -1,596 +0,0 @@
|
|||||||
{
|
|
||||||
"projectName": "nixos-config",
|
|
||||||
"description": "A reliable, elegant, multi-system NixOS flake configuration for personal desktop, server, cloud, Home Manager, package, overlay, and secret management.",
|
|
||||||
"goals": [
|
|
||||||
{
|
|
||||||
"id": "goal-reliability-1",
|
|
||||||
"description": "Keep all managed NixOS systems reproducible, reliable, and easy to validate before deployment.",
|
|
||||||
"category": "reliability",
|
|
||||||
"priority": "high",
|
|
||||||
"status": "active"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "goal-architecture-1",
|
|
||||||
"description": "Maintain an elegant multi-system architecture with clear host boundaries and reusable common modules.",
|
|
||||||
"category": "architecture",
|
|
||||||
"priority": "high",
|
|
||||||
"status": "active"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "goal-modularization-1",
|
|
||||||
"description": "Continue breaking up the former monorepo by keeping Home Manager profiles in m3ta-home and custom packages/modules in m3ta-nixpkgs where appropriate.",
|
|
||||||
"category": "modularization",
|
|
||||||
"priority": "high",
|
|
||||||
"status": "active"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "goal-cicd-1",
|
|
||||||
"description": "CI/CD is not currently configured; add useful Gitea Actions validation later for formatting, linting, flake evaluation, and safe host checks.",
|
|
||||||
"category": "automation",
|
|
||||||
"priority": "medium",
|
|
||||||
"status": "deferred"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"techStack": {
|
|
||||||
"languages": [
|
|
||||||
{
|
|
||||||
"name": "Nix",
|
|
||||||
"role": "primary system, module, overlay, and package configuration language"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Markdown",
|
|
||||||
"role": "project, agent, and workflow documentation"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "JSON/YAML",
|
|
||||||
"role": "tool configuration and metadata"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"frameworks": [
|
|
||||||
{
|
|
||||||
"name": "Nix flakes",
|
|
||||||
"category": "reproducible dependency and output model"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "NixOS modules",
|
|
||||||
"category": "host and service configuration"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Home Manager",
|
|
||||||
"category": "user environment management"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Agenix",
|
|
||||||
"category": "encrypted secret management"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Disko",
|
|
||||||
"category": "server disk provisioning"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "NUR",
|
|
||||||
"category": "community package access"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "llm-agents.nix",
|
|
||||||
"category": "LLM agent packages overlay"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3ta-home",
|
|
||||||
"category": "external reusable Home Manager profiles"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3ta-nixpkgs",
|
|
||||||
"category": "external custom packages/modules/overlays"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"databases": [],
|
|
||||||
"infrastructure": [
|
|
||||||
{
|
|
||||||
"name": "m3-ares",
|
|
||||||
"category": "desktop NixOS host"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3-kratos",
|
|
||||||
"category": "desktop NixOS host"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3-daedalus",
|
|
||||||
"category": "portable laptop/Home Manager configuration"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3-atlas",
|
|
||||||
"category": "primary server NixOS host"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3-helios",
|
|
||||||
"category": "minimal server/AdGuard host"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3-hermes",
|
|
||||||
"category": "secondary server/Hermes host"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3-aether",
|
|
||||||
"category": "cloud VM/minimal server host"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"buildTools": [
|
|
||||||
"nix",
|
|
||||||
"nixos-rebuild",
|
|
||||||
"nix build",
|
|
||||||
"nix flake show",
|
|
||||||
"alejandra",
|
|
||||||
"statix",
|
|
||||||
"deadnix"
|
|
||||||
],
|
|
||||||
"packageManagers": [
|
|
||||||
"nix flakes"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"architecture": {
|
|
||||||
"pattern": "Pure Nix flake-based NixOS configuration repository with host-specific modules, common shared modules, overlays, custom packages, agenix secrets, and externalized Home Manager/package inputs.",
|
|
||||||
"modules": [
|
|
||||||
{
|
|
||||||
"name": "flake.nix",
|
|
||||||
"path": "flake.nix",
|
|
||||||
"description": "Top-level entry point defining inputs, packages, overlays, Home Manager modules, NixOS configurations, and dev shells."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "hosts/common",
|
|
||||||
"path": "hosts/common",
|
|
||||||
"description": "Shared NixOS configuration, nix settings, overlays, Home Manager setup, ports, extra services, and users."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "hosts",
|
|
||||||
"path": "hosts",
|
|
||||||
"description": "Per-host NixOS/Home Manager configurations for desktops, servers, and cloud VM."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "modules/nixos",
|
|
||||||
"path": "modules/nixos",
|
|
||||||
"description": "Reusable NixOS modules."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "modules/home-manager",
|
|
||||||
"path": "modules/home-manager",
|
|
||||||
"description": "Reusable Home Manager module exports."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "overlays",
|
|
||||||
"path": "overlays",
|
|
||||||
"description": "Nixpkgs overlays for stable, locked, pinned, master, temporary, and agent packages."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "pkgs",
|
|
||||||
"path": "pkgs",
|
|
||||||
"description": "Custom package export set."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "secrets",
|
|
||||||
"path": "secrets",
|
|
||||||
"description": "Encrypted agenix secret files and registry."
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"entryPoints": [
|
|
||||||
"flake.nix",
|
|
||||||
"hosts/<host>/default.nix",
|
|
||||||
"hosts/<host>/configuration.nix",
|
|
||||||
"hosts/common/default.nix",
|
|
||||||
"hosts/common/users/m3tam3re.nix",
|
|
||||||
"overlays/default.nix",
|
|
||||||
"pkgs/default.nix",
|
|
||||||
"secrets.nix"
|
|
||||||
],
|
|
||||||
"dataFlow": "flake.nix wires inputs, overlays, packages, NixOS modules, and Home Manager. Host modules import common configuration and host-specific hardware/programs/services/secrets. Host profile flags in hosts/common/users/m3tam3re.nix feed the external m3ta-home mkHome integration. Secrets flow through agenix registry and host secret modules."
|
|
||||||
},
|
|
||||||
"team": [
|
|
||||||
{
|
|
||||||
"name": "m3tam3re",
|
|
||||||
"role": "solo developer and operator",
|
|
||||||
"responsibilities": [
|
|
||||||
"architecture",
|
|
||||||
"implementation",
|
|
||||||
"host maintenance",
|
|
||||||
"deployments",
|
|
||||||
"review"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3ta-chiron",
|
|
||||||
"role": "agent contributor",
|
|
||||||
"responsibilities": [
|
|
||||||
"semi-autonomous implementation",
|
|
||||||
"validation",
|
|
||||||
"documentation updates",
|
|
||||||
"conventional commits"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"workflows": [
|
|
||||||
{
|
|
||||||
"name": "development",
|
|
||||||
"description": "Default feature-branch workflow for solo development with conventional commits and validation before push.",
|
|
||||||
"steps": [
|
|
||||||
"review Beads issues with bd ready --json",
|
|
||||||
"claim work with bd update <id> --claim when applicable",
|
|
||||||
"edit Nix modules or project files",
|
|
||||||
"run alejandra .",
|
|
||||||
"run statix check .",
|
|
||||||
"run targeted nix flake or host dry-run checks",
|
|
||||||
"commit with conventional commit format",
|
|
||||||
"pull --rebase and push"
|
|
||||||
],
|
|
||||||
"triggers": [
|
|
||||||
"new feature",
|
|
||||||
"bug fix",
|
|
||||||
"refactor",
|
|
||||||
"agent task"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "nix validation",
|
|
||||||
"description": "Quality gate for Nix configuration changes.",
|
|
||||||
"steps": [
|
|
||||||
"alejandra .",
|
|
||||||
"statix check .",
|
|
||||||
"deadnix check or deadnix -w when appropriate",
|
|
||||||
"nix flake show",
|
|
||||||
"sudo nixos-rebuild dry-run --flake .#<host> for affected hosts"
|
|
||||||
],
|
|
||||||
"triggers": [
|
|
||||||
"Nix code changes",
|
|
||||||
"before deployment",
|
|
||||||
"before commit"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "host deployment",
|
|
||||||
"description": "Manual deployment after successful dry-run validation.",
|
|
||||||
"steps": [
|
|
||||||
"sudo nixos-rebuild dry-run --flake .#<host>",
|
|
||||||
"sudo nixos-rebuild switch --flake .#<host>"
|
|
||||||
],
|
|
||||||
"triggers": [
|
|
||||||
"manual host update"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "dependency/input update",
|
|
||||||
"description": "Controlled flake input updates without manually editing flake.lock.",
|
|
||||||
"steps": [
|
|
||||||
"use nix flake update or nixos-rebuild --update-input <input>",
|
|
||||||
"validate affected outputs",
|
|
||||||
"commit flake.nix/flake.lock changes"
|
|
||||||
],
|
|
||||||
"triggers": [
|
|
||||||
"planned dependency update",
|
|
||||||
"security update"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "beads issue tracking",
|
|
||||||
"description": "Persistent issue tracking and session handoff workflow.",
|
|
||||||
"steps": [
|
|
||||||
"bd ready --json",
|
|
||||||
"bd show <id>",
|
|
||||||
"bd update <id> --claim",
|
|
||||||
"bd close <id> --reason <summary>",
|
|
||||||
"bd dolt push"
|
|
||||||
],
|
|
||||||
"triggers": [
|
|
||||||
"start of tracked work",
|
|
||||||
"completion of tracked work"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"processes": [
|
|
||||||
{
|
|
||||||
"id": "cradle/project-install",
|
|
||||||
"name": "Babysitter project install",
|
|
||||||
"status": "installing",
|
|
||||||
"purpose": "Create and save a Babysitter project profile and setup recommendations."
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"tools": {
|
|
||||||
"formatting": [
|
|
||||||
{
|
|
||||||
"name": "alejandra",
|
|
||||||
"purpose": "Nix formatting",
|
|
||||||
"configPaths": [
|
|
||||||
"flake.nix devShells.default"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"linting": [
|
|
||||||
{
|
|
||||||
"name": "statix",
|
|
||||||
"purpose": "Nix anti-pattern linting",
|
|
||||||
"configPaths": [
|
|
||||||
"flake.nix devShells.default"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "deadnix",
|
|
||||||
"purpose": "Detect unused Nix code",
|
|
||||||
"configPaths": [
|
|
||||||
"flake.nix devShells.default"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"testing": [
|
|
||||||
{
|
|
||||||
"name": "nix flake show",
|
|
||||||
"purpose": "Evaluate flake outputs",
|
|
||||||
"configPaths": [
|
|
||||||
"flake.nix"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "nixos-rebuild dry-run",
|
|
||||||
"purpose": "Validate host configurations without applying changes",
|
|
||||||
"configPaths": [
|
|
||||||
"flake.nix",
|
|
||||||
"hosts/*"
|
|
||||||
]
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "nix build",
|
|
||||||
"purpose": "Build selected outputs such as host toplevels or ISOs",
|
|
||||||
"configPaths": [
|
|
||||||
"flake.nix"
|
|
||||||
]
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"issueTracking": [
|
|
||||||
{
|
|
||||||
"name": "Beads",
|
|
||||||
"command": "bd",
|
|
||||||
"purpose": "Persistent task tracking"
|
|
||||||
}
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"services": [
|
|
||||||
{
|
|
||||||
"name": "code.m3ta.dev",
|
|
||||||
"type": "git hosting",
|
|
||||||
"url": "git+ssh://gitea@code.m3ta.dev"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "GitHub",
|
|
||||||
"type": "flake input hosting",
|
|
||||||
"url": "github:* flake inputs"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Agenix",
|
|
||||||
"type": "secret encryption",
|
|
||||||
"url": "github:ryantm/agenix"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "Hermes Agent",
|
|
||||||
"type": "NixOS module/agent service",
|
|
||||||
"url": "github:NousResearch/hermes-agent"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "RustFS",
|
|
||||||
"type": "NixOS server service flake",
|
|
||||||
"url": "github:rustfs/rustfs-flake"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"externalIntegrations": [
|
|
||||||
{
|
|
||||||
"service": "Beads",
|
|
||||||
"category": "issue tracking",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"service": "Dolt",
|
|
||||||
"category": "Beads storage/sync",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"service": "Agenix",
|
|
||||||
"category": "secrets",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"service": "Home Manager",
|
|
||||||
"category": "user environment",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"service": "m3ta-home",
|
|
||||||
"category": "external home profiles",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"service": "m3ta-nixpkgs",
|
|
||||||
"category": "external Nix modules/packages",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"service": "NUR",
|
|
||||||
"category": "Nix packages",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"service": "Disko",
|
|
||||||
"category": "disk provisioning",
|
|
||||||
"enabled": true
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"service": "Hermes Agent",
|
|
||||||
"category": "LLM/agent service",
|
|
||||||
"enabled": true
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"cicd": {
|
|
||||||
"provider": null,
|
|
||||||
"enabled": false,
|
|
||||||
"configPaths": [],
|
|
||||||
"pipelines": [],
|
|
||||||
"notes": "CI/CD is intentionally disabled for now. If re-enabled later, prefer Gitea Actions because this repository is hosted on code.m3ta.dev.",
|
|
||||||
"babysitterIntegration": {
|
|
||||||
"enabled": false,
|
|
||||||
"triggerOn": [],
|
|
||||||
"processIds": []
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"painPoints": [
|
|
||||||
{
|
|
||||||
"id": "pp-architecture-1",
|
|
||||||
"description": "The repository is transitioning away from a monorepo; boundaries with m3ta-home and m3ta-nixpkgs must remain clear.",
|
|
||||||
"severity": "high",
|
|
||||||
"category": "architecture",
|
|
||||||
"discoveredVia": "user interview",
|
|
||||||
"suggestedRemediation": "Keep host-specific decisions local while moving reusable Home Manager profiles and package/module abstractions to their dedicated inputs."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "pp-validation-1",
|
|
||||||
"description": "A single shared Nix change can require validating several hosts to be confident.",
|
|
||||||
"severity": "medium",
|
|
||||||
"category": "validation",
|
|
||||||
"discoveredVia": "repo structure and AGENTS workflow",
|
|
||||||
"suggestedRemediation": "Use targeted affected-host validation locally for now; add a Gitea Actions validation matrix later if CI/CD is re-enabled."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "pp-dependency-1",
|
|
||||||
"description": "Multiple pinned, locked, stable, master, and external SSH flake inputs increase update complexity.",
|
|
||||||
"severity": "medium",
|
|
||||||
"category": "dependency management",
|
|
||||||
"discoveredVia": "flake and history analysis",
|
|
||||||
"suggestedRemediation": "Update inputs intentionally, group related updates, and validate affected host outputs."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "pp-operations-1",
|
|
||||||
"description": "Service additions often need synchronized module, secret, and network/TLS changes.",
|
|
||||||
"severity": "medium",
|
|
||||||
"category": "operations",
|
|
||||||
"discoveredVia": "git history and tree structure",
|
|
||||||
"suggestedRemediation": "Use checklist-style issue templates or Babysitter processes for service changes."
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"bottlenecks": [
|
|
||||||
{
|
|
||||||
"id": "bn-flake-1",
|
|
||||||
"description": "flake.nix and flake.lock are high-churn files whose changes can affect many hosts at once.",
|
|
||||||
"impact": "High; evaluation failures can block all hosts.",
|
|
||||||
"location": "flake.nix, flake.lock",
|
|
||||||
"frequency": "very frequent"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "bn-secrets-1",
|
|
||||||
"description": "Secret registry and host secret modules must stay aligned with encrypted .age files.",
|
|
||||||
"impact": "Medium to high; missing or mismatched secrets break host deployment.",
|
|
||||||
"location": "secrets.nix, hosts/*/secrets.nix, secrets/*.age",
|
|
||||||
"frequency": "recurring"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "bn-services-1",
|
|
||||||
"description": "Server service changes can span service modules, secrets, Traefik/networking, and flake inputs.",
|
|
||||||
"impact": "High for m3-atlas and m3-hermes changes; requires host-specific dry-runs.",
|
|
||||||
"location": "hosts/m3-atlas/services, hosts/m3-hermes/services, hosts/common",
|
|
||||||
"frequency": "frequent"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"id": "bn-home-1",
|
|
||||||
"description": "Home Manager behavior depends on both the external m3ta-home input and local host flags.",
|
|
||||||
"impact": "Medium; may require coordinated updates across repositories.",
|
|
||||||
"location": "flake.nix, hosts/common/users/m3tam3re.nix, m3ta-home input",
|
|
||||||
"frequency": "frequent after migration"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"conventions": {
|
|
||||||
"naming": {
|
|
||||||
"files": "hyphen-case for Nix/docs where practical; host directories use m3-* names",
|
|
||||||
"hosts": "m3-<greek-name>",
|
|
||||||
"modules": "one module per file/directory where possible",
|
|
||||||
"nixVariables": "camelCase"
|
|
||||||
},
|
|
||||||
"git": {
|
|
||||||
"branchStrategy": "default feature branches for non-trivial work; master as integration branch",
|
|
||||||
"commits": "conventional commits for agent work",
|
|
||||||
"reviews": "optional for solo development",
|
|
||||||
"releaseCadence": "continuous/manual as needed",
|
|
||||||
"remote": "code.m3ta.dev over SSH for private inputs and repo access"
|
|
||||||
},
|
|
||||||
"codeStyle": {
|
|
||||||
"formatter": "alejandra",
|
|
||||||
"indentation": "2 spaces",
|
|
||||||
"nixStyle": "explicit pkgs references preferred; avoid with pkgs, builtins.fetchTarball, import <nixpkgs>, builtins.getAttr/hasAttr"
|
|
||||||
},
|
|
||||||
"importOrder": [
|
|
||||||
"module function arguments",
|
|
||||||
"imports",
|
|
||||||
"let bindings",
|
|
||||||
"options/config"
|
|
||||||
],
|
|
||||||
"errorHandling": "Nix configuration should fail explicitly during evaluation/build; avoid hiding errors or impure paths.",
|
|
||||||
"testingConventions": "Run alejandra, statix, deadnix as appropriate, nix flake show, and host-specific nixos-rebuild dry-run before switching.",
|
|
||||||
"additionalRules": [
|
|
||||||
"Use Beads for persistent task tracking.",
|
|
||||||
"Use non-interactive flags for shell file operations.",
|
|
||||||
"Do not modify flake.lock directly; use nix flake update.",
|
|
||||||
"Do not commit plaintext secrets.",
|
|
||||||
"Use SSH URLs for code.m3ta.dev flake inputs.",
|
|
||||||
"Operate Babysitter semi-autonomously with breakpoints for destructive, deployment, or architecture-changing decisions."
|
|
||||||
]
|
|
||||||
},
|
|
||||||
"repositories": [
|
|
||||||
{
|
|
||||||
"name": "nixos-config",
|
|
||||||
"path": "/home/m3tam3re/p/NIX/nixos-config",
|
|
||||||
"role": "primary multi-host NixOS configuration"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3ta-home",
|
|
||||||
"url": "git+ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home",
|
|
||||||
"role": "external Home Manager profiles"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "m3ta-nixpkgs",
|
|
||||||
"url": "git+ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs",
|
|
||||||
"role": "external custom packages/modules/overlays"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"claudeMdInstructions": [
|
|
||||||
"Respect AGENTS.md as the source of project workflow rules.",
|
|
||||||
"Resolve the active Babysitter process library before using library processes.",
|
|
||||||
"Use cradle/project-install for project setup or profile refresh.",
|
|
||||||
"Use evolutionary GSD: map affected Nix modules/hosts, make focused changes, verify, and iterate.",
|
|
||||||
"Prefer alejandra, statix, deadnix, nix flake show, and targeted host dry-runs for Nix changes.",
|
|
||||||
"Preserve boundaries between nixos-config, m3ta-home, and m3ta-nixpkgs.",
|
|
||||||
"Use breakpoints for destructive operations, deployments, architecture changes, and secret-handling decisions.",
|
|
||||||
"Babysitter CI/CD is not currently enabled; if re-added later, use Gitea Actions rather than GitHub Actions."
|
|
||||||
],
|
|
||||||
"installedSkills": [
|
|
||||||
"project-install",
|
|
||||||
"babysit",
|
|
||||||
"specializations/devops-sre-platform/skills/cicd-pipelines/SKILL.md",
|
|
||||||
"specializations/devops-sre-platform/skills/gitops/SKILL.md",
|
|
||||||
"specializations/devops-sre-platform/skills/secrets-management/SKILL.md"
|
|
||||||
],
|
|
||||||
"installedAgents": [
|
|
||||||
"general-purpose",
|
|
||||||
"specializations/devops-sre-platform/agents/platform-engineer/AGENT.md",
|
|
||||||
"specializations/devops-sre-platform/agents/cicd-specialist/AGENT.md"
|
|
||||||
],
|
|
||||||
"installedProcesses": [
|
|
||||||
"cradle/project-install",
|
|
||||||
"methodologies/gsd/quick.js",
|
|
||||||
"methodologies/gsd/verify-work.js",
|
|
||||||
"methodologies/gsd/iterative-convergence.js",
|
|
||||||
"methodologies/evolutionary.js",
|
|
||||||
"specializations/devops-sre-platform/iac-testing.js"
|
|
||||||
],
|
|
||||||
"preferences": {
|
|
||||||
"babysitterAutonomy": "semi-autonomous",
|
|
||||||
"breakpointTolerance": "moderate",
|
|
||||||
"externalIntegrationsRequested": false,
|
|
||||||
"cicdDesired": false,
|
|
||||||
"cicdNote": "Deferred for now; Gitea Actions is the preferred provider if CI/CD is added later."
|
|
||||||
},
|
|
||||||
"createdAt": "2026-05-29T15:50:48.754Z",
|
|
||||||
"updatedAt": "2026-05-29T16:07:19.245463Z",
|
|
||||||
"version": 1
|
|
||||||
}
|
|
||||||
@@ -1,238 +0,0 @@
|
|||||||
# Project Profile: nixos-config
|
|
||||||
|
|
||||||
A reliable, elegant, multi-system NixOS flake configuration for personal desktop, server, cloud, Home Manager, package, overlay, and secret management.
|
|
||||||
|
|
||||||
> Last updated: 2026-05-29T16:02:11.092188Z | Version: 1
|
|
||||||
|
|
||||||
## Goals
|
|
||||||
|
|
||||||
- **reliability** [high]: Keep all managed NixOS systems reproducible, reliable, and easy to validate before deployment. (active)
|
|
||||||
- **architecture** [high]: Maintain an elegant multi-system architecture with clear host boundaries and reusable common modules. (active)
|
|
||||||
- **modularization** [high]: Continue breaking up the former monorepo by keeping Home Manager profiles in m3ta-home and custom packages/modules in m3ta-nixpkgs where appropriate. (active)
|
|
||||||
- **automation** [medium]: CI/CD is not currently configured; add useful Gitea Actions validation later for formatting, linting, flake evaluation, and safe host checks. (deferred)
|
|
||||||
|
|
||||||
## Tech Stack
|
|
||||||
|
|
||||||
### Languages
|
|
||||||
|
|
||||||
- Nix (primary system, module, overlay, and package configuration language)
|
|
||||||
- Markdown (project, agent, and workflow documentation)
|
|
||||||
- JSON/YAML (tool configuration and metadata)
|
|
||||||
|
|
||||||
### Frameworks
|
|
||||||
|
|
||||||
- Nix flakes [reproducible dependency and output model]
|
|
||||||
- NixOS modules [host and service configuration]
|
|
||||||
- Home Manager [user environment management]
|
|
||||||
- Agenix [encrypted secret management]
|
|
||||||
- Disko [server disk provisioning]
|
|
||||||
- NUR [community package access]
|
|
||||||
- llm-agents.nix [LLM agent packages overlay]
|
|
||||||
- m3ta-home [external reusable Home Manager profiles]
|
|
||||||
- m3ta-nixpkgs [external custom packages/modules/overlays]
|
|
||||||
|
|
||||||
### Infrastructure
|
|
||||||
|
|
||||||
- m3-ares [desktop NixOS host]
|
|
||||||
- m3-kratos [desktop NixOS host]
|
|
||||||
- m3-daedalus [portable laptop/Home Manager configuration]
|
|
||||||
- m3-atlas [primary server NixOS host]
|
|
||||||
- m3-helios [minimal server/AdGuard host]
|
|
||||||
- m3-hermes [secondary server/Hermes host]
|
|
||||||
- m3-aether [cloud VM/minimal server host]
|
|
||||||
|
|
||||||
**Build tools:** nix, nixos-rebuild, nix build, nix flake show, alejandra, statix, deadnix
|
|
||||||
|
|
||||||
**Package managers:** nix flakes
|
|
||||||
|
|
||||||
## Architecture
|
|
||||||
|
|
||||||
**Pattern:** Pure Nix flake-based NixOS configuration repository with host-specific modules, common shared modules, overlays, custom packages, agenix secrets, and externalized Home Manager/package inputs.
|
|
||||||
**Data flow:** flake.nix wires inputs, overlays, packages, NixOS modules, and Home Manager. Host modules import common configuration and host-specific hardware/programs/services/secrets. Host profile flags in hosts/common/users/m3tam3re.nix feed the external m3ta-home mkHome integration. Secrets flow through agenix registry and host secret modules.
|
|
||||||
|
|
||||||
### Modules
|
|
||||||
|
|
||||||
| Module | Path | Description |
|
|
||||||
|--------|------|-------------|
|
|
||||||
| flake.nix | `flake.nix` | Top-level entry point defining inputs, packages, overlays, Home Manager modules, NixOS configurations, and dev shells. |
|
|
||||||
| hosts/common | `hosts/common` | Shared NixOS configuration, nix settings, overlays, Home Manager setup, ports, extra services, and users. |
|
|
||||||
| hosts | `hosts` | Per-host NixOS/Home Manager configurations for desktops, servers, and cloud VM. |
|
|
||||||
| modules/nixos | `modules/nixos` | Reusable NixOS modules. |
|
|
||||||
| modules/home-manager | `modules/home-manager` | Reusable Home Manager module exports. |
|
|
||||||
| overlays | `overlays` | Nixpkgs overlays for stable, locked, pinned, master, temporary, and agent packages. |
|
|
||||||
| pkgs | `pkgs` | Custom package export set. |
|
|
||||||
| secrets | `secrets` | Encrypted agenix secret files and registry. |
|
|
||||||
|
|
||||||
**Entry points:** `flake.nix`, `hosts/<host>/default.nix`, `hosts/<host>/configuration.nix`, `hosts/common/default.nix`, `hosts/common/users/m3tam3re.nix`, `overlays/default.nix`, `pkgs/default.nix`, `secrets.nix`
|
|
||||||
|
|
||||||
## Team
|
|
||||||
|
|
||||||
- **m3tam3re** (solo developer and operator): architecture, implementation, host maintenance, deployments, review
|
|
||||||
- **m3ta-chiron** (agent contributor): semi-autonomous implementation, validation, documentation updates, conventional commits
|
|
||||||
|
|
||||||
## Workflows
|
|
||||||
|
|
||||||
### development
|
|
||||||
|
|
||||||
Default feature-branch workflow for solo development with conventional commits and validation before push.
|
|
||||||
**Triggers:** new feature, bug fix, refactor, agent task
|
|
||||||
|
|
||||||
1. review Beads issues with bd ready --json
|
|
||||||
2. claim work with bd update <id> --claim when applicable
|
|
||||||
3. edit Nix modules or project files
|
|
||||||
4. run alejandra .
|
|
||||||
5. run statix check .
|
|
||||||
6. run targeted nix flake or host dry-run checks
|
|
||||||
7. commit with conventional commit format
|
|
||||||
8. pull --rebase and push
|
|
||||||
|
|
||||||
### nix validation
|
|
||||||
|
|
||||||
Quality gate for Nix configuration changes.
|
|
||||||
**Triggers:** Nix code changes, before deployment, before commit
|
|
||||||
|
|
||||||
1. alejandra .
|
|
||||||
2. statix check .
|
|
||||||
3. deadnix check or deadnix -w when appropriate
|
|
||||||
4. nix flake show
|
|
||||||
5. sudo nixos-rebuild dry-run --flake .#<host> for affected hosts
|
|
||||||
|
|
||||||
### host deployment
|
|
||||||
|
|
||||||
Manual deployment after successful dry-run validation.
|
|
||||||
**Triggers:** manual host update
|
|
||||||
|
|
||||||
1. sudo nixos-rebuild dry-run --flake .#<host>
|
|
||||||
2. sudo nixos-rebuild switch --flake .#<host>
|
|
||||||
|
|
||||||
### dependency/input update
|
|
||||||
|
|
||||||
Controlled flake input updates without manually editing flake.lock.
|
|
||||||
**Triggers:** planned dependency update, security update
|
|
||||||
|
|
||||||
1. use nix flake update or nixos-rebuild --update-input <input>
|
|
||||||
2. validate affected outputs
|
|
||||||
3. commit flake.nix/flake.lock changes
|
|
||||||
|
|
||||||
### beads issue tracking
|
|
||||||
|
|
||||||
Persistent issue tracking and session handoff workflow.
|
|
||||||
**Triggers:** start of tracked work, completion of tracked work
|
|
||||||
|
|
||||||
1. bd ready --json
|
|
||||||
2. bd show <id>
|
|
||||||
3. bd update <id> --claim
|
|
||||||
4. bd close <id> --reason <summary>
|
|
||||||
5. bd dolt push
|
|
||||||
|
|
||||||
## Processes
|
|
||||||
|
|
||||||
- **Babysitter project install** (`cradle/project-install`, undefined)
|
|
||||||
|
|
||||||
## Tools
|
|
||||||
|
|
||||||
### Linting
|
|
||||||
|
|
||||||
- statix
|
|
||||||
- deadnix
|
|
||||||
|
|
||||||
### Testing
|
|
||||||
|
|
||||||
- nix flake show
|
|
||||||
- nixos-rebuild dry-run
|
|
||||||
- nix build
|
|
||||||
|
|
||||||
### Formatting
|
|
||||||
|
|
||||||
- alejandra
|
|
||||||
|
|
||||||
## Services
|
|
||||||
|
|
||||||
- **code.m3ta.dev** (git hosting) - git+ssh://gitea@code.m3ta.dev
|
|
||||||
- **GitHub** (flake input hosting) - github:* flake inputs
|
|
||||||
- **Agenix** (secret encryption) - github:ryantm/agenix
|
|
||||||
- **Hermes Agent** (NixOS module/agent service) - github:NousResearch/hermes-agent
|
|
||||||
- **RustFS** (NixOS server service flake) - github:rustfs/rustfs-flake
|
|
||||||
|
|
||||||
## CI/CD
|
|
||||||
|
|
||||||
**Status:** Not configured/enabled for now.
|
|
||||||
|
|
||||||
No Babysitter CI/CD workflow is currently installed. If CI/CD is added later, prefer Gitea Actions because this repository is hosted on code.m3ta.dev.
|
|
||||||
|
|
||||||
## Pain Points
|
|
||||||
|
|
||||||
- **high** [architecture]: The repository is transitioning away from a monorepo; boundaries with m3ta-home and m3ta-nixpkgs must remain clear.
|
|
||||||
- Remediation: Keep host-specific decisions local while moving reusable Home Manager profiles and package/module abstractions to their dedicated inputs.
|
|
||||||
- **medium** [validation]: A single shared Nix change can require validating several hosts to be confident.
|
|
||||||
- Remediation: Use targeted affected-host validation locally for now; add a Gitea Actions validation matrix later if CI/CD is re-enabled.
|
|
||||||
- **medium** [dependency management]: Multiple pinned, locked, stable, master, and external SSH flake inputs increase update complexity.
|
|
||||||
- Remediation: Update inputs intentionally, group related updates, and validate affected host outputs.
|
|
||||||
- **medium** [operations]: Service additions often need synchronized module, secret, and network/TLS changes.
|
|
||||||
- Remediation: Use checklist-style issue templates or Babysitter processes for service changes.
|
|
||||||
|
|
||||||
## Bottlenecks
|
|
||||||
|
|
||||||
- flake.nix and flake.lock are high-churn files whose changes can affect many hosts at once. at flake.nix, flake.lock (very frequent)
|
|
||||||
Impact: High; evaluation failures can block all hosts.
|
|
||||||
- Secret registry and host secret modules must stay aligned with encrypted .age files. at secrets.nix, hosts/*/secrets.nix, secrets/*.age (recurring)
|
|
||||||
Impact: Medium to high; missing or mismatched secrets break host deployment.
|
|
||||||
- Server service changes can span service modules, secrets, Traefik/networking, and flake inputs. at hosts/m3-atlas/services, hosts/m3-hermes/services, hosts/common (frequent)
|
|
||||||
Impact: High for m3-atlas and m3-hermes changes; requires host-specific dry-runs.
|
|
||||||
- Home Manager behavior depends on both the external m3ta-home input and local host flags. at flake.nix, hosts/common/users/m3tam3re.nix, m3ta-home input (frequent after migration)
|
|
||||||
Impact: Medium; may require coordinated updates across repositories.
|
|
||||||
|
|
||||||
## Conventions
|
|
||||||
|
|
||||||
### Naming
|
|
||||||
|
|
||||||
- **files:** hyphen-case for Nix/docs where practical; host directories use m3-* names
|
|
||||||
- **hosts:** m3-<greek-name>
|
|
||||||
- **modules:** one module per file/directory where possible
|
|
||||||
- **nixVariables:** camelCase
|
|
||||||
|
|
||||||
### Git
|
|
||||||
|
|
||||||
- **branchStrategy:** default feature branches for non-trivial work; master as integration branch
|
|
||||||
- **commits:** conventional commits for agent work
|
|
||||||
- **reviews:** optional for solo development
|
|
||||||
- **releaseCadence:** continuous/manual as needed
|
|
||||||
- **remote:** code.m3ta.dev over SSH for private inputs and repo access
|
|
||||||
|
|
||||||
**Import order:** module function arguments > imports > let bindings > options/config
|
|
||||||
|
|
||||||
**Error handling:** Nix configuration should fail explicitly during evaluation/build; avoid hiding errors or impure paths.
|
|
||||||
|
|
||||||
**Testing:** Run alejandra, statix, deadnix as appropriate, nix flake show, and host-specific nixos-rebuild dry-run before switching.
|
|
||||||
|
|
||||||
### Additional Rules
|
|
||||||
|
|
||||||
- Use Beads for persistent task tracking.
|
|
||||||
- Use non-interactive flags for shell file operations.
|
|
||||||
- Do not modify flake.lock directly; use nix flake update.
|
|
||||||
- Do not commit plaintext secrets.
|
|
||||||
- Use SSH URLs for code.m3ta.dev flake inputs.
|
|
||||||
- Operate Babysitter semi-autonomously with breakpoints for destructive, deployment, or architecture-changing decisions.
|
|
||||||
|
|
||||||
## Repositories
|
|
||||||
|
|
||||||
- **nixos-config** [`/home/m3tam3re/p/NIX/nixos-config`]
|
|
||||||
- **m3ta-home** - git+ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home
|
|
||||||
- **m3ta-nixpkgs** - git+ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs
|
|
||||||
|
|
||||||
## CLAUDE.md Instructions
|
|
||||||
|
|
||||||
- Respect AGENTS.md as the source of project workflow rules.
|
|
||||||
- Resolve the active Babysitter process library before using library processes.
|
|
||||||
- Use cradle/project-install for project setup or profile refresh.
|
|
||||||
- Use evolutionary GSD: map affected Nix modules/hosts, make focused changes, verify, and iterate.
|
|
||||||
- Prefer alejandra, statix, deadnix, nix flake show, and targeted host dry-runs for Nix changes.
|
|
||||||
- Preserve boundaries between nixos-config, m3ta-home, and m3ta-nixpkgs.
|
|
||||||
- Use breakpoints for destructive operations, deployments, architecture changes, and secret-handling decisions.
|
|
||||||
- Babysitter CI/CD is not currently enabled; if re-added later, use Gitea Actions rather than GitHub Actions.
|
|
||||||
|
|
||||||
## Installed Extensions
|
|
||||||
|
|
||||||
- Skills: project-install, babysit, specializations/devops-sre-platform/skills/cicd-pipelines/SKILL.md, specializations/devops-sre-platform/skills/gitops/SKILL.md, specializations/devops-sre-platform/skills/secrets-management/SKILL.md
|
|
||||||
- Agents: general-purpose, specializations/devops-sre-platform/agents/platform-engineer/AGENT.md, specializations/devops-sre-platform/agents/cicd-specialist/AGENT.md
|
|
||||||
- Processes: cradle/project-install, methodologies/gsd/quick.js, methodologies/gsd/verify-work.js, methodologies/gsd/iterative-convergence.js, methodologies/evolutionary.js, specializations/devops-sre-platform/iac-testing.js
|
|
||||||
@@ -1,53 +0,0 @@
|
|||||||
{
|
|
||||||
"qualityThreshold": 80,
|
|
||||||
"testCoverage": {
|
|
||||||
"minimum": 0,
|
|
||||||
"rationale": "NixOS configuration repository without a coverage-producing test suite."
|
|
||||||
},
|
|
||||||
"formatting": [
|
|
||||||
{
|
|
||||||
"name": "alejandra",
|
|
||||||
"command": "alejandra .",
|
|
||||||
"ciCommand": "alejandra --check ."
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"linting": [
|
|
||||||
{
|
|
||||||
"name": "statix",
|
|
||||||
"command": "statix check ."
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "deadnix",
|
|
||||||
"command": "deadnix . --fail"
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"evaluation": [
|
|
||||||
{
|
|
||||||
"name": "flake outputs",
|
|
||||||
"command": "nix flake show"
|
|
||||||
},
|
|
||||||
{
|
|
||||||
"name": "affected host dry-run",
|
|
||||||
"command": "sudo nixos-rebuild dry-run --flake .#<host>",
|
|
||||||
"when": "Run for affected hosts when practical and safe."
|
|
||||||
}
|
|
||||||
],
|
|
||||||
"commitChecks": [
|
|
||||||
"alejandra .",
|
|
||||||
"statix check .",
|
|
||||||
"deadnix . --fail",
|
|
||||||
"nix flake show"
|
|
||||||
],
|
|
||||||
"deployGates": [
|
|
||||||
"formatting passes",
|
|
||||||
"linting passes",
|
|
||||||
"flake outputs evaluate",
|
|
||||||
"affected host dry-run succeeds",
|
|
||||||
"secrets are encrypted and host secret modules remain aligned"
|
|
||||||
],
|
|
||||||
"cicdIntegrationPoints": [],
|
|
||||||
"cicd": {
|
|
||||||
"enabled": false,
|
|
||||||
"notes": "No CI/CD integration is currently configured. Add Gitea Actions later if automated Babysitter or Nix validation is desired."
|
|
||||||
}
|
|
||||||
}
|
|
||||||
@@ -71,10 +71,3 @@ bd.db
|
|||||||
# They would override fork protection in .git/info/exclude.
|
# They would override fork protection in .git/info/exclude.
|
||||||
# Config files (metadata.json, config.yaml) are tracked by git by default
|
# Config files (metadata.json, config.yaml) are tracked by git by default
|
||||||
# since no pattern above ignores them.
|
# since no pattern above ignores them.
|
||||||
|
|
||||||
# Added by bd (missing required patterns)
|
|
||||||
*.gate.lock*
|
|
||||||
last_pull
|
|
||||||
proxieddb/
|
|
||||||
dolt-server-config.yaml
|
|
||||||
proxied_server_client_info.json
|
|
||||||
+1
-2
@@ -53,5 +53,4 @@
|
|||||||
# - github.org
|
# - github.org
|
||||||
# - github.repo
|
# - github.repo
|
||||||
|
|
||||||
sync:
|
sync.remote: "git+ssh://gitea@code.m3ta.dev/m3tam3re/nixos-config.git"
|
||||||
remote: "git+ssh://gitea@code.m3ta.dev/m3tam3re/nixos-config.git"
|
|
||||||
+11
-46
@@ -1,59 +1,24 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
# --- BEGIN BEADS INTEGRATION v1.3.2 ---
|
# --- BEGIN BEADS INTEGRATION v1.0.3 ---
|
||||||
# This section is managed by beads. Do not remove these markers.
|
# This section is managed by beads. Do not remove these markers.
|
||||||
if command -v bd >/dev/null 2>&1; then
|
if command -v bd >/dev/null 2>&1; then
|
||||||
export BD_GIT_HOOK=1
|
export BD_GIT_HOOK=1
|
||||||
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
||||||
case "$_bd_timeout" in
|
if command -v timeout >/dev/null 2>&1; then
|
||||||
*[!0-9]*|'') _bd_timeout_invalid=1 ;;
|
timeout "$_bd_timeout" bd hooks run post-checkout "$@"
|
||||||
*[1-9]*) _bd_timeout_invalid=0 ;;
|
|
||||||
*) _bd_timeout_invalid=1 ;;
|
|
||||||
esac
|
|
||||||
if [ "$_bd_timeout_invalid" -eq 1 ]; then
|
|
||||||
echo >&2 "beads: invalid BEADS_HOOK_TIMEOUT; using 300 seconds"
|
|
||||||
_bd_timeout=300
|
|
||||||
fi
|
|
||||||
_bd_timeout_backend=none
|
|
||||||
_bd_timeout_command=
|
|
||||||
for _bd_timeout_candidate in timeout gtimeout; do
|
|
||||||
if command -v "$_bd_timeout_candidate" >/dev/null 2>&1; then
|
|
||||||
if _bd_timeout_version="$("$_bd_timeout_candidate" --version 2>/dev/null)"; then
|
|
||||||
case "$_bd_timeout_version" in
|
|
||||||
"timeout (GNU coreutils) "*) _bd_timeout_command=$_bd_timeout_candidate; break ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ -n "$_bd_timeout_command" ]; then
|
|
||||||
_bd_timeout_backend=coreutils
|
|
||||||
if "$_bd_timeout_command" -- "$_bd_timeout" bd hooks run post-checkout "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
_bd_exit=$?
|
||||||
fi
|
if [ $_bd_exit -eq 124 ]; then
|
||||||
elif command -v perl >/dev/null 2>&1; then
|
|
||||||
_bd_timeout_backend=perl
|
|
||||||
if perl -e 'alarm shift; exec @ARGV' -- "$_bd_timeout" bd hooks run post-checkout "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo >&2 "beads: hook 'post-checkout' running without timeout; install coreutils or perl to enable BEADS_HOOK_TIMEOUT"
|
|
||||||
if bd hooks run post-checkout "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if { [ "$_bd_timeout_backend" = coreutils ] && [ "$_bd_exit" -eq 124 ]; } || { [ "$_bd_timeout_backend" = perl ] && [ "$_bd_exit" -eq 142 ]; }; then
|
|
||||||
echo >&2 "beads: hook 'post-checkout' timed out after ${_bd_timeout}s — continuing without beads"
|
echo >&2 "beads: hook 'post-checkout' timed out after ${_bd_timeout}s — continuing without beads"
|
||||||
_bd_exit=0
|
_bd_exit=0
|
||||||
fi
|
fi
|
||||||
if [ "$_bd_exit" -eq 3 ]; then
|
else
|
||||||
|
bd hooks run post-checkout "$@"
|
||||||
|
_bd_exit=$?
|
||||||
|
fi
|
||||||
|
if [ $_bd_exit -eq 3 ]; then
|
||||||
echo >&2 "beads: database not initialized — skipping hook 'post-checkout'"
|
echo >&2 "beads: database not initialized — skipping hook 'post-checkout'"
|
||||||
_bd_exit=0
|
_bd_exit=0
|
||||||
fi
|
fi
|
||||||
if [ "$_bd_exit" -ne 0 ]; then exit "$_bd_exit"; fi
|
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi
|
||||||
fi
|
fi
|
||||||
# --- END BEADS INTEGRATION v1.3.2 ---
|
# --- END BEADS INTEGRATION v1.0.3 ---
|
||||||
+11
-46
@@ -1,59 +1,24 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
# --- BEGIN BEADS INTEGRATION v1.3.2 ---
|
# --- BEGIN BEADS INTEGRATION v1.0.3 ---
|
||||||
# This section is managed by beads. Do not remove these markers.
|
# This section is managed by beads. Do not remove these markers.
|
||||||
if command -v bd >/dev/null 2>&1; then
|
if command -v bd >/dev/null 2>&1; then
|
||||||
export BD_GIT_HOOK=1
|
export BD_GIT_HOOK=1
|
||||||
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
||||||
case "$_bd_timeout" in
|
if command -v timeout >/dev/null 2>&1; then
|
||||||
*[!0-9]*|'') _bd_timeout_invalid=1 ;;
|
timeout "$_bd_timeout" bd hooks run post-merge "$@"
|
||||||
*[1-9]*) _bd_timeout_invalid=0 ;;
|
|
||||||
*) _bd_timeout_invalid=1 ;;
|
|
||||||
esac
|
|
||||||
if [ "$_bd_timeout_invalid" -eq 1 ]; then
|
|
||||||
echo >&2 "beads: invalid BEADS_HOOK_TIMEOUT; using 300 seconds"
|
|
||||||
_bd_timeout=300
|
|
||||||
fi
|
|
||||||
_bd_timeout_backend=none
|
|
||||||
_bd_timeout_command=
|
|
||||||
for _bd_timeout_candidate in timeout gtimeout; do
|
|
||||||
if command -v "$_bd_timeout_candidate" >/dev/null 2>&1; then
|
|
||||||
if _bd_timeout_version="$("$_bd_timeout_candidate" --version 2>/dev/null)"; then
|
|
||||||
case "$_bd_timeout_version" in
|
|
||||||
"timeout (GNU coreutils) "*) _bd_timeout_command=$_bd_timeout_candidate; break ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ -n "$_bd_timeout_command" ]; then
|
|
||||||
_bd_timeout_backend=coreutils
|
|
||||||
if "$_bd_timeout_command" -- "$_bd_timeout" bd hooks run post-merge "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
_bd_exit=$?
|
||||||
fi
|
if [ $_bd_exit -eq 124 ]; then
|
||||||
elif command -v perl >/dev/null 2>&1; then
|
|
||||||
_bd_timeout_backend=perl
|
|
||||||
if perl -e 'alarm shift; exec @ARGV' -- "$_bd_timeout" bd hooks run post-merge "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo >&2 "beads: hook 'post-merge' running without timeout; install coreutils or perl to enable BEADS_HOOK_TIMEOUT"
|
|
||||||
if bd hooks run post-merge "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if { [ "$_bd_timeout_backend" = coreutils ] && [ "$_bd_exit" -eq 124 ]; } || { [ "$_bd_timeout_backend" = perl ] && [ "$_bd_exit" -eq 142 ]; }; then
|
|
||||||
echo >&2 "beads: hook 'post-merge' timed out after ${_bd_timeout}s — continuing without beads"
|
echo >&2 "beads: hook 'post-merge' timed out after ${_bd_timeout}s — continuing without beads"
|
||||||
_bd_exit=0
|
_bd_exit=0
|
||||||
fi
|
fi
|
||||||
if [ "$_bd_exit" -eq 3 ]; then
|
else
|
||||||
|
bd hooks run post-merge "$@"
|
||||||
|
_bd_exit=$?
|
||||||
|
fi
|
||||||
|
if [ $_bd_exit -eq 3 ]; then
|
||||||
echo >&2 "beads: database not initialized — skipping hook 'post-merge'"
|
echo >&2 "beads: database not initialized — skipping hook 'post-merge'"
|
||||||
_bd_exit=0
|
_bd_exit=0
|
||||||
fi
|
fi
|
||||||
if [ "$_bd_exit" -ne 0 ]; then exit "$_bd_exit"; fi
|
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi
|
||||||
fi
|
fi
|
||||||
# --- END BEADS INTEGRATION v1.3.2 ---
|
# --- END BEADS INTEGRATION v1.0.3 ---
|
||||||
+11
-46
@@ -1,59 +1,24 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
# --- BEGIN BEADS INTEGRATION v1.3.2 ---
|
# --- BEGIN BEADS INTEGRATION v1.0.3 ---
|
||||||
# This section is managed by beads. Do not remove these markers.
|
# This section is managed by beads. Do not remove these markers.
|
||||||
if command -v bd >/dev/null 2>&1; then
|
if command -v bd >/dev/null 2>&1; then
|
||||||
export BD_GIT_HOOK=1
|
export BD_GIT_HOOK=1
|
||||||
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
||||||
case "$_bd_timeout" in
|
if command -v timeout >/dev/null 2>&1; then
|
||||||
*[!0-9]*|'') _bd_timeout_invalid=1 ;;
|
timeout "$_bd_timeout" bd hooks run pre-commit "$@"
|
||||||
*[1-9]*) _bd_timeout_invalid=0 ;;
|
|
||||||
*) _bd_timeout_invalid=1 ;;
|
|
||||||
esac
|
|
||||||
if [ "$_bd_timeout_invalid" -eq 1 ]; then
|
|
||||||
echo >&2 "beads: invalid BEADS_HOOK_TIMEOUT; using 300 seconds"
|
|
||||||
_bd_timeout=300
|
|
||||||
fi
|
|
||||||
_bd_timeout_backend=none
|
|
||||||
_bd_timeout_command=
|
|
||||||
for _bd_timeout_candidate in timeout gtimeout; do
|
|
||||||
if command -v "$_bd_timeout_candidate" >/dev/null 2>&1; then
|
|
||||||
if _bd_timeout_version="$("$_bd_timeout_candidate" --version 2>/dev/null)"; then
|
|
||||||
case "$_bd_timeout_version" in
|
|
||||||
"timeout (GNU coreutils) "*) _bd_timeout_command=$_bd_timeout_candidate; break ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ -n "$_bd_timeout_command" ]; then
|
|
||||||
_bd_timeout_backend=coreutils
|
|
||||||
if "$_bd_timeout_command" -- "$_bd_timeout" bd hooks run pre-commit "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
_bd_exit=$?
|
||||||
fi
|
if [ $_bd_exit -eq 124 ]; then
|
||||||
elif command -v perl >/dev/null 2>&1; then
|
|
||||||
_bd_timeout_backend=perl
|
|
||||||
if perl -e 'alarm shift; exec @ARGV' -- "$_bd_timeout" bd hooks run pre-commit "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo >&2 "beads: hook 'pre-commit' running without timeout; install coreutils or perl to enable BEADS_HOOK_TIMEOUT"
|
|
||||||
if bd hooks run pre-commit "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if { [ "$_bd_timeout_backend" = coreutils ] && [ "$_bd_exit" -eq 124 ]; } || { [ "$_bd_timeout_backend" = perl ] && [ "$_bd_exit" -eq 142 ]; }; then
|
|
||||||
echo >&2 "beads: hook 'pre-commit' timed out after ${_bd_timeout}s — continuing without beads"
|
echo >&2 "beads: hook 'pre-commit' timed out after ${_bd_timeout}s — continuing without beads"
|
||||||
_bd_exit=0
|
_bd_exit=0
|
||||||
fi
|
fi
|
||||||
if [ "$_bd_exit" -eq 3 ]; then
|
else
|
||||||
|
bd hooks run pre-commit "$@"
|
||||||
|
_bd_exit=$?
|
||||||
|
fi
|
||||||
|
if [ $_bd_exit -eq 3 ]; then
|
||||||
echo >&2 "beads: database not initialized — skipping hook 'pre-commit'"
|
echo >&2 "beads: database not initialized — skipping hook 'pre-commit'"
|
||||||
_bd_exit=0
|
_bd_exit=0
|
||||||
fi
|
fi
|
||||||
if [ "$_bd_exit" -ne 0 ]; then exit "$_bd_exit"; fi
|
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi
|
||||||
fi
|
fi
|
||||||
# --- END BEADS INTEGRATION v1.3.2 ---
|
# --- END BEADS INTEGRATION v1.0.3 ---
|
||||||
+11
-46
@@ -1,59 +1,24 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
# --- BEGIN BEADS INTEGRATION v1.3.2 ---
|
# --- BEGIN BEADS INTEGRATION v1.0.3 ---
|
||||||
# This section is managed by beads. Do not remove these markers.
|
# This section is managed by beads. Do not remove these markers.
|
||||||
if command -v bd >/dev/null 2>&1; then
|
if command -v bd >/dev/null 2>&1; then
|
||||||
export BD_GIT_HOOK=1
|
export BD_GIT_HOOK=1
|
||||||
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
||||||
case "$_bd_timeout" in
|
if command -v timeout >/dev/null 2>&1; then
|
||||||
*[!0-9]*|'') _bd_timeout_invalid=1 ;;
|
timeout "$_bd_timeout" bd hooks run pre-push "$@"
|
||||||
*[1-9]*) _bd_timeout_invalid=0 ;;
|
|
||||||
*) _bd_timeout_invalid=1 ;;
|
|
||||||
esac
|
|
||||||
if [ "$_bd_timeout_invalid" -eq 1 ]; then
|
|
||||||
echo >&2 "beads: invalid BEADS_HOOK_TIMEOUT; using 300 seconds"
|
|
||||||
_bd_timeout=300
|
|
||||||
fi
|
|
||||||
_bd_timeout_backend=none
|
|
||||||
_bd_timeout_command=
|
|
||||||
for _bd_timeout_candidate in timeout gtimeout; do
|
|
||||||
if command -v "$_bd_timeout_candidate" >/dev/null 2>&1; then
|
|
||||||
if _bd_timeout_version="$("$_bd_timeout_candidate" --version 2>/dev/null)"; then
|
|
||||||
case "$_bd_timeout_version" in
|
|
||||||
"timeout (GNU coreutils) "*) _bd_timeout_command=$_bd_timeout_candidate; break ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ -n "$_bd_timeout_command" ]; then
|
|
||||||
_bd_timeout_backend=coreutils
|
|
||||||
if "$_bd_timeout_command" -- "$_bd_timeout" bd hooks run pre-push "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
_bd_exit=$?
|
||||||
fi
|
if [ $_bd_exit -eq 124 ]; then
|
||||||
elif command -v perl >/dev/null 2>&1; then
|
|
||||||
_bd_timeout_backend=perl
|
|
||||||
if perl -e 'alarm shift; exec @ARGV' -- "$_bd_timeout" bd hooks run pre-push "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo >&2 "beads: hook 'pre-push' running without timeout; install coreutils or perl to enable BEADS_HOOK_TIMEOUT"
|
|
||||||
if bd hooks run pre-push "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if { [ "$_bd_timeout_backend" = coreutils ] && [ "$_bd_exit" -eq 124 ]; } || { [ "$_bd_timeout_backend" = perl ] && [ "$_bd_exit" -eq 142 ]; }; then
|
|
||||||
echo >&2 "beads: hook 'pre-push' timed out after ${_bd_timeout}s — continuing without beads"
|
echo >&2 "beads: hook 'pre-push' timed out after ${_bd_timeout}s — continuing without beads"
|
||||||
_bd_exit=0
|
_bd_exit=0
|
||||||
fi
|
fi
|
||||||
if [ "$_bd_exit" -eq 3 ]; then
|
else
|
||||||
|
bd hooks run pre-push "$@"
|
||||||
|
_bd_exit=$?
|
||||||
|
fi
|
||||||
|
if [ $_bd_exit -eq 3 ]; then
|
||||||
echo >&2 "beads: database not initialized — skipping hook 'pre-push'"
|
echo >&2 "beads: database not initialized — skipping hook 'pre-push'"
|
||||||
_bd_exit=0
|
_bd_exit=0
|
||||||
fi
|
fi
|
||||||
if [ "$_bd_exit" -ne 0 ]; then exit "$_bd_exit"; fi
|
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi
|
||||||
fi
|
fi
|
||||||
# --- END BEADS INTEGRATION v1.3.2 ---
|
# --- END BEADS INTEGRATION v1.0.3 ---
|
||||||
@@ -1,59 +1,24 @@
|
|||||||
#!/usr/bin/env sh
|
#!/usr/bin/env sh
|
||||||
# --- BEGIN BEADS INTEGRATION v1.3.2 ---
|
# --- BEGIN BEADS INTEGRATION v1.0.3 ---
|
||||||
# This section is managed by beads. Do not remove these markers.
|
# This section is managed by beads. Do not remove these markers.
|
||||||
if command -v bd >/dev/null 2>&1; then
|
if command -v bd >/dev/null 2>&1; then
|
||||||
export BD_GIT_HOOK=1
|
export BD_GIT_HOOK=1
|
||||||
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
_bd_timeout=${BEADS_HOOK_TIMEOUT:-300}
|
||||||
case "$_bd_timeout" in
|
if command -v timeout >/dev/null 2>&1; then
|
||||||
*[!0-9]*|'') _bd_timeout_invalid=1 ;;
|
timeout "$_bd_timeout" bd hooks run prepare-commit-msg "$@"
|
||||||
*[1-9]*) _bd_timeout_invalid=0 ;;
|
|
||||||
*) _bd_timeout_invalid=1 ;;
|
|
||||||
esac
|
|
||||||
if [ "$_bd_timeout_invalid" -eq 1 ]; then
|
|
||||||
echo >&2 "beads: invalid BEADS_HOOK_TIMEOUT; using 300 seconds"
|
|
||||||
_bd_timeout=300
|
|
||||||
fi
|
|
||||||
_bd_timeout_backend=none
|
|
||||||
_bd_timeout_command=
|
|
||||||
for _bd_timeout_candidate in timeout gtimeout; do
|
|
||||||
if command -v "$_bd_timeout_candidate" >/dev/null 2>&1; then
|
|
||||||
if _bd_timeout_version="$("$_bd_timeout_candidate" --version 2>/dev/null)"; then
|
|
||||||
case "$_bd_timeout_version" in
|
|
||||||
"timeout (GNU coreutils) "*) _bd_timeout_command=$_bd_timeout_candidate; break ;;
|
|
||||||
esac
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
if [ -n "$_bd_timeout_command" ]; then
|
|
||||||
_bd_timeout_backend=coreutils
|
|
||||||
if "$_bd_timeout_command" -- "$_bd_timeout" bd hooks run prepare-commit-msg "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
_bd_exit=$?
|
||||||
fi
|
if [ $_bd_exit -eq 124 ]; then
|
||||||
elif command -v perl >/dev/null 2>&1; then
|
|
||||||
_bd_timeout_backend=perl
|
|
||||||
if perl -e 'alarm shift; exec @ARGV' -- "$_bd_timeout" bd hooks run prepare-commit-msg "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
|
||||||
fi
|
|
||||||
else
|
|
||||||
echo >&2 "beads: hook 'prepare-commit-msg' running without timeout; install coreutils or perl to enable BEADS_HOOK_TIMEOUT"
|
|
||||||
if bd hooks run prepare-commit-msg "$@"; then
|
|
||||||
_bd_exit=0
|
|
||||||
else
|
|
||||||
_bd_exit=$?
|
|
||||||
fi
|
|
||||||
fi
|
|
||||||
if { [ "$_bd_timeout_backend" = coreutils ] && [ "$_bd_exit" -eq 124 ]; } || { [ "$_bd_timeout_backend" = perl ] && [ "$_bd_exit" -eq 142 ]; }; then
|
|
||||||
echo >&2 "beads: hook 'prepare-commit-msg' timed out after ${_bd_timeout}s — continuing without beads"
|
echo >&2 "beads: hook 'prepare-commit-msg' timed out after ${_bd_timeout}s — continuing without beads"
|
||||||
_bd_exit=0
|
_bd_exit=0
|
||||||
fi
|
fi
|
||||||
if [ "$_bd_exit" -eq 3 ]; then
|
else
|
||||||
|
bd hooks run prepare-commit-msg "$@"
|
||||||
|
_bd_exit=$?
|
||||||
|
fi
|
||||||
|
if [ $_bd_exit -eq 3 ]; then
|
||||||
echo >&2 "beads: database not initialized — skipping hook 'prepare-commit-msg'"
|
echo >&2 "beads: database not initialized — skipping hook 'prepare-commit-msg'"
|
||||||
_bd_exit=0
|
_bd_exit=0
|
||||||
fi
|
fi
|
||||||
if [ "$_bd_exit" -ne 0 ]; then exit "$_bd_exit"; fi
|
if [ $_bd_exit -ne 0 ]; then exit $_bd_exit; fi
|
||||||
fi
|
fi
|
||||||
# --- END BEADS INTEGRATION v1.3.2 ---
|
# --- END BEADS INTEGRATION v1.0.3 ---
|
||||||
+3
-3
@@ -1,3 +1,3 @@
|
|||||||
{"_type":"issue","id":"home-profile-restructuring-edz","title":"Create copy-hermes-skills systemd service","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":1,"created_at":"2026-04-26T12:30:10Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:44:42Z","started_at":"2026-04-26T12:36:30Z","closed_at":"2026-04-26T12:44:42Z","close_reason":"Created systemd service in hosts/m3-hermes/services/hermes-agent.nix - copies skills to /var/lib/hermes/.agents/skills before hermes-agent starts","labels":["hermes-agent","nixos"],"dependencies":[{"issue_id":"home-profile-restructuring-edz","depends_on_id":"home-profile-restructuring-ycz","type":"blocks","created_at":"2026-04-26T14:30:57Z","created_by":"m3tm3re","metadata":"{}"}],"dependency_count":1,"dependent_count":1,"comment_count":0}
|
{"id":"home-profile-restructuring-edz","title":"Create copy-hermes-skills systemd service","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":1,"created_at":"2026-04-26T12:30:10Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:44:42Z","started_at":"2026-04-26T12:36:30Z","closed_at":"2026-04-26T12:44:42Z","close_reason":"Created systemd service in hosts/m3-hermes/services/hermes-agent.nix - copies skills to /var/lib/hermes/.agents/skills before hermes-agent starts","labels":["hermes-agent","nixos"],"dependencies":[{"issue_id":"home-profile-restructuring-edz","depends_on_id":"home-profile-restructuring-ycz","type":"blocks","created_at":"2026-04-26T14:30:57Z","created_by":"m3tm3re","metadata":"{}"}],"dependency_count":1,"dependent_count":1,"comment_count":0}
|
||||||
{"_type":"issue","id":"home-profile-restructuring-ycz","title":"Build hermes-agent skills using mkOpencodeSkills","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":2,"created_at":"2026-04-26T12:30:09Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:35:15Z","started_at":"2026-04-26T12:31:35Z","closed_at":"2026-04-26T12:35:15Z","close_reason":"Added inputs to module signature and defined hermesSkills via inputs.agents.lib.mkOpencodeSkills with basecamp, anthropic, and kestra external skills. Verified with nixos-rebuild dry-run --flake .#m3-hermes (no errors).","labels":["hermes-agent","nixos"],"dependency_count":0,"dependent_count":1,"comment_count":0}
|
{"id":"home-profile-restructuring-ycz","title":"Build hermes-agent skills using mkOpencodeSkills","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":2,"created_at":"2026-04-26T12:30:09Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:35:15Z","started_at":"2026-04-26T12:31:35Z","closed_at":"2026-04-26T12:35:15Z","close_reason":"Added inputs to module signature and defined hermesSkills via inputs.agents.lib.mkOpencodeSkills with basecamp, anthropic, and kestra external skills. Verified with nixos-rebuild dry-run --flake .#m3-hermes (no errors).","labels":["hermes-agent","nixos"],"dependency_count":0,"dependent_count":1,"comment_count":0}
|
||||||
{"_type":"issue","id":"home-profile-restructuring-cxa","title":"Verify skills available at /var/lib/hermes/.agents/skills","status":"closed","priority":2,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":1,"created_at":"2026-04-26T12:30:10Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:50:58Z","started_at":"2026-04-26T12:38:15Z","closed_at":"2026-04-26T12:50:58Z","close_reason":"Manually verified - skills are present at /var/lib/hermes/.agents/skills on m3-hermes","labels":["hermes-agent","testing"],"dependencies":[{"issue_id":"home-profile-restructuring-cxa","depends_on_id":"home-profile-restructuring-edz","type":"blocks","created_at":"2026-04-26T14:30:57Z","created_by":"m3tm3re","metadata":"{}"}],"dependency_count":1,"dependent_count":0,"comment_count":0}
|
{"id":"home-profile-restructuring-cxa","title":"Verify skills available at /var/lib/hermes/.agents/skills","status":"closed","priority":2,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":1,"created_at":"2026-04-26T12:30:10Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:50:58Z","started_at":"2026-04-26T12:38:15Z","closed_at":"2026-04-26T12:50:58Z","close_reason":"Manually verified - skills are present at /var/lib/hermes/.agents/skills on m3-hermes","labels":["hermes-agent","testing"],"dependencies":[{"issue_id":"home-profile-restructuring-cxa","depends_on_id":"home-profile-restructuring-edz","type":"blocks","created_at":"2026-04-26T14:30:57Z","created_by":"m3tm3re","metadata":"{}"}],"dependency_count":1,"dependent_count":0,"comment_count":0}
|
||||||
@@ -0,0 +1,26 @@
|
|||||||
|
{
|
||||||
|
"hooks": {
|
||||||
|
"PreCompact": [
|
||||||
|
{
|
||||||
|
"hooks": [
|
||||||
|
{
|
||||||
|
"command": "bd prime",
|
||||||
|
"type": "command"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"matcher": ""
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"SessionStart": [
|
||||||
|
{
|
||||||
|
"hooks": [
|
||||||
|
{
|
||||||
|
"command": "bd prime",
|
||||||
|
"type": "command"
|
||||||
|
}
|
||||||
|
],
|
||||||
|
"matcher": ""
|
||||||
|
}
|
||||||
|
]
|
||||||
|
}
|
||||||
|
}
|
||||||
-12
@@ -26,7 +26,6 @@ Thumbs.db
|
|||||||
opencode.json
|
opencode.json
|
||||||
|
|
||||||
# AI agent state
|
# AI agent state
|
||||||
.claude/
|
|
||||||
.sidecar/
|
.sidecar/
|
||||||
.sidecar-*
|
.sidecar-*
|
||||||
.sisyphus/
|
.sisyphus/
|
||||||
@@ -40,19 +39,8 @@ opencode.json
|
|||||||
.pi*
|
.pi*
|
||||||
.worktrees/
|
.worktrees/
|
||||||
docs/plans/
|
docs/plans/
|
||||||
CLAUDE.md
|
|
||||||
|
|
||||||
# Beads / Dolt files (added by bd init)
|
# Beads / Dolt files (added by bd init)
|
||||||
.dolt/
|
.dolt/
|
||||||
*.db
|
*.db
|
||||||
.beads-credential-key
|
.beads-credential-key
|
||||||
.beads.gate.lock
|
|
||||||
|
|
||||||
# --- babysitter managed ---
|
|
||||||
.a5c/creds.env
|
|
||||||
.a5c/creds.env.tmp.*
|
|
||||||
.a5c/logs/
|
|
||||||
.a5c/runs/
|
|
||||||
# --- end babysitter managed ---
|
|
||||||
.a5c/
|
|
||||||
.ruff_cache/
|
|
||||||
@@ -304,10 +304,6 @@ This provides the familiar shell/editor/CLI setup but with work git credentials
|
|||||||
| **Enter dev shell** | `nix develop` | Includes alejandra, nixd, agenix, statix, deadnix |
|
| **Enter dev shell** | `nix develop` | Includes alejandra, nixd, agenix, statix, deadnix |
|
||||||
| **Build host** | `sudo nixos-rebuild switch --flake .#m3-ares` | Replace hostname as needed |
|
| **Build host** | `sudo nixos-rebuild switch --flake .#m3-ares` | Replace hostname as needed |
|
||||||
| **Dry run build** | `sudo nixos-rebuild dry-run --flake .#m3-ares` | Validate without applying |
|
| **Dry run build** | `sudo nixos-rebuild dry-run --flake .#m3-ares` | Validate without applying |
|
||||||
| **Deploy servers** | `nix develop -c colmena apply --on @server` | Colmena: all `server` hosts via SSH; activation is passwordless (scoped sudoers, see extraServices/colmena-deploy.nix) |
|
|
||||||
| **Deploy one host** | `nix develop -c colmena apply --on m3-atlas` | Colmena: single remote host |
|
|
||||||
| **Deploy this host** | `nix develop -c colmena apply-local` | Colmena: local desktop (uses sudo to activate) |
|
|
||||||
| **Preview deploy** | `nix develop -c colmena build --on m3-atlas` | Colmena: build closure without switching |
|
|
||||||
| **List hosts** | `nix flake show` | Shows all NixOS configurations |
|
| **List hosts** | `nix flake show` | Shows all NixOS configurations |
|
||||||
| **Update flake** | `sudo nixos-rebuild switch --flake .#m3-ares --update-input nixpkgs` | Update specific input |
|
| **Update flake** | `sudo nixos-rebuild switch --flake .#m3-ares --update-input nixpkgs` | Update specific input |
|
||||||
| **Format code** | `alejandra .` | Run before committing |
|
| **Format code** | `alejandra .` | Run before committing |
|
||||||
|
|||||||
@@ -0,0 +1,69 @@
|
|||||||
|
# Project Instructions for AI Agents
|
||||||
|
|
||||||
|
This file provides instructions and context for AI coding agents working on this project.
|
||||||
|
|
||||||
|
<!-- BEGIN BEADS INTEGRATION v:1 profile:minimal hash:ca08a54f -->
|
||||||
|
## Beads Issue Tracker
|
||||||
|
|
||||||
|
This project uses **bd (beads)** for issue tracking. Run `bd prime` to see full workflow context and commands.
|
||||||
|
|
||||||
|
### Quick Reference
|
||||||
|
|
||||||
|
```bash
|
||||||
|
bd ready # Find available work
|
||||||
|
bd show <id> # View issue details
|
||||||
|
bd update <id> --claim # Claim work
|
||||||
|
bd close <id> # Complete work
|
||||||
|
```
|
||||||
|
|
||||||
|
### Rules
|
||||||
|
|
||||||
|
- Use `bd` for ALL task tracking — do NOT use TodoWrite, TaskCreate, or markdown TODO lists
|
||||||
|
- Run `bd prime` for detailed command reference and session close protocol
|
||||||
|
- Use `bd remember` for persistent knowledge — do NOT use MEMORY.md files
|
||||||
|
|
||||||
|
## Session Completion
|
||||||
|
|
||||||
|
**When ending a work session**, you MUST complete ALL steps below. Work is NOT complete until `git push` succeeds.
|
||||||
|
|
||||||
|
**MANDATORY WORKFLOW:**
|
||||||
|
|
||||||
|
1. **File issues for remaining work** - Create issues for anything that needs follow-up
|
||||||
|
2. **Run quality gates** (if code changed) - Tests, linters, builds
|
||||||
|
3. **Update issue status** - Close finished work, update in-progress items
|
||||||
|
4. **PUSH TO REMOTE** - This is MANDATORY:
|
||||||
|
```bash
|
||||||
|
git pull --rebase
|
||||||
|
bd dolt push
|
||||||
|
git push
|
||||||
|
git status # MUST show "up to date with origin"
|
||||||
|
```
|
||||||
|
5. **Clean up** - Clear stashes, prune remote branches
|
||||||
|
6. **Verify** - All changes committed AND pushed
|
||||||
|
7. **Hand off** - Provide context for next session
|
||||||
|
|
||||||
|
**CRITICAL RULES:**
|
||||||
|
- Work is NOT complete until `git push` succeeds
|
||||||
|
- NEVER stop before pushing - that leaves work stranded locally
|
||||||
|
- NEVER say "ready to push when you are" - YOU must push
|
||||||
|
- If push fails, resolve and retry until it succeeds
|
||||||
|
<!-- END BEADS INTEGRATION -->
|
||||||
|
|
||||||
|
|
||||||
|
## Build & Test
|
||||||
|
|
||||||
|
_Add your build and test commands here_
|
||||||
|
|
||||||
|
```bash
|
||||||
|
# Example:
|
||||||
|
# npm install
|
||||||
|
# npm test
|
||||||
|
```
|
||||||
|
|
||||||
|
## Architecture Overview
|
||||||
|
|
||||||
|
_Add a brief overview of your project architecture_
|
||||||
|
|
||||||
|
## Conventions & Patterns
|
||||||
|
|
||||||
|
_Add your project-specific conventions here_
|
||||||
File diff suppressed because it is too large.
Load diff
Generated
+504
-629
File diff suppressed because it is too large.
Load diff
@@ -15,41 +15,23 @@
|
|||||||
url = "github:nix-community/home-manager";
|
url = "github:nix-community/home-manager";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
nixpkgs.url = "github:nixos/nixpkgs/nixpkgs-unstable";
|
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
|
||||||
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-26.05";
|
nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11";
|
||||||
# nixpkgs-45570c2.url = "github:nixos/nixpkgs/45570c299dc2b63c8c574c4cd77f0b92f7e2766e";
|
nixpkgs-45570c2.url = "github:nixos/nixpkgs/45570c299dc2b63c8c574c4cd77f0b92f7e2766e";
|
||||||
# nixpkgs-locked.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121";
|
nixpkgs-locked.url = "github:nixos/nixpkgs/2744d988fa116fc6d46cdfa3d1c936d0abd7d121";
|
||||||
# nixpkgs-9e58ed7.url = "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0";
|
nixpkgs-9e58ed7.url = "github:nixos/nixpkgs/9e58ed7ba759d81c98f033b7f5eba21ca68f53b0";
|
||||||
nixpkgs-master.url = "github:nixos/nixpkgs/master";
|
nixpkgs-master.url = "github:nixos/nixpkgs/master";
|
||||||
|
|
||||||
m3ta-nixpkgs = {
|
m3ta-nixpkgs.url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs";
|
||||||
url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/nixpkgs";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
# url = "path:/home/m3tam3re/p/NIX/nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
# Nix library for rendering agent skill source selections into store
|
|
||||||
# dirs (mkHermesSkillsDir). Consumed directly by hosts/m3-hermes.
|
|
||||||
# agent-lib = {
|
|
||||||
# url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/agent-lib-legacy";
|
|
||||||
# inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
# };
|
|
||||||
|
|
||||||
llm-agents.url = "github:numtide/llm-agents.nix";
|
llm-agents.url = "github:numtide/llm-agents.nix";
|
||||||
|
|
||||||
|
#
|
||||||
nur = {
|
nur = {
|
||||||
url = "github:nix-community/NUR";
|
url = "github:nix-community/NUR";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
agenix.url = "github:ryantm/agenix";
|
agenix.url = "github:ryantm/agenix";
|
||||||
|
|
||||||
# Deployment tool (colmena >= 0.5.0 reads the colmenaHive output).
|
|
||||||
# Also provides colmena.lib.makeHive used by our flake outputs.
|
|
||||||
colmena = {
|
|
||||||
url = "github:nix-community/colmena";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
|
|
||||||
disko = {
|
disko = {
|
||||||
url = "github:nix-community/disko";
|
url = "github:nix-community/disko";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
@@ -57,19 +39,44 @@
|
|||||||
|
|
||||||
nixos-generators = {url = "github:nix-community/nixos-generators";};
|
nixos-generators = {url = "github:nix-community/nixos-generators";};
|
||||||
|
|
||||||
|
hyprpanel.url = "github:Jas-SinghFSU/HyprPanel";
|
||||||
rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
|
rose-pine-hyprcursor.url = "github:ndom91/rose-pine-hyprcursor";
|
||||||
nix-colors.url = "github:misterio77/nix-colors";
|
nix-colors.url = "github:misterio77/nix-colors";
|
||||||
|
|
||||||
m3ta-home = {
|
m3ta-home = {
|
||||||
url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home";
|
url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/m3ta-home";
|
||||||
# url = "path:/home/m3tam3re/p/NIX/m3ta-home";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
|
||||||
hermes-agent.url = "github:NousResearch/hermes-agent/v0.22.5";
|
agents = {
|
||||||
|
# url = "path:/home/m3tam3re/p/AI/AGENTS";
|
||||||
|
url = "git+ssh://gitea@code.m3ta.dev/m3tam3re/AGENTS";
|
||||||
|
};
|
||||||
|
## Skills
|
||||||
|
skills-basecamp = {
|
||||||
|
url = "github:basecamp/basecamp-cli";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
skills-anthropic = {
|
||||||
|
url = "github:anthropics/skills";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
skills-kestra = {
|
||||||
|
url = "github:kestra-io/agent-skills";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
skills-superpowers = {
|
||||||
|
url = "github:obra/superpowers";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
skills-vercel = {
|
||||||
|
url = "github:vercel-labs/skills";
|
||||||
|
flake = false;
|
||||||
|
};
|
||||||
|
hermes-agent.url = "github:NousResearch/hermes-agent";
|
||||||
|
|
||||||
ai-memory = {
|
rustfs = {
|
||||||
url = "github:akitaonrails/ai-memory";
|
url = "github:rustfs/rustfs-flake";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -77,36 +84,63 @@
|
|||||||
outputs = {
|
outputs = {
|
||||||
self,
|
self,
|
||||||
agenix,
|
agenix,
|
||||||
colmena,
|
|
||||||
home-manager,
|
home-manager,
|
||||||
nixpkgs,
|
nixpkgs,
|
||||||
m3ta-nixpkgs,
|
m3ta-nixpkgs,
|
||||||
nur,
|
nur,
|
||||||
|
agents,
|
||||||
...
|
...
|
||||||
} @ inputs: let
|
} @ inputs: let
|
||||||
inherit (self) outputs;
|
inherit (self) outputs;
|
||||||
systems = [
|
systems = [
|
||||||
"aarch64-linux"
|
"aarch64-linux"
|
||||||
|
"i686-linux"
|
||||||
"x86_64-linux"
|
"x86_64-linux"
|
||||||
"aarch64-darwin"
|
"aarch64-darwin"
|
||||||
|
"x86_64-darwin"
|
||||||
];
|
];
|
||||||
forAllSystems = nixpkgs.lib.genAttrs systems;
|
forAllSystems = nixpkgs.lib.genAttrs systems;
|
||||||
allOverlays = import ./overlays {inherit inputs outputs;};
|
allOverlays = import ./overlays {inherit inputs outputs;};
|
||||||
|
in {
|
||||||
|
packages =
|
||||||
|
forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
|
||||||
|
overlays = builtins.removeAttrs allOverlays ["mkLlmAgentsOverlay"];
|
||||||
|
lib.mkLlmAgentsOverlay = allOverlays.mkLlmAgentsOverlay;
|
||||||
|
homeManagerModules = import ./modules/home-manager;
|
||||||
|
|
||||||
# Single source of truth for all NixOS hosts. Consumed by both
|
nixosConfigurations = {
|
||||||
# nixosConfigurations (nixos-rebuild/nh) and the Colmena hive below,
|
m3-ares = nixpkgs.lib.nixosSystem {
|
||||||
# so local rebuilds and remote deploys can never drift apart.
|
specialArgs = {
|
||||||
nixosHosts = {
|
inherit inputs outputs;
|
||||||
m3-atlas = {
|
system = "x86_64-linux";
|
||||||
|
hostname = "m3-ares";
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
./hosts/m3-ares
|
||||||
|
agenix.nixosModules.default
|
||||||
|
m3ta-nixpkgs.nixosModules.default
|
||||||
|
inputs.hermes-agent.nixosModules.default
|
||||||
|
];
|
||||||
|
};
|
||||||
|
m3-atlas = nixpkgs.lib.nixosSystem {
|
||||||
|
specialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
system = "x86_64-linux";
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/m3-atlas
|
./hosts/m3-atlas
|
||||||
inputs.disko.nixosModules.disko
|
inputs.disko.nixosModules.disko
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
m3ta-nixpkgs.nixosModules.default
|
m3ta-nixpkgs.nixosModules.default
|
||||||
|
inputs.rustfs.nixosModules.rustfs
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
m3-kratos = {
|
m3-kratos = nixpkgs.lib.nixosSystem {
|
||||||
|
specialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
system = "x86_64-linux";
|
||||||
hostname = "m3-kratos";
|
hostname = "m3-kratos";
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/m3-kratos
|
./hosts/m3-kratos
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
@@ -115,111 +149,64 @@
|
|||||||
inputs.hermes-agent.nixosModules.default
|
inputs.hermes-agent.nixosModules.default
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
m3-hermes = {
|
m3-helios = nixpkgs.lib.nixosSystem {
|
||||||
|
specialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
system = "x86_64-linux";
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
./hosts/m3-helios
|
||||||
|
inputs.disko.nixosModules.disko
|
||||||
|
agenix.nixosModules.default
|
||||||
|
m3ta-nixpkgs.nixosModules.default
|
||||||
|
];
|
||||||
|
};
|
||||||
|
m3-hermes = nixpkgs.lib.nixosSystem {
|
||||||
|
specialArgs = {
|
||||||
|
inherit inputs outputs;
|
||||||
|
system = "x86_64-linux";
|
||||||
|
};
|
||||||
modules = [
|
modules = [
|
||||||
./hosts/m3-hermes
|
./hosts/m3-hermes
|
||||||
inputs.disko.nixosModules.disko
|
inputs.disko.nixosModules.disko
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
m3ta-nixpkgs.nixosModules.default
|
m3ta-nixpkgs.nixosModules.default
|
||||||
inputs.hermes-agent.nixosModules.default
|
inputs.hermes-agent.nixosModules.default
|
||||||
inputs.ai-memory.nixosModules.default
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
homeConfigurations = {
|
||||||
mkSpecialArgs = hostname:
|
"m3tam3re@m3-daedalus" = home-manager.lib.homeManagerConfiguration {
|
||||||
{
|
pkgs = nixpkgs.legacyPackages."x86_64-linux";
|
||||||
|
extraSpecialArgs = {
|
||||||
inherit inputs outputs;
|
inherit inputs outputs;
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
}
|
hostname = "m3-daedalus";
|
||||||
// nixpkgs.lib.optionalAttrs (hostname != null) {inherit hostname;};
|
|
||||||
|
|
||||||
# Colmena deployment hive (https://colmena.cli.rs):
|
|
||||||
# nix develop -c colmena apply --on @server # all servers via SSH
|
|
||||||
# nix develop -c colmena apply --on m3-atlas # single host
|
|
||||||
# nix develop -c colmena apply-local # this machine (desktops)
|
|
||||||
# meta.nixpkgs overlays/config are merged with mkBefore, so the overlays
|
|
||||||
# set in hosts/common/default.nix keep working unchanged.
|
|
||||||
rawHive = {
|
|
||||||
meta = {
|
|
||||||
nixpkgs = import nixpkgs {
|
|
||||||
system = "x86_64-linux";
|
|
||||||
overlays = [];
|
|
||||||
};
|
};
|
||||||
specialArgs = mkSpecialArgs null;
|
modules = [./home/m3tam3re/m3-daedalus.nix];
|
||||||
nodeSpecialArgs =
|
|
||||||
nixpkgs.lib.mapAttrs
|
|
||||||
(_: host: mkSpecialArgs host.hostname)
|
|
||||||
(nixpkgs.lib.filterAttrs (_: host: host ? hostname) nixosHosts);
|
|
||||||
# Guard against bare `colmena apply` hitting every node (including
|
|
||||||
# desktops in active use). Use --on filters or apply-local instead.
|
|
||||||
allowApplyAll = false;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
defaults = {
|
|
||||||
deployment.targetUser = "m3tam3re";
|
|
||||||
};
|
|
||||||
|
|
||||||
m3-atlas = {
|
|
||||||
imports = nixosHosts.m3-atlas.modules;
|
|
||||||
deployment = {
|
|
||||||
targetHost = "m3-atlas";
|
|
||||||
tags = ["server"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
m3-kratos = {
|
|
||||||
imports = nixosHosts.m3-kratos.modules;
|
|
||||||
deployment = {
|
|
||||||
targetHost = "m3-kratos";
|
|
||||||
tags = ["desktop"];
|
|
||||||
allowLocalDeployment = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
m3-hermes = {
|
|
||||||
imports = nixosHosts.m3-hermes.modules;
|
|
||||||
deployment = {
|
|
||||||
targetHost = "m3-hermes";
|
|
||||||
tags = ["server"];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
packages =
|
|
||||||
forAllSystems (system: import ./pkgs nixpkgs.legacyPackages.${system});
|
|
||||||
overlays = allOverlays;
|
|
||||||
homeManagerModules = import ./modules/home-manager;
|
|
||||||
|
|
||||||
nixosConfigurations =
|
|
||||||
nixpkgs.lib.mapAttrs
|
|
||||||
(_: host:
|
|
||||||
nixpkgs.lib.nixosSystem {
|
|
||||||
specialArgs = mkSpecialArgs (host.hostname or null);
|
|
||||||
modules = host.modules;
|
|
||||||
})
|
|
||||||
nixosHosts;
|
|
||||||
|
|
||||||
# Colmena >= 0.5.0 (direct flake evaluation) and legacy CLIs alike.
|
|
||||||
colmenaHive = colmena.lib.makeHive rawHive;
|
|
||||||
colmena = rawHive;
|
|
||||||
homeConfigurations = {
|
|
||||||
};
|
};
|
||||||
devShells = forAllSystems (system: let
|
devShells = forAllSystems (system: let
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system;
|
inherit system;
|
||||||
config.allowUnfree = true; # Allow unfree packages in devShell
|
config.allowUnfree = true; # Allow unfree packages in devShell
|
||||||
};
|
};
|
||||||
|
m3taLib = m3ta-nixpkgs.lib.x86_64-linux;
|
||||||
|
rules = m3taLib.coding-rules.mkCodingRules {
|
||||||
|
inherit agents;
|
||||||
|
languages = ["nix"];
|
||||||
|
};
|
||||||
in {
|
in {
|
||||||
default = pkgs.mkShell {
|
default = pkgs.mkShell {
|
||||||
buildInputs = with pkgs;
|
buildInputs = with pkgs; [
|
||||||
[
|
|
||||||
alejandra
|
alejandra
|
||||||
nixd
|
nixd
|
||||||
openssh
|
openssh
|
||||||
agenix.packages.${system}.default
|
agenix.packages.${system}.default
|
||||||
statix
|
statix
|
||||||
deadnix
|
deadnix
|
||||||
]
|
];
|
||||||
++ [colmena.packages.${system}.default];
|
inherit (rules) instructions shellHook;
|
||||||
};
|
};
|
||||||
});
|
});
|
||||||
};
|
};
|
||||||
|
|||||||
+14
-50
@@ -13,7 +13,6 @@
|
|||||||
./ports.nix
|
./ports.nix
|
||||||
./users
|
./users
|
||||||
inputs.home-manager.nixosModules.home-manager
|
inputs.home-manager.nixosModules.home-manager
|
||||||
inputs.m3ta-home.nixosModules.t3code
|
|
||||||
];
|
];
|
||||||
|
|
||||||
environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"];
|
environment.pathsToLink = ["/share/xdg-desktop-portal" "/share/applications"];
|
||||||
@@ -22,8 +21,7 @@
|
|||||||
useGlobalPkgs = true;
|
useGlobalPkgs = true;
|
||||||
useUserPackages = true;
|
useUserPackages = true;
|
||||||
extraSpecialArgs = {
|
extraSpecialArgs = {
|
||||||
inputs = inputs // {agents = null;};
|
inherit inputs outputs system;
|
||||||
inherit outputs system;
|
|
||||||
videoDrivers = config.services.xserver.videoDrivers or [];
|
videoDrivers = config.services.xserver.videoDrivers or [];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
@@ -33,25 +31,15 @@
|
|||||||
overlays = [
|
overlays = [
|
||||||
# Add overlays your own flake exports (from overlays and pkgs dir):
|
# Add overlays your own flake exports (from overlays and pkgs dir):
|
||||||
#outputs.overlays.additions
|
#outputs.overlays.additions
|
||||||
outputs.overlays.modifications
|
#outputs.overlays.modifications
|
||||||
outputs.overlays.stable-packages
|
outputs.overlays.stable-packages
|
||||||
# outputs.overlays.locked-packages
|
outputs.overlays.locked-packages
|
||||||
# outputs.overlays.pinned-packages
|
outputs.overlays.pinned-packages
|
||||||
outputs.overlays.master-packages
|
outputs.overlays.master-packages
|
||||||
|
|
||||||
inputs.m3ta-nixpkgs.overlays.default
|
inputs.m3ta-nixpkgs.overlays.default
|
||||||
# inputs.m3ta-nixpkgs.overlays.modifications
|
inputs.m3ta-nixpkgs.overlays.modifications
|
||||||
# Top-level pins for opencode/opencode-desktop from llm-agents. Must
|
(outputs.lib.mkLlmAgentsOverlay system)
|
||||||
# come AFTER m3ta-nixpkgs' overlay, which re-exports opencode-desktop
|
|
||||||
# from its own (older, v1) `opencode` flake input.
|
|
||||||
outputs.overlays.ai-agents
|
|
||||||
# llm-agent packages under the `pkgs.llm-agents.*` namespace, built
|
|
||||||
# against this system's nixpkgs (needed for qmd.override cudaSupport
|
|
||||||
# with allowUnfree). Do NOT flatten to top-level attrs — see
|
|
||||||
# overlays/default.nix.
|
|
||||||
inputs.llm-agents.overlays.shared-nixpkgs
|
|
||||||
# Wraps pkgs.llm-agents.t3code* with the agents' m3ta-chiron identity.
|
|
||||||
inputs.m3ta-home.overlays.t3code-agent-identity
|
|
||||||
# You can also add overlays exported from other flakes:
|
# You can also add overlays exported from other flakes:
|
||||||
# neovim-nightly-overlay.overlays.default
|
# neovim-nightly-overlay.overlays.default
|
||||||
|
|
||||||
@@ -71,48 +59,24 @@
|
|||||||
|
|
||||||
nix = {
|
nix = {
|
||||||
settings = {
|
settings = {
|
||||||
experimental-features = ["nix-command flakes"];
|
experimental-features = "nix-command flakes";
|
||||||
cores = 2;
|
cores = 2;
|
||||||
max-jobs = 8;
|
max-jobs = 8;
|
||||||
trusted-users = [
|
trusted-users = [
|
||||||
"root"
|
"root"
|
||||||
"m3tam3re"
|
"m3tam3re"
|
||||||
]; # Set users that are allowed to use the flake command
|
]; # Set users that are allowed to use the flake command
|
||||||
# Renamed from nix.nixPath (removed option).
|
|
||||||
nix-path = ["/etc/nix/path"];
|
|
||||||
};
|
};
|
||||||
# Garbage collection is handled by programs.nh.clean on each host.
|
gc = {
|
||||||
# Keep nix.gc.automatic disabled to avoid dueling GC timers.
|
automatic = true;
|
||||||
|
dates = "weekly";
|
||||||
|
options = "--delete-older-than 30d";
|
||||||
|
};
|
||||||
optimise.automatic = true;
|
optimise.automatic = true;
|
||||||
registry =
|
registry =
|
||||||
(lib.mapAttrs (_: flake: {inherit flake;}))
|
(lib.mapAttrs (_: flake: {inherit flake;}))
|
||||||
((lib.filterAttrs (_: lib.isType "flake")) inputs);
|
((lib.filterAttrs (_: lib.isType "flake")) inputs);
|
||||||
|
nixPath = ["/etc/nix/path"];
|
||||||
};
|
};
|
||||||
users.defaultUserShell = pkgs.bashInteractive;
|
users.defaultUserShell = pkgs.nushell;
|
||||||
programs.bash = {
|
|
||||||
enable = true;
|
|
||||||
interactiveShellInit = ''
|
|
||||||
# Interactive bash -> nushell, unless started deliberately from
|
|
||||||
# nu/bash (parent check — an exported env marker would leak into
|
|
||||||
# zellij/zed/herdr children). Non-interactive bash (ssh command
|
|
||||||
# exec, Mosh app bootstrap) stays bash.
|
|
||||||
if [[ $- == *i* ]]; then
|
|
||||||
parent=""
|
|
||||||
[[ -r /proc/$PPID/comm ]] && IFS= read -r parent < /proc/$PPID/comm
|
|
||||||
if [[ "$parent" != "nu" && "$parent" != "bash" ]]; then
|
|
||||||
# First TTY login -> Hyprland (login-manager replacement).
|
|
||||||
# Only for non-root users with no graphical session running,
|
|
||||||
# and only on hosts where start-hyprland exists (desktops).
|
|
||||||
# Servers/laptops without Hyprland fall through to nushell.
|
|
||||||
if [[ "$(tty)" == "/dev/tty1" && $EUID -ne 0 \
|
|
||||||
&& -z "''${WAYLAND_DISPLAY:-}" && -z "''${DISPLAY:-}" ]] \
|
|
||||||
&& command -v start-hyprland >/dev/null 2>&1; then
|
|
||||||
exec start-hyprland
|
|
||||||
fi
|
|
||||||
exec ${pkgs.nushell}/bin/nu --login
|
|
||||||
fi
|
|
||||||
unset parent
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
@@ -1,58 +0,0 @@
|
|||||||
# Passwordless privilege escalation for Colmena deployments, scoped to
|
|
||||||
# exactly the two commands colmena executes on a non-root target host
|
|
||||||
# (colmena src/nix/host/ssh.rs + profile.rs, verified for 0.5/0.6):
|
|
||||||
#
|
|
||||||
# sudo -H -- nix-env --profile /nix/var/nix/profiles/system --set /nix/store/<toplevel>
|
|
||||||
# sudo -H -- /nix/store/<toplevel>/bin/switch-to-configuration <switch|boot|test|dry-activate>
|
|
||||||
#
|
|
||||||
# Colmena connects with BatchMode=yes and without a TTY, so a sudo
|
|
||||||
# password prompt can never be answered — non-root deploys REQUIRE
|
|
||||||
# NOPASSWD for these two invocations. Everything else the user runs via
|
|
||||||
# sudo still asks for a password: the exception covers only these exact
|
|
||||||
# command shapes.
|
|
||||||
#
|
|
||||||
# Residual risk (inherent to any NixOS remote activation): whoever can
|
|
||||||
# run these commands can activate any closure present in the store as
|
|
||||||
# the new system. That is the deploy capability itself, not an
|
|
||||||
# unintended side effect.
|
|
||||||
#
|
|
||||||
# NOTE: if colmena is invoked with extra nix flags (e.g. --show-trace,
|
|
||||||
# --option cores N) the nix-env argv grows trailing flags and no longer
|
|
||||||
# matches the pinned rule — plain `colmena apply` is what this covers.
|
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
deployUser = "m3tam3re";
|
|
||||||
in
|
|
||||||
with lib; {
|
|
||||||
options.extraServices.colmenaDeploy.enable =
|
|
||||||
mkEnableOption "passwordless colmena deployment (sudo NOPASSWD scoped to the system profile switch and switch-to-configuration activation only)";
|
|
||||||
|
|
||||||
config = mkIf config.extraServices.colmenaDeploy.enable {
|
|
||||||
security.sudo.extraRules = [
|
|
||||||
{
|
|
||||||
users = [deployUser];
|
|
||||||
commands =
|
|
||||||
# Activate a store closure. Only the four goals colmena
|
|
||||||
# passes, as the sole argument, are allowed.
|
|
||||||
map (goal: {
|
|
||||||
command = "/nix/store/*/bin/switch-to-configuration ${goal}";
|
|
||||||
options = ["NOPASSWD"];
|
|
||||||
}) ["boot" "switch" "test" "dry-activate"]
|
|
||||||
++ [
|
|
||||||
{
|
|
||||||
# Make a store closure the system profile (goals
|
|
||||||
# switch/boot). Over SSH "nix-env" deterministically
|
|
||||||
# resolves to /run/current-system/sw/bin/nix-env — it
|
|
||||||
# only ships in the system closure — which is the path
|
|
||||||
# sudo matches here.
|
|
||||||
command = "/run/current-system/sw/bin/nix-env --profile /nix/var/nix/profiles/system --set /nix/store/*";
|
|
||||||
options = ["NOPASSWD"];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./colmena-deploy.nix
|
|
||||||
./flatpak.nix
|
./flatpak.nix
|
||||||
./podman.nix
|
./podman.nix
|
||||||
./ollama.nix
|
./ollama.nix
|
||||||
|
|||||||
@@ -21,22 +21,9 @@ in {
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
programs.virt-manager.enable = true;
|
programs.virt-manager.enable = true;
|
||||||
|
systemd.services.virt-secret-init-encryption.enable = false;
|
||||||
environment = {
|
environment = {
|
||||||
systemPackages = [pkgs.qemu];
|
systemPackages = [pkgs.qemu];
|
||||||
etc = {
|
|
||||||
"ovmf/OVMF_CODE.fd" = {
|
|
||||||
source = "${(pkgs.OVMF.override {
|
|
||||||
secureBoot = true;
|
|
||||||
tpmSupport = true;
|
|
||||||
}).fd}/FV/OVMF_CODE.fd";
|
|
||||||
};
|
|
||||||
"ovmf/OVMF_VARS.fd" = {
|
|
||||||
source = "${(pkgs.OVMF.override {
|
|
||||||
secureBoot = true;
|
|
||||||
tpmSupport = true;
|
|
||||||
}).fd}/FV/OVMF_VARS.fd";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -39,15 +39,6 @@
|
|||||||
outline = 3019;
|
outline = 3019;
|
||||||
authentik = 3023;
|
authentik = 3023;
|
||||||
tuwunel = 3024;
|
tuwunel = 3024;
|
||||||
honcho = 3025;
|
|
||||||
|
|
||||||
# Agent infrastructure
|
|
||||||
hermes-api = 8642;
|
|
||||||
hermes-dashboard = 9119;
|
|
||||||
ai-memory = 49374;
|
|
||||||
|
|
||||||
# Agent cockpit
|
|
||||||
t3code = 3773;
|
|
||||||
|
|
||||||
# Home automation
|
# Home automation
|
||||||
homarr = 7575;
|
homarr = 7575;
|
||||||
|
|||||||
@@ -37,7 +37,7 @@
|
|||||||
# ── Server hosts ──
|
# ── Server hosts ──
|
||||||
m3-atlas = {
|
m3-atlas = {
|
||||||
context = "server";
|
context = "server";
|
||||||
sets = [];
|
sets = ["coding"];
|
||||||
};
|
};
|
||||||
m3-helios = {
|
m3-helios = {
|
||||||
context = "server";
|
context = "server";
|
||||||
@@ -53,10 +53,7 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
profile =
|
profile = hostProfiles.${hostname} or {
|
||||||
hostProfiles.${
|
|
||||||
hostname
|
|
||||||
} or {
|
|
||||||
context = "server";
|
context = "server";
|
||||||
sets = [];
|
sets = [];
|
||||||
};
|
};
|
||||||
@@ -74,6 +71,7 @@
|
|||||||
# Full desktop workstation
|
# Full desktop workstation
|
||||||
base = {
|
base = {
|
||||||
shell = {
|
shell = {
|
||||||
|
fish.enable = true;
|
||||||
nushell.enable = true;
|
nushell.enable = true;
|
||||||
starship.enable = true;
|
starship.enable = true;
|
||||||
};
|
};
|
||||||
@@ -87,8 +85,8 @@
|
|||||||
desktop = {
|
desktop = {
|
||||||
wm = {
|
wm = {
|
||||||
hyprland.enable = true;
|
hyprland.enable = true;
|
||||||
|
rofi.enable = true;
|
||||||
wayland.enable = true;
|
wayland.enable = true;
|
||||||
dms.enable = true;
|
|
||||||
};
|
};
|
||||||
apps = {
|
apps = {
|
||||||
crypto.enable = true;
|
crypto.enable = true;
|
||||||
@@ -107,14 +105,6 @@
|
|||||||
};
|
};
|
||||||
lsp.enable = true;
|
lsp.enable = true;
|
||||||
packages.enable = true;
|
packages.enable = true;
|
||||||
aiMemory = {
|
|
||||||
enable = hostname == "m3-kratos";
|
|
||||||
# Work checkouts on the private desktop go to the work workspace.
|
|
||||||
workspaceDirs = {
|
|
||||||
"p/AZ" = "az";
|
|
||||||
"p/AZ-INTEC" = "az";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
languages = {
|
languages = {
|
||||||
python.enable = true;
|
python.enable = true;
|
||||||
javascript.enable = true;
|
javascript.enable = true;
|
||||||
@@ -126,12 +116,10 @@
|
|||||||
profiles.gaming = {
|
profiles.gaming = {
|
||||||
steam.enable = true;
|
steam.enable = true;
|
||||||
gamescope.enable = true;
|
gamescope.enable = true;
|
||||||
emulators.enable = true;
|
|
||||||
};
|
};
|
||||||
profiles.media = {
|
profiles.media = {
|
||||||
obs.enable = true;
|
obs.enable = true;
|
||||||
ffmpeg.enable = true;
|
ffmpeg.enable = true;
|
||||||
graphics.enable = true;
|
|
||||||
kdenlive.enable = true;
|
kdenlive.enable = true;
|
||||||
ytDlp.enable = true;
|
ytDlp.enable = true;
|
||||||
};
|
};
|
||||||
@@ -141,6 +129,7 @@
|
|||||||
# Portable laptop — desktop without gaming, no Hyprland
|
# Portable laptop — desktop without gaming, no Hyprland
|
||||||
base = {
|
base = {
|
||||||
shell = {
|
shell = {
|
||||||
|
fish.enable = true;
|
||||||
nushell.enable = true;
|
nushell.enable = true;
|
||||||
starship.enable = true;
|
starship.enable = true;
|
||||||
};
|
};
|
||||||
@@ -205,6 +194,7 @@
|
|||||||
# m3-helios, m3-hermes, m3-aether — minimal server
|
# m3-helios, m3-hermes, m3-aether — minimal server
|
||||||
base = {
|
base = {
|
||||||
shell = {
|
shell = {
|
||||||
|
fish.enable = true;
|
||||||
starship.enable = true;
|
starship.enable = true;
|
||||||
};
|
};
|
||||||
cliTools = {
|
cliTools = {
|
||||||
@@ -216,7 +206,7 @@
|
|||||||
in {
|
in {
|
||||||
# ── NixOS user definition ──
|
# ── NixOS user definition ──
|
||||||
users.users.m3tam3re = {
|
users.users.m3tam3re = {
|
||||||
hashedPassword = "$y$j9T$ORX4btVZgs9Xjq2oIvzJm0$lXiPwaa0D6t.eMDIx1UBesEAMOkWXBoGwpeI7X0aS8D";
|
password = "12345";
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
description = "m3tam3re";
|
description = "m3tam3re";
|
||||||
extraGroups = [
|
extraGroups = [
|
||||||
@@ -234,18 +224,14 @@ in {
|
|||||||
];
|
];
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU= m3tam3re@m3-nix"
|
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU= m3tam3re@m3-nix"
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBZcjCKl0DRuOUOMXbM0GKY5JjvmyFpVZ/tRlTKWu/zp razr"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEZbg/Z9mnflXuLahGY8WOSBMqbgeqVIkIwRkquys1Ml sascha.koenig@azintec.com"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEZbg/Z9mnflXuLahGY8WOSBMqbgeqVIkIwRkquys1Ml sascha.koenig@azintec.com"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCTBFMPCOpKerJBlcvH44602sGyJvgXrwYUegYf96D0 m3ta-adm"
|
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBZcjCKl0DRuOUOMXbM0GKY5JjvmyFpVZ/tRlTKWu/zp"
|
|
||||||
];
|
];
|
||||||
packages = [inputs.home-manager.packages.${pkgs.stdenv.hostPlatform.system}.default];
|
packages = [inputs.home-manager.packages.${pkgs.stdenv.hostPlatform.system}.default];
|
||||||
};
|
};
|
||||||
|
|
||||||
# ── Home-Manager configuration via m3ta-home ──
|
# ── Home-Manager configuration via m3ta-home ──
|
||||||
home-manager.users.m3tam3re = {
|
home-manager.users.m3tam3re = {
|
||||||
home.file.".bashrc".text = ''
|
|
||||||
. /etc/bashrc
|
|
||||||
'';
|
|
||||||
imports =
|
imports =
|
||||||
[
|
[
|
||||||
# Load m3ta-home composition engine
|
# Load m3ta-home composition engine
|
||||||
|
|||||||
@@ -0,0 +1,111 @@
|
|||||||
|
# Edit this configuration file to define what should be installed on
|
||||||
|
# your system. Help is available in the configuration.nix(5) man page, on
|
||||||
|
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||||
|
{pkgs, ...}: {
|
||||||
|
imports = [
|
||||||
|
# Include the results of the hardware scan.
|
||||||
|
./disko-config.nix
|
||||||
|
./hardware-configuration.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
# Bootloader.
|
||||||
|
boot.loader.grub = {
|
||||||
|
efiSupport = true;
|
||||||
|
efiInstallAsRemovable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
networking.hostName = "m3-helios"; # Define your hostname.
|
||||||
|
networking.hostId = "3ebf1cd3";
|
||||||
|
# Pick only one of the below networking options.
|
||||||
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
networking.networkmanager.enable =
|
||||||
|
true; # Easiest to use and most distros use this by default.
|
||||||
|
# Set your time zone.
|
||||||
|
time.timeZone = "Europe/Berlin";
|
||||||
|
|
||||||
|
# Configure network proxy if necessary
|
||||||
|
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||||
|
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||||
|
|
||||||
|
# Select internationalisation properties.
|
||||||
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
|
# console = {
|
||||||
|
# font = "Lat2-Terminus16";
|
||||||
|
# keyMap = "us";
|
||||||
|
# useXkbConfig = true; # use xkb.options in tty.
|
||||||
|
# };
|
||||||
|
|
||||||
|
# Enable the X11 windowing system.
|
||||||
|
# services.xserver.enable = true;
|
||||||
|
|
||||||
|
# Enable the GNOME Desktop Environment.
|
||||||
|
# services.xserver.displayManager.gdm.enable = true;
|
||||||
|
# services.xserver.desktopManager.gnome.enable = true;
|
||||||
|
|
||||||
|
# Configure keymap in X11
|
||||||
|
# services.xserver.xkb.layout = "us";
|
||||||
|
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
||||||
|
|
||||||
|
# Enable CUPS to print documents.
|
||||||
|
# services.printing.enable = true;
|
||||||
|
|
||||||
|
# Enable sound.
|
||||||
|
# hardware.pulseaudio.enable = true;
|
||||||
|
# OR
|
||||||
|
|
||||||
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
|
# services.libinput.enable = true;
|
||||||
|
|
||||||
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
|
|
||||||
|
# List packages installed in system profile. To search, run:
|
||||||
|
# $ nix search wget
|
||||||
|
environment.systemPackages = with pkgs; [neovim git];
|
||||||
|
|
||||||
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
|
# started in user sessions.
|
||||||
|
# programs.mtr.enable = true;
|
||||||
|
# programs.gnupg.agent = {
|
||||||
|
# enable = true;
|
||||||
|
# enableSSHSupport = true;
|
||||||
|
# };
|
||||||
|
|
||||||
|
# List services that you want to enable:
|
||||||
|
|
||||||
|
# Enable the OpenSSH daemon.
|
||||||
|
services.openssh.enable = true;
|
||||||
|
services.fstrim = {
|
||||||
|
enable = true; # For SSD/thin-provisioned storage
|
||||||
|
interval = "weekly";
|
||||||
|
};
|
||||||
|
|
||||||
|
# Open ports in the firewall.
|
||||||
|
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||||
|
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||||
|
# Or disable the firewall altogether.
|
||||||
|
# networking.firewall.enable = false;
|
||||||
|
|
||||||
|
# Copy the NixOS configuration file and link it from the resulting system
|
||||||
|
# (/run/current-system/configuration.nix). This is useful in case you
|
||||||
|
# accidentally delete configuration.nix.
|
||||||
|
# system.copySystemConfiguration = true;
|
||||||
|
|
||||||
|
# This option defines the first version of NixOS you have installed on this particular machine,
|
||||||
|
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
|
||||||
|
#
|
||||||
|
# Most users should NEVER change this value after the initial install, for any reason,
|
||||||
|
# even if you've upgraded your system to a new NixOS release.
|
||||||
|
#
|
||||||
|
# This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
|
||||||
|
# so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
|
||||||
|
# to actually do that.
|
||||||
|
#
|
||||||
|
# This value being lower than the current NixOS release does NOT mean your system is
|
||||||
|
# out of date, out of support, or vulnerable.
|
||||||
|
#
|
||||||
|
# Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
|
||||||
|
# and migrated your data accordingly.
|
||||||
|
#
|
||||||
|
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||||
|
system.stateVersion = "24.11"; # Did you read the comment?
|
||||||
|
}
|
||||||
@@ -0,0 +1,50 @@
|
|||||||
|
# A staring point is the basic NIXOS configuration generated by the ISO installer.
|
||||||
|
# On an existing NIXOS install you can use the following command in your flakes basedir:
|
||||||
|
# sudo nixos-generate-config --dir ./hosts/m3tam3re
|
||||||
|
#
|
||||||
|
# Please make sure to change the first couple of lines in your configuration.nix:
|
||||||
|
# { config, inputs, ouputs, lib, pkgs, ... }:
|
||||||
|
#
|
||||||
|
# {
|
||||||
|
# imports = [ # Include the results of the hardware scan.
|
||||||
|
# ./hardware-configuration.nix
|
||||||
|
# inputs.home-manager.nixosModules.home-manager
|
||||||
|
# ];
|
||||||
|
# ...
|
||||||
|
#
|
||||||
|
# Moreover please update the packages option in your user configuration and add the home-manager options:
|
||||||
|
# users.users = {
|
||||||
|
# m3tam3re = {
|
||||||
|
# isNormalUser = true;
|
||||||
|
# initialPassword = "12345";
|
||||||
|
# extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
||||||
|
# packages = [ inputs.home-manager.packages.${pkgs.system}.default ];
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
#
|
||||||
|
# home-manager = {
|
||||||
|
# useUserPackages = true;
|
||||||
|
# extraSpecialArgs = { inherit inputs outputs; };
|
||||||
|
# users.m3tam3re =
|
||||||
|
# import ../../home/m3tam3re/${config.networking.hostName}.nix;
|
||||||
|
# };
|
||||||
|
#
|
||||||
|
# Please also change your hostname accordingly:
|
||||||
|
#:w
|
||||||
|
# networking.hostName = "nixos"; # Define your hostname.
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../common
|
||||||
|
./configuration.nix
|
||||||
|
./programs.nix
|
||||||
|
./secrets.nix
|
||||||
|
./services
|
||||||
|
];
|
||||||
|
|
||||||
|
extraServices = {
|
||||||
|
flatpak.enable = true;
|
||||||
|
ollama.enable = false;
|
||||||
|
podman.enable = true;
|
||||||
|
virtualisation.enable = false;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,39 @@
|
|||||||
|
{
|
||||||
|
disko.devices = {
|
||||||
|
disk = {
|
||||||
|
main = {
|
||||||
|
type = "disk";
|
||||||
|
device = "/dev/sda";
|
||||||
|
content = {
|
||||||
|
type = "gpt";
|
||||||
|
partitions = {
|
||||||
|
boot = {
|
||||||
|
size = "1M";
|
||||||
|
type = "EF02"; # for GRUB MBR
|
||||||
|
priority = 1;
|
||||||
|
};
|
||||||
|
esp = {
|
||||||
|
size = "512M";
|
||||||
|
type = "EF00";
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
format = "vfat";
|
||||||
|
mountpoint = "/boot";
|
||||||
|
mountOptions = ["defaults" "umask=0077"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
root = {
|
||||||
|
size = "100%";
|
||||||
|
content = {
|
||||||
|
type = "filesystem";
|
||||||
|
format = "ext4";
|
||||||
|
mountpoint = "/";
|
||||||
|
mountOptions = ["noatime" "nodiratime" "discard"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,28 @@
|
|||||||
|
# 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 + "/profiles/qemu-guest.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = ["ata_piix" "uhci_hcd" "virtio_pci" "virtio_scsi" "sd_mod" "sr_mod"];
|
||||||
|
boot.initrd.kernelModules = [];
|
||||||
|
boot.kernelModules = [];
|
||||||
|
boot.extraModulePackages = [];
|
||||||
|
|
||||||
|
# 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.ens18.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
}
|
||||||
@@ -0,0 +1,14 @@
|
|||||||
|
{pkgs, ...}: {
|
||||||
|
programs.nix-ld.enable = true;
|
||||||
|
programs.nix-ld.libraries = with pkgs; [
|
||||||
|
# Add any missing dynamic libraries for unpackaged programs
|
||||||
|
# here, NOT in environment.systemPackages
|
||||||
|
];
|
||||||
|
programs.fish.enable = true;
|
||||||
|
programs.nh = {
|
||||||
|
enable = true;
|
||||||
|
clean.enable = true;
|
||||||
|
clean.extraArgs = "--keep-since 4d --keep 3";
|
||||||
|
flake = "/home/m3tam3re/p/nixos/nixos-config";
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,15 @@
|
|||||||
|
{
|
||||||
|
age = {
|
||||||
|
secrets = {
|
||||||
|
traefik = {
|
||||||
|
file = ../../secrets/traefik.age;
|
||||||
|
mode = "770";
|
||||||
|
owner = "traefik";
|
||||||
|
};
|
||||||
|
m3tam3re-secrets = {
|
||||||
|
file = ../../secrets/m3tam3re-secrets.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
{
|
||||||
|
services.cloud-init = {
|
||||||
|
enable = true;
|
||||||
|
ext4.enable = true;
|
||||||
|
network.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,5 @@
|
|||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./cloud-init.nix
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -0,0 +1,133 @@
|
|||||||
|
# Edit this configuration file to define what should be installed on
|
||||||
|
# your system. Help is available in the configuration.nix(5) man page, on
|
||||||
|
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||||
|
{pkgs, ...}: {
|
||||||
|
imports = [
|
||||||
|
# Include the results of the hardware scan.
|
||||||
|
./hardware-configuration.nix
|
||||||
|
];
|
||||||
|
|
||||||
|
specialisation = {
|
||||||
|
"NVIDIA".configuration = {
|
||||||
|
system.nixos.tags = ["NVIDIA"];
|
||||||
|
services.xserver.videoDrivers = ["nvidia"];
|
||||||
|
hardware.nvidia-container-toolkit.enable = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Bootloader.
|
||||||
|
boot.loader.systemd-boot.enable = true;
|
||||||
|
boot.loader.systemd-boot.memtest86.enable = true;
|
||||||
|
boot.initrd.services.lvm.enable = false;
|
||||||
|
# boot.kernelModules = [];
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_latest;
|
||||||
|
boot.extraModprobeConfig = ''
|
||||||
|
options kvm_intel nested=1
|
||||||
|
options kvm_intel emulate_invalid_guest_state=0
|
||||||
|
options kvm ignore_msrs=1
|
||||||
|
'';
|
||||||
|
boot.blacklistedKernelModules = ["nova_core"];
|
||||||
|
# CRITICAL FIX #4: Kernel parameters to prevent nouveau from loading early
|
||||||
|
|
||||||
|
networking.hostName = "m3-ares"; # Define your hostname.
|
||||||
|
# warp-terminal update fix
|
||||||
|
# networking.extraHosts = ''
|
||||||
|
# 127.0.0.1 releases.warp.dev
|
||||||
|
# 127.0.0.1 app.warp.dev
|
||||||
|
# '';
|
||||||
|
# Pick only one of the below networking options.
|
||||||
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
|
networking.networkmanager.enable =
|
||||||
|
true; # Easiest to use and most distros use this by default.
|
||||||
|
# Set your time zone.
|
||||||
|
time.timeZone = "Europe/Berlin";
|
||||||
|
|
||||||
|
# Configure network proxy if necessary
|
||||||
|
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||||
|
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||||
|
|
||||||
|
# Select internationalisation properties.
|
||||||
|
i18n.defaultLocale = "en_US.UTF-8";
|
||||||
|
# console = {
|
||||||
|
# font = "Lat2-Terminus16";
|
||||||
|
# keyMap = "us";
|
||||||
|
# useXkbConfig = true; # use xkb.options in tty.
|
||||||
|
# };
|
||||||
|
|
||||||
|
# Enable the X11 windowing system.
|
||||||
|
# services.xserver.enable = true;
|
||||||
|
|
||||||
|
# Enable the GNOME Desktop Environment.
|
||||||
|
# services.xserver.displayManager.gdm.enable = true;
|
||||||
|
# services.xserver.desktopManager.gnome.enable = true;
|
||||||
|
# displayManager.gdm.enable = true;
|
||||||
|
# Configure keymap in X11
|
||||||
|
# services.xserver.xkb.layout = "us";
|
||||||
|
# services.xserver.xkb.options = "eurosign:e,caps:escape";
|
||||||
|
|
||||||
|
# Enable CUPS to print documents.
|
||||||
|
# services.printing.enable = true;
|
||||||
|
|
||||||
|
# Enable sound.
|
||||||
|
# hardware.pulseaudio.enable = true;
|
||||||
|
# OR
|
||||||
|
|
||||||
|
# Enable touchpad support (enabled default in most desktopManager).
|
||||||
|
# services.libinput.enable = true;
|
||||||
|
|
||||||
|
# Define a user account. Don't forget to set a password with ‘passwd’.
|
||||||
|
|
||||||
|
# List packages installed in system profile. To search, run:
|
||||||
|
# $ nix search wget
|
||||||
|
environment.systemPackages = with pkgs; [neovim git];
|
||||||
|
|
||||||
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
|
# started in user sessions.
|
||||||
|
# programs.mtr.enable = true;
|
||||||
|
# programs.gnupg.agent = {
|
||||||
|
# enable = true;
|
||||||
|
# enableSSHSupport = true;
|
||||||
|
# };
|
||||||
|
|
||||||
|
# List services that you want to enable:
|
||||||
|
|
||||||
|
# Enable the OpenSSH daemon.
|
||||||
|
services.openssh = {
|
||||||
|
enable = true;
|
||||||
|
settings.PermitRootLogin = "no";
|
||||||
|
settings = {
|
||||||
|
PasswordAuthentication = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
services.fstrim.enable = true;
|
||||||
|
|
||||||
|
# Open ports in the firewall.
|
||||||
|
# networking.firewall.allowedTCPPorts = [ ... ];
|
||||||
|
# networking.firewall.allowedUDPPorts = [ ... ];
|
||||||
|
# Or disable the firewall altogether.
|
||||||
|
# networking.firewall.enable = false;
|
||||||
|
|
||||||
|
# Copy the NixOS configuration file and link it from the resulting system
|
||||||
|
# (/run/current-system/configuration.nix). This is useful in case you
|
||||||
|
# accidentally delete configuration.nix.
|
||||||
|
# system.copySystemConfiguration = true;
|
||||||
|
|
||||||
|
# This option defines the first version of NixOS you have installed on this particular machine,
|
||||||
|
# and is used to maintain compatibility with application data (e.g. databases) created on older NixOS versions.
|
||||||
|
#
|
||||||
|
# Most users should NEVER change this value after the initial install, for any reason,
|
||||||
|
# even if you've upgraded your system to a new NixOS release.
|
||||||
|
#
|
||||||
|
# This value does NOT affect the Nixpkgs version your packages and OS are pulled from,
|
||||||
|
# so changing it will NOT upgrade your system - see https://nixos.org/manual/nixos/stable/#sec-upgrading for how
|
||||||
|
# to actually do that.
|
||||||
|
#
|
||||||
|
# This value being lower than the current NixOS release does NOT mean your system is
|
||||||
|
# out of date, out of support, or vulnerable.
|
||||||
|
#
|
||||||
|
# Do NOT change this value unless you have manually inspected all the changes it would make to your configuration,
|
||||||
|
# and migrated your data accordingly.
|
||||||
|
#
|
||||||
|
# For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion .
|
||||||
|
system.stateVersion = "24.11"; # Did you read the comment?
|
||||||
|
}
|
||||||
@@ -0,0 +1,51 @@
|
|||||||
|
# A staring point is the basic NIXOS configuration generated by the ISO installer.
|
||||||
|
# On an existing NIXOS install you can use the following command in your flakes basedir:
|
||||||
|
# sudo nixos-generate-config --dir ./hosts/m3tam3re
|
||||||
|
#
|
||||||
|
# Please make sure to change the first couple of lines in your configuration.nix:
|
||||||
|
# { config, inputs, ouputs, lib, pkgs, ... }:
|
||||||
|
#
|
||||||
|
# {
|
||||||
|
# imports = [ # Include the results of the hardware scan.
|
||||||
|
# ./hardware-configuration.nix
|
||||||
|
# inputs.home-manager.nixosModules.home-manager
|
||||||
|
# ];
|
||||||
|
# ...
|
||||||
|
#
|
||||||
|
# Moreover please update the packages option in your user configuration and add the home-manager options:
|
||||||
|
# users.users = {
|
||||||
|
# m3tam3re = {
|
||||||
|
# isNormalUser = true;
|
||||||
|
# initialPassword = "12345";
|
||||||
|
# extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.
|
||||||
|
# packages = [ inputs.home-manager.packages.${pkgs.system}.default ];
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
#
|
||||||
|
# home-manager = {
|
||||||
|
# useUserPackages = true;
|
||||||
|
# extraSpecialArgs = { inherit inputs outputs; };
|
||||||
|
# users.m3tam3re =
|
||||||
|
# import ../../home/m3tam3re/${config.networking.hostName}.nix;
|
||||||
|
# };
|
||||||
|
#
|
||||||
|
# Please also change your hostname accordingly:
|
||||||
|
#:w
|
||||||
|
# networking.hostName = "nixos"; # Define your hostname.
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
../common
|
||||||
|
./configuration.nix
|
||||||
|
./hardware.nix
|
||||||
|
./programs.nix
|
||||||
|
./secrets.nix
|
||||||
|
./services
|
||||||
|
];
|
||||||
|
|
||||||
|
extraServices = {
|
||||||
|
flatpak.enable = true;
|
||||||
|
ollama.enable = false;
|
||||||
|
podman.enable = true;
|
||||||
|
virtualisation.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,73 @@
|
|||||||
|
# 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")];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = ["xhci_pci" "thunderbolt" "ahci" "nvme" "usb_storage" "sd_mod"];
|
||||||
|
boot.initrd.kernelModules = [];
|
||||||
|
boot.kernelModules = ["kvm-intel"];
|
||||||
|
boot.extraModulePackages = [];
|
||||||
|
boot.supportedFilesystems = ["nfs"];
|
||||||
|
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-uuid/3a50bf0a-024b-488b-aa11-56b32f2fb54d";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = ["subvol=root" "compress=zstd"];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/home" = {
|
||||||
|
device = "/dev/disk/by-uuid/3a50bf0a-024b-488b-aa11-56b32f2fb54d";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = ["subvol=home" "compress=zstd"];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/nix" = {
|
||||||
|
device = "/dev/disk/by-uuid/3a50bf0a-024b-488b-aa11-56b32f2fb54d";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = ["subvol=home" "compress=zstd" "noatime"];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot" = {
|
||||||
|
device = "/dev/disk/by-uuid/4811-EA6E";
|
||||||
|
fsType = "vfat";
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/opt" = {
|
||||||
|
device = "/dev/disk/by-uuid/3574df3a-2a90-4b54-9c21-128f1d01ff8f";
|
||||||
|
fsType = "btrfs";
|
||||||
|
options = ["noatime" "compress=zstd"];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/mnt/skynet-bkg" = {
|
||||||
|
device = "192.168.1.100:/volume3/bkg";
|
||||||
|
fsType = "nfs";
|
||||||
|
options = ["noauto" "x-systemd.automount"];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/mnt/skynet" = {
|
||||||
|
device = "192.168.1.100:/volume3/m3-skynet";
|
||||||
|
fsType = "nfs";
|
||||||
|
options = ["noauto" "x-systemd.automount"];
|
||||||
|
};
|
||||||
|
|
||||||
|
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.enp46s0.useDHCP = lib.mkDefault true;
|
||||||
|
# networking.interfaces.wlo1.useDHCP = lib.mkDefault true;
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
|
||||||
|
powerManagement.cpuFreqGovernor = lib.mkDefault "powersave";
|
||||||
|
hardware.cpu.intel.updateMicrocode =
|
||||||
|
lib.mkDefault config.hardware.enableRedistributableFirmware;
|
||||||
|
}
|
||||||
@@ -0,0 +1,58 @@
|
|||||||
|
{
|
||||||
|
config,
|
||||||
|
pkgs,
|
||||||
|
inputs,
|
||||||
|
...
|
||||||
|
}: {
|
||||||
|
# Workaround for tuxedo-drivers module bug in unstable (nixpkgs#480391)
|
||||||
|
# The unstable module has a type error - use stable module until fix propagates
|
||||||
|
# disabledModules = [ "hardware/tuxedo-drivers.nix" ];
|
||||||
|
# imports =
|
||||||
|
# [ "${inputs.nixpkgs-stable}/nixos/modules/hardware/tuxedo-drivers.nix" ];
|
||||||
|
|
||||||
|
hardware.nvidia = {
|
||||||
|
prime = {
|
||||||
|
offload.enable = false;
|
||||||
|
|
||||||
|
# Bus ID of the Intel GPU. You can find it using lspci, either under 3D or VGA
|
||||||
|
intelBusId = "PCI:0:2:0";
|
||||||
|
|
||||||
|
# Bus ID of the NVIDIA GPU. You can find it using lspci, either under 3D or VGA
|
||||||
|
nvidiaBusId = "PCI:1:0:0";
|
||||||
|
};
|
||||||
|
modesetting.enable = true;
|
||||||
|
powerManagement.finegrained = false;
|
||||||
|
powerManagement.enable = true;
|
||||||
|
open = false;
|
||||||
|
dynamicBoost.enable = true;
|
||||||
|
nvidiaSettings = true;
|
||||||
|
package = config.boot.kernelPackages.nvidiaPackages.production;
|
||||||
|
};
|
||||||
|
hardware.tuxedo-drivers.enable = true;
|
||||||
|
hardware.bluetooth.enable = true;
|
||||||
|
hardware.keyboard.zsa.enable = true;
|
||||||
|
hardware.graphics.enable = true;
|
||||||
|
|
||||||
|
services.hardware.bolt.enable = true;
|
||||||
|
services.auto-cpufreq.enable = true;
|
||||||
|
services.tlp = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
START_CHARGE_THRESH_BAT0 = 75;
|
||||||
|
STOP_CHARGE_THRESH_BAT0 = 80;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
environment.systemPackages = with pkgs; [tuxedo-backlight];
|
||||||
|
security.sudo.extraRules = [
|
||||||
|
{
|
||||||
|
users = ["@wheel"];
|
||||||
|
commands = [
|
||||||
|
{
|
||||||
|
command = "/run/current-system/sw/bin/set-backlight";
|
||||||
|
options = ["NOPASSWD"];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -0,0 +1,71 @@
|
|||||||
|
# hosts/m3-ares/home.nix — Host-specific home-manager overrides.
|
||||||
|
# TUXEDO laptop: eDP-1 + HDMI-A-1 external monitor.
|
||||||
|
# Everything else (shell, editors, gaming, media, theme, etc.) comes from
|
||||||
|
# m3ta-home via the profile mapping in hosts/common/users/m3tam3re.nix.
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib; {
|
||||||
|
config = mkMerge [
|
||||||
|
# ── XDG / MIME defaults ──
|
||||||
|
{
|
||||||
|
xdg = {
|
||||||
|
enable = true;
|
||||||
|
configFile."mimeapps.list".force = true;
|
||||||
|
mimeApps = {
|
||||||
|
enable = true;
|
||||||
|
associations.added = {
|
||||||
|
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||||
|
"application/csv" = ["calc.desktop"];
|
||||||
|
"application/pdf" = ["vivaldi-stable.desktop"];
|
||||||
|
"x-scheme-handler/http" = ["vivaldi-stable.desktop"];
|
||||||
|
"x-scheme-handler/https" = ["vivaldi-stable.desktop"];
|
||||||
|
};
|
||||||
|
defaultApplications = {
|
||||||
|
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||||
|
"application/csv" = ["calc.desktop"];
|
||||||
|
"application/pdf" = ["vivaldi-stable.desktop"];
|
||||||
|
"application/md" = ["dev.zed.Zed.desktop"];
|
||||||
|
"application/text" = ["dev.zed.Zed.desktop"];
|
||||||
|
"x-scheme-handler/http" = ["vivaldi-stable.desktop"];
|
||||||
|
"x-scheme-handler/https" = ["vivaldi-stable.desktop"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
|
# ── Hyprland monitor layout ──
|
||||||
|
(mkIf config.desktop.wm.hyprland.enable {
|
||||||
|
wayland.windowManager.hyprland = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
exec-once = ["tuxedo-backlight"];
|
||||||
|
monitor = [
|
||||||
|
"eDP-1,preferred,0x0,1.25"
|
||||||
|
"HDMI-A-1,1920x1080@120,2560x0,1"
|
||||||
|
];
|
||||||
|
workspace = [
|
||||||
|
"1, monitor:eDP-1, default:true"
|
||||||
|
"2, monitor:eDP-1"
|
||||||
|
"3, monitor:eDP-1"
|
||||||
|
"4, monitor:HDMI-A-1"
|
||||||
|
"5, monitor:HDMI-A-1,border:false,rounding:false"
|
||||||
|
"6, monitor:HDMI-A-1"
|
||||||
|
];
|
||||||
|
windowrule = [
|
||||||
|
"match:class dev.zed.Zed, workspace 1"
|
||||||
|
"match:class Msty, workspace 1"
|
||||||
|
"match:class ^(com.obsproject.Studio)$, workspace 2"
|
||||||
|
"match:class ^(brave-browser)$, workspace 4, opacity 1.0"
|
||||||
|
"match:class ^(vivaldi-stable)$, workspace 4, opacity 1.0"
|
||||||
|
"match:class ^steam_app_\\d+$, fullscreen on"
|
||||||
|
"match:class ^steam_app_\\d+$, workspace 5"
|
||||||
|
"match:class ^steam_app_\\d+$, idle_inhibit focus"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
})
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -0,0 +1,45 @@
|
|||||||
|
{pkgs, ...}: {
|
||||||
|
programs.nix-ld.enable = true;
|
||||||
|
programs.nix-ld.libraries = with pkgs; [
|
||||||
|
# Add any missing dynamic libraries for unpackaged programs
|
||||||
|
# here, NOT in environment.systemPackages
|
||||||
|
];
|
||||||
|
programs.hyprland = {
|
||||||
|
enable = true;
|
||||||
|
xwayland.enable = true;
|
||||||
|
withUWSM = true;
|
||||||
|
};
|
||||||
|
programs.steam = {
|
||||||
|
enable = true;
|
||||||
|
remotePlay.openFirewall = true;
|
||||||
|
dedicatedServer.openFirewall = true;
|
||||||
|
gamescopeSession = {
|
||||||
|
enable = true;
|
||||||
|
args = [
|
||||||
|
"-W 1920"
|
||||||
|
"-H 1080"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
programs.gamescope = {
|
||||||
|
enable = true;
|
||||||
|
capSysNice = true;
|
||||||
|
};
|
||||||
|
programs.fish.enable = true;
|
||||||
|
programs.thunar = {
|
||||||
|
enable = true;
|
||||||
|
plugins = with pkgs; [thunar-archive-plugin thunar-volman];
|
||||||
|
};
|
||||||
|
programs.gnupg.agent = {
|
||||||
|
enable = true;
|
||||||
|
enableSSHSupport = true;
|
||||||
|
pinentryPackage = pkgs.pinentry-gnome3;
|
||||||
|
settings = {default-cache-ttl = 10800;};
|
||||||
|
};
|
||||||
|
programs.nh = {
|
||||||
|
enable = true;
|
||||||
|
clean.enable = true;
|
||||||
|
clean.extraArgs = "--keep-since 4d --keep 3";
|
||||||
|
flake = "/home/m3tam3re/p/nixos/nixos-config";
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,59 @@
|
|||||||
|
{
|
||||||
|
age = {
|
||||||
|
secrets = {
|
||||||
|
anytype-key = {
|
||||||
|
file = ../../secrets/anytype-key-ares.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
wg-DE = {
|
||||||
|
file = ../../secrets/wg-DE.age;
|
||||||
|
path = "/etc/wireguard/DE.conf";
|
||||||
|
};
|
||||||
|
wg-NL = {
|
||||||
|
file = ../../secrets/wg-NL.age;
|
||||||
|
path = "/etc/wireguard/NL.conf";
|
||||||
|
};
|
||||||
|
wg-NO = {
|
||||||
|
file = ../../secrets/wg-NO.age;
|
||||||
|
path = "/etc/wireguard/NO.conf";
|
||||||
|
};
|
||||||
|
wg-US = {
|
||||||
|
file = ../../secrets/wg-US.age;
|
||||||
|
path = "/etc/wireguard/US.conf";
|
||||||
|
};
|
||||||
|
wg-BR = {
|
||||||
|
file = ../../secrets/wg-BR.age;
|
||||||
|
path = "/etc/wireguard/BR.conf";
|
||||||
|
};
|
||||||
|
ref-key = {
|
||||||
|
file = ../../secrets/ref-key.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
exa-key = {
|
||||||
|
file = ../../secrets/exa-key.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
outline-key = {
|
||||||
|
file = ../../secrets/outline-key.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
basecamp-client-id = {
|
||||||
|
file = ../../secrets/basecamp-client-id.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
basecamp-client-secret = {
|
||||||
|
file = ../../secrets/basecamp-client-secret.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
tailscale-key.file = ../../secrets/tailscale-key.age;
|
||||||
|
m3tam3re-secrets = {
|
||||||
|
file = ../../secrets/m3tam3re-secrets.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
hermes-env = {
|
||||||
|
file = ../../secrets/hermes-env.age;
|
||||||
|
owner = "m3tam3re";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,4 @@
|
|||||||
|
{
|
||||||
|
imports = [
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -0,0 +1,53 @@
|
|||||||
|
{pkgs, ...}: {
|
||||||
|
imports = [
|
||||||
|
./containers
|
||||||
|
./hermes-agent.nix
|
||||||
|
./netbird.nix
|
||||||
|
#./n8n.nix
|
||||||
|
./mem0.nix
|
||||||
|
./postgres.nix
|
||||||
|
./restic.nix
|
||||||
|
./sound.nix
|
||||||
|
./udev.nix
|
||||||
|
./wireguard.nix
|
||||||
|
];
|
||||||
|
# console.useXkbConfig = true;
|
||||||
|
|
||||||
|
# services.xserver.xkb = {
|
||||||
|
# layout = "de,us";
|
||||||
|
# options = "ctrl:nocaps";
|
||||||
|
# };
|
||||||
|
|
||||||
|
# optional, falls du auch die TTY-Konsole deutsch willst:
|
||||||
|
services = {
|
||||||
|
hypridle.enable = true;
|
||||||
|
espanso = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.espanso-wayland;
|
||||||
|
};
|
||||||
|
printing.enable = true;
|
||||||
|
gvfs.enable = true;
|
||||||
|
trezord.enable = true;
|
||||||
|
gnome.gnome-keyring.enable = true;
|
||||||
|
qdrant.enable = true;
|
||||||
|
# qdrant = {
|
||||||
|
# enable = true;
|
||||||
|
# settings = {
|
||||||
|
# service = {
|
||||||
|
# host = "0.0.0.0";
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
# };
|
||||||
|
upower.enable = true;
|
||||||
|
avahi = {
|
||||||
|
enable = true;
|
||||||
|
nssmdns4 = true;
|
||||||
|
publish = {
|
||||||
|
addresses = true;
|
||||||
|
workstation = true;
|
||||||
|
userServices = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
displayManager.gdm.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
{config, ...}: let
|
||||||
|
# Default ElevenLabs voice: Bella (German-capable female)
|
||||||
|
elevenlabsVoiceId = "hpp4J3VqNfWAUOO0d1Us";
|
||||||
|
in {
|
||||||
|
services.hermes-agent = {
|
||||||
|
enable = true;
|
||||||
|
addToSystemPackages = true;
|
||||||
|
|
||||||
|
# Secrets via agenix
|
||||||
|
environmentFiles = [config.age.secrets."hermes-env".path];
|
||||||
|
|
||||||
|
# Non-secret environment variables
|
||||||
|
environment = {
|
||||||
|
GLM_BASE_URL = "https://api.z.ai/api/coding/paas/v4/";
|
||||||
|
};
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
# ── Model ──────────────────────────────────────────────────────────
|
||||||
|
model = {
|
||||||
|
default = "glm-5.1";
|
||||||
|
provider = "zai";
|
||||||
|
};
|
||||||
|
|
||||||
|
credential_pool_strategies = {
|
||||||
|
zai = "fill_first";
|
||||||
|
};
|
||||||
|
|
||||||
|
toolsets = ["all"];
|
||||||
|
|
||||||
|
# ── Agent ──────────────────────────────────────────────────────────
|
||||||
|
agent = {
|
||||||
|
max_turns = 90;
|
||||||
|
gateway_timeout = 1800;
|
||||||
|
tool_use_enforcement = "auto";
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Terminal ───────────────────────────────────────────────────────
|
||||||
|
terminal = {
|
||||||
|
backend = "ssh";
|
||||||
|
modal_mode = "auto";
|
||||||
|
cwd = ".";
|
||||||
|
timeout = 180;
|
||||||
|
persistent_shell = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Browser ────────────────────────────────────────────────────────
|
||||||
|
browser = {
|
||||||
|
inactivity_timeout = 120;
|
||||||
|
command_timeout = 30;
|
||||||
|
cloud_provider = "local";
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Checkpoints / Compression ──────────────────────────────────────
|
||||||
|
checkpoints = {
|
||||||
|
enabled = true;
|
||||||
|
max_snapshots = 50;
|
||||||
|
};
|
||||||
|
|
||||||
|
file_read_max_chars = 100000;
|
||||||
|
|
||||||
|
compression = {
|
||||||
|
enabled = true;
|
||||||
|
threshold = 0.5;
|
||||||
|
target_ratio = 0.2;
|
||||||
|
protect_last_n = 20;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Display ────────────────────────────────────────────────────────
|
||||||
|
display = {
|
||||||
|
compact = false;
|
||||||
|
personality = "kawaii";
|
||||||
|
resume_display = "full";
|
||||||
|
busy_input_mode = "interrupt";
|
||||||
|
inline_diffs = true;
|
||||||
|
skin = "default";
|
||||||
|
tool_progress = "all";
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── TTS / STT / Voice ──────────────────────────────────────────────
|
||||||
|
tts = {
|
||||||
|
provider = "elevenlabs";
|
||||||
|
elevenlabs = {
|
||||||
|
voice_id = elevenlabsVoiceId;
|
||||||
|
model_id = "eleven_multilingual_v2";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
stt = {
|
||||||
|
enabled = true;
|
||||||
|
provider = "local";
|
||||||
|
local = {model = "base";};
|
||||||
|
};
|
||||||
|
|
||||||
|
voice = {
|
||||||
|
record_key = "ctrl+b";
|
||||||
|
max_recording_seconds = 120;
|
||||||
|
silence_threshold = 200;
|
||||||
|
silence_duration = 3.0;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Memory ─────────────────────────────────────────────────────────
|
||||||
|
memory = {
|
||||||
|
memory_enabled = true;
|
||||||
|
user_profile_enabled = true;
|
||||||
|
memory_char_limit = 2200;
|
||||||
|
user_char_limit = 1375;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Delegation ─────────────────────────────────────────────────────
|
||||||
|
delegation = {
|
||||||
|
max_iterations = 50;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Discord ────────────────────────────────────────────────────────
|
||||||
|
discord = {
|
||||||
|
require_mention = true;
|
||||||
|
auto_thread = true;
|
||||||
|
reactions = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Approvals / Security ───────────────────────────────────────────
|
||||||
|
approvals = {
|
||||||
|
mode = "manual";
|
||||||
|
timeout = 60;
|
||||||
|
};
|
||||||
|
|
||||||
|
security = {
|
||||||
|
redact_secrets = true;
|
||||||
|
tirith_enabled = true;
|
||||||
|
tirith_fail_open = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Cron / Session ─────────────────────────────────────────────────
|
||||||
|
cron = {wrap_response = true;};
|
||||||
|
|
||||||
|
session_reset = {
|
||||||
|
mode = "both";
|
||||||
|
idle_minutes = 1440;
|
||||||
|
at_hour = 4;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Web ────────────────────────────────────────────────────────────
|
||||||
|
web = {backend = "exa";};
|
||||||
|
|
||||||
|
# ── Platform Toolsets ──────────────────────────────────────────────
|
||||||
|
platform_toolsets = {
|
||||||
|
cli = [
|
||||||
|
"browser"
|
||||||
|
"clarify"
|
||||||
|
"code_execution"
|
||||||
|
"cronjob"
|
||||||
|
"delegation"
|
||||||
|
"file"
|
||||||
|
"image_gen"
|
||||||
|
"memory"
|
||||||
|
"session_search"
|
||||||
|
"skills"
|
||||||
|
"terminal"
|
||||||
|
"todo"
|
||||||
|
"tts"
|
||||||
|
"vision"
|
||||||
|
"web"
|
||||||
|
];
|
||||||
|
telegram = [
|
||||||
|
"browser"
|
||||||
|
"clarify"
|
||||||
|
"code_execution"
|
||||||
|
"cronjob"
|
||||||
|
"delegation"
|
||||||
|
"file"
|
||||||
|
"image_gen"
|
||||||
|
"memory"
|
||||||
|
"session_search"
|
||||||
|
"skills"
|
||||||
|
"terminal"
|
||||||
|
"todo"
|
||||||
|
"tts"
|
||||||
|
"vision"
|
||||||
|
"web"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
{
|
||||||
|
m3ta.mem0 = {
|
||||||
|
enable = true;
|
||||||
|
port = 8000;
|
||||||
|
host = "127.0.0.1";
|
||||||
|
|
||||||
|
# LLM Configuration
|
||||||
|
llm = {
|
||||||
|
provider = "openai";
|
||||||
|
apiKeyFile = "/var/lib/mem0/openai-api-key-1"; # Use agenix or sops-nix
|
||||||
|
};
|
||||||
|
|
||||||
|
# Vector Storage Configuration
|
||||||
|
vectorStore = {
|
||||||
|
provider = "qdrant"; # or "chroma", "pinecone", etc.
|
||||||
|
config = {
|
||||||
|
host = "localhost";
|
||||||
|
port = 6333;
|
||||||
|
collection_name = "mem0_alice";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
services.n8n = {
|
||||||
|
enable = true;
|
||||||
|
openFirewall = true;
|
||||||
|
};
|
||||||
|
systemd.services.n8n = {
|
||||||
|
environment = {
|
||||||
|
N8N_SECURE_COOKIE = "false";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
services.netbird.enable = true;
|
services.netbird.enable = true;
|
||||||
|
environment.systemPackages = with pkgs; [netbird-ui];
|
||||||
|
|
||||||
systemd.services.netbird = {
|
systemd.services.netbird = {
|
||||||
environment = {
|
environment = {
|
||||||
NB_DISABLE_SSH_CONFIG = "true";
|
NB_DISABLE_SSH_CONFIG = "true";
|
||||||
NB_USE_LEGACY_ROUTING = "true";
|
|
||||||
};
|
};
|
||||||
path = [
|
path = [
|
||||||
pkgs.shadow
|
pkgs.shadow
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
{pkgs, ...}: {
|
||||||
|
services.postgresql = {
|
||||||
|
enable = true;
|
||||||
|
package = pkgs.postgresql_17;
|
||||||
|
extensions = with pkgs.postgresql17Packages; [
|
||||||
|
pgvector
|
||||||
|
];
|
||||||
|
authentication = ''
|
||||||
|
local all all trust
|
||||||
|
host all all 127.0.0.1/32 trust
|
||||||
|
host all all ::1/128 trust
|
||||||
|
|
||||||
|
host all all 10.88.0.0/16 trust
|
||||||
|
host all all 19.89.0.0/16 trust
|
||||||
|
'';
|
||||||
|
initialScript = pkgs.writeText "initialScript.sql" ''
|
||||||
|
CREATE USER n8n WITH PASSWORD 'n8n';
|
||||||
|
CREATE DATABASE n8n;
|
||||||
|
GRANT ALL PRIVILEGES ON DATABASE n8n TO n8n;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
{
|
||||||
|
services.restic.backups = {
|
||||||
|
skynet = {
|
||||||
|
repository = "/mnt/skynet-bkg/m3-nix";
|
||||||
|
passwordFile = "/etc/nixos/restic-pass";
|
||||||
|
initialize = true;
|
||||||
|
paths = ["/home/m3tam3re"];
|
||||||
|
exclude = [
|
||||||
|
"/home/m3tam3re/.cache"
|
||||||
|
"/home/m3tam3re/Bilder/"
|
||||||
|
"/home/m3tam3re/Videos/"
|
||||||
|
"/home/m3tam3re/Downloads"
|
||||||
|
"/home/m3tam3re/Library"
|
||||||
|
"/home/m3tam3re/Projekte"
|
||||||
|
"/home/m3tam3re/Sync"
|
||||||
|
"/home/m3tam3re/.local/share/Trash"
|
||||||
|
];
|
||||||
|
timerConfig = {
|
||||||
|
OnCalendar = "09:30";
|
||||||
|
RandomizedDelaySec = "2h";
|
||||||
|
Persistent = true;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,11 @@
|
|||||||
|
{
|
||||||
|
security.rtkit.enable = true;
|
||||||
|
services.pipewire = {
|
||||||
|
enable = true;
|
||||||
|
alsa.enable = true;
|
||||||
|
alsa.support32Bit = true;
|
||||||
|
pulse.enable = true;
|
||||||
|
jack.enable = false;
|
||||||
|
wireplumber.enable = true;
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -0,0 +1,10 @@
|
|||||||
|
{pkgs, ...}: {
|
||||||
|
services.udev.extraRules = ''
|
||||||
|
SUBSYSTEM=="usb", MODE="0666"
|
||||||
|
SUBSYSTEM=="leds", KERNEL=="rgb:kbd_backlight*", ACTION=="add", RUN+="${pkgs.coreutils}/bin/chmod a+w /sys/class/leds/%k/multi_intensity"
|
||||||
|
KERNEL=="uinput", MODE="0660", GROUP="input", OPTIONS+="static_node=uinput"
|
||||||
|
KERNEL=="event*", SUBSYSTEM=="input", MODE="0660", GROUP="input" '';
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
zsa-udev-rules
|
||||||
|
];
|
||||||
|
}
|
||||||
@@ -0,0 +1,25 @@
|
|||||||
|
{config, ...}: {
|
||||||
|
networking.wg-quick.interfaces = {
|
||||||
|
DE = {
|
||||||
|
configFile = config.age.secrets.wg-DE.path;
|
||||||
|
autostart = false;
|
||||||
|
};
|
||||||
|
NL = {
|
||||||
|
configFile = config.age.secrets.wg-NL.path;
|
||||||
|
autostart = false;
|
||||||
|
};
|
||||||
|
NO = {
|
||||||
|
configFile = config.age.secrets.wg-NO.path;
|
||||||
|
autostart = false;
|
||||||
|
};
|
||||||
|
US = {
|
||||||
|
configFile = config.age.secrets.wg-US.path;
|
||||||
|
autostart = false;
|
||||||
|
};
|
||||||
|
BR = {
|
||||||
|
configFile = config.age.secrets.wg-BR.path;
|
||||||
|
autostart = false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
services.resolved.enable = true;
|
||||||
|
}
|
||||||
@@ -42,7 +42,6 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
extraServices = {
|
extraServices = {
|
||||||
colmenaDeploy.enable = true;
|
|
||||||
flatpak.enable = false;
|
flatpak.enable = false;
|
||||||
ollama.enable = false;
|
ollama.enable = false;
|
||||||
podman.enable = true;
|
podman.enable = true;
|
||||||
|
|||||||
@@ -4,7 +4,7 @@
|
|||||||
# Add any missing dynamic libraries for unpackaged programs
|
# Add any missing dynamic libraries for unpackaged programs
|
||||||
# here, NOT in environment.systemPackages
|
# here, NOT in environment.systemPackages
|
||||||
];
|
];
|
||||||
programs.mosh.enable = true;
|
programs.fish.enable = true;
|
||||||
programs.nh = {
|
programs.nh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
clean.enable = true;
|
clean.enable = true;
|
||||||
|
|||||||
@@ -3,14 +3,6 @@
|
|||||||
secrets = {
|
secrets = {
|
||||||
baserow-env = {file = ../../secrets/baserow-env.age;};
|
baserow-env = {file = ../../secrets/baserow-env.age;};
|
||||||
ghost-env = {file = ../../secrets/ghost-env.age;};
|
ghost-env = {file = ../../secrets/ghost-env.age;};
|
||||||
honcho-selfhost-db-password = {
|
|
||||||
file = ../../secrets/honcho-selfhost-db-password.age;
|
|
||||||
owner = "postgres";
|
|
||||||
group = "postgres";
|
|
||||||
mode = "400";
|
|
||||||
};
|
|
||||||
honcho-selfhost-env = {file = ../../secrets/honcho-selfhost-env.age;};
|
|
||||||
honcho-selfhost-jwt-secret = {file = ../../secrets/honcho-selfhost-jwt-secret.age;};
|
|
||||||
kestra-config = {
|
kestra-config = {
|
||||||
file = ../../secrets/kestra-config.age;
|
file = ../../secrets/kestra-config.age;
|
||||||
mode = "644";
|
mode = "644";
|
||||||
@@ -18,7 +10,8 @@
|
|||||||
kestra-env = {file = ../../secrets/kestra-env.age;};
|
kestra-env = {file = ../../secrets/kestra-env.age;};
|
||||||
littlelink-m3tam3re = {file = ../../secrets/littlelink-m3tam3re.age;};
|
littlelink-m3tam3re = {file = ../../secrets/littlelink-m3tam3re.age;};
|
||||||
minio-root-cred = {file = ../../secrets/minio-root-cred.age;};
|
minio-root-cred = {file = ../../secrets/minio-root-cred.age;};
|
||||||
rustfs-env = {file = ../../secrets/rustfs-env.age;};
|
rustfs-access-key = {file = ../../secrets/rustfs-access-key.age;};
|
||||||
|
rustfs-secret-key = {file = ../../secrets/rustfs-secret-key.age;};
|
||||||
n8n-env = {file = ../../secrets/n8n-env.age;};
|
n8n-env = {file = ../../secrets/n8n-env.age;};
|
||||||
netbird-auth-secret = {
|
netbird-auth-secret = {
|
||||||
file = ../../secrets/netbird-auth-secret.age;
|
file = ../../secrets/netbird-auth-secret.age;
|
||||||
|
|||||||
@@ -1,19 +0,0 @@
|
|||||||
{
|
|
||||||
# Traefik configuration for ai-memory (m3-hermes over Netbird)
|
|
||||||
services.traefik.dynamicConfigOptions.http = {
|
|
||||||
services.ai-memory.loadBalancer.servers = [
|
|
||||||
{
|
|
||||||
url = "http://100.81.231.152:49374";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
routers.ai-memory = {
|
|
||||||
rule = "Host(`memory.m3ta.dev`)";
|
|
||||||
tls = {
|
|
||||||
certResolver = "godaddy";
|
|
||||||
};
|
|
||||||
service = "ai-memory";
|
|
||||||
entrypoints = "websecure";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,12 +1,13 @@
|
|||||||
{lib, ...}: {
|
{lib, ...}: {
|
||||||
imports = [
|
imports = [
|
||||||
# ./baserow.nix
|
./baserow.nix
|
||||||
./ghost.nix
|
./ghost.nix
|
||||||
# ./honcho.nix
|
./kestra.nix
|
||||||
./littlelink.nix
|
./littlelink.nix
|
||||||
# ./matomo.nix
|
./matomo.nix
|
||||||
./netbird.nix
|
./netbird.nix
|
||||||
# ./n8n.nix
|
# ./n8n.nix
|
||||||
|
# ./pangolin.nix
|
||||||
./restreamer.nix
|
./restreamer.nix
|
||||||
./slash.nix
|
./slash.nix
|
||||||
./slash-nemoti.nix
|
./slash-nemoti.nix
|
||||||
@@ -14,7 +15,7 @@
|
|||||||
];
|
];
|
||||||
system.activationScripts.createPodmanNetworkWeb = lib.mkAfter ''
|
system.activationScripts.createPodmanNetworkWeb = lib.mkAfter ''
|
||||||
if ! /run/current-system/sw/bin/podman network exists web; then
|
if ! /run/current-system/sw/bin/podman network exists web; then
|
||||||
/run/current-system/sw/bin/podman network create web --subnet=10.89.0.0/24 --gateway=10.89.0.1
|
/run/current-system/sw/bin/podman network create web --subnet=10.89.0.0/24 --internal
|
||||||
fi
|
fi
|
||||||
'';
|
'';
|
||||||
}
|
}
|
||||||
@@ -1,10 +1,10 @@
|
|||||||
{config, ...}: {
|
{config, ...}: {
|
||||||
virtualisation.oci-containers.containers."ghost" = {
|
virtualisation.oci-containers.containers."ghost" = {
|
||||||
image = "docker.io/ghost:6-alpine";
|
image = "docker.io/ghost:latest";
|
||||||
environmentFiles = [config.age.secrets.ghost-env.path];
|
environmentFiles = [config.age.secrets.ghost-env.path];
|
||||||
ports = ["127.0.0.1:3002:2368"];
|
ports = ["127.0.0.1:3002:2368"];
|
||||||
volumes = ["ghost_data:/var/lib/ghost/content"];
|
volumes = ["ghost_data:/var/lib/ghost/content"];
|
||||||
extraOptions = ["--add-host=mysql:10.89.0.1" "--ip=10.89.0.11" "--network=web" "--dns=8.8.8.8"];
|
extraOptions = ["--add-host=mysql:10.89.0.1" "--ip=10.89.0.11" "--network=web"];
|
||||||
};
|
};
|
||||||
# Traefik configuration specific to ghost
|
# Traefik configuration specific to ghost
|
||||||
services.traefik.dynamicConfigOptions.http = {
|
services.traefik.dynamicConfigOptions.http = {
|
||||||
|
|||||||
@@ -0,0 +1,32 @@
|
|||||||
|
{config, ...}: {
|
||||||
|
virtualisation.oci-containers.containers."kestra" = {
|
||||||
|
image = "docker.io/kestra/kestra:latest";
|
||||||
|
environmentFiles = [config.age.secrets.kestra-env.path];
|
||||||
|
cmd = ["server" "standalone" "--config" "/etc/config/application.yaml"];
|
||||||
|
ports = ["127.0.0.1:3018:8080"];
|
||||||
|
user = "root";
|
||||||
|
volumes = [
|
||||||
|
"/var/run/docker.sock:/var/run/docker.sock"
|
||||||
|
"${config.age.secrets.kestra-config.path}:/etc/config/application.yaml"
|
||||||
|
"kestra_data:/app/storage"
|
||||||
|
"/tmp/kestra-wd:/tmp/kestra-wd"
|
||||||
|
];
|
||||||
|
extraOptions = ["--add-host=postgres:10.89.0.1" "--ip=10.89.0.18" "--network=web"];
|
||||||
|
};
|
||||||
|
|
||||||
|
systemd.tmpfiles.rules = [
|
||||||
|
"d /tmp/kestra-wd 0750 1000 1000 - -"
|
||||||
|
];
|
||||||
|
|
||||||
|
# Traefik configuration specific to littlelink
|
||||||
|
services.traefik.dynamicConfigOptions.http = {
|
||||||
|
services.kestra.loadBalancer.servers = [{url = "http://localhost:3018/";}];
|
||||||
|
|
||||||
|
routers.kestra = {
|
||||||
|
rule = "Host(`k.m3ta.dev`)";
|
||||||
|
tls = {certResolver = "godaddy";};
|
||||||
|
service = "kestra";
|
||||||
|
entrypoints = "websecure";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
...
|
...
|
||||||
}: let
|
}: let
|
||||||
@@ -122,7 +121,7 @@ in {
|
|||||||
|
|
||||||
virtualisation.oci-containers.containers = {
|
virtualisation.oci-containers.containers = {
|
||||||
"${serviceName}-dashboard" = {
|
"${serviceName}-dashboard" = {
|
||||||
image = "docker.io/netbirdio/dashboard:latest";
|
image = "netbirdio/dashboard:latest";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
environmentFiles = [config.age.secrets."${serviceName}-dashboard-env".path];
|
environmentFiles = [config.age.secrets."${serviceName}-dashboard-env".path];
|
||||||
extraOptions = [
|
extraOptions = [
|
||||||
@@ -132,7 +131,7 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
"${serviceName}-server" = {
|
"${serviceName}-server" = {
|
||||||
image = "docker.io/netbirdio/netbird-server:latest";
|
image = "netbirdio/netbird-server:latest";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
ports = ["${toString stunPort}:${toString stunPort}/udp"];
|
ports = ["${toString stunPort}:${toString stunPort}/udp"];
|
||||||
environmentFiles = [config.age.secrets."${serviceName}-server-env".path];
|
environmentFiles = [config.age.secrets."${serviceName}-server-env".path];
|
||||||
@@ -148,15 +147,12 @@ in {
|
|||||||
};
|
};
|
||||||
|
|
||||||
"${serviceName}-proxy" = {
|
"${serviceName}-proxy" = {
|
||||||
image = "docker.io/netbirdio/reverse-proxy:latest";
|
image = "netbirdio/reverse-proxy:latest";
|
||||||
autoStart = true;
|
autoStart = true;
|
||||||
ports = ["${toString wireguardPort}:${toString wireguardPort}/udp"];
|
ports = ["${toString wireguardPort}:${toString wireguardPort}/udp"];
|
||||||
volumes = [
|
volumes = [
|
||||||
"${serviceName}_proxy_certs:/certs"
|
"${serviceName}_proxy_certs:/certs"
|
||||||
];
|
];
|
||||||
environment = {
|
|
||||||
NB_PROXY_PRIVATE = "true";
|
|
||||||
};
|
|
||||||
environmentFiles = [config.age.secrets."${serviceName}-proxy-env".path];
|
environmentFiles = [config.age.secrets."${serviceName}-proxy-env".path];
|
||||||
cmd = [
|
cmd = [
|
||||||
"--domain=${proxyDomain}"
|
"--domain=${proxyDomain}"
|
||||||
|
|||||||
@@ -7,12 +7,11 @@
|
|||||||
./rustfs.nix
|
./rustfs.nix
|
||||||
./mysql.nix
|
./mysql.nix
|
||||||
./netbird.nix
|
./netbird.nix
|
||||||
# ./n8n.nix
|
./n8n.nix
|
||||||
./paperless.nix
|
./paperless.nix
|
||||||
./postgres.nix
|
./postgres.nix
|
||||||
./searx.nix
|
./searx.nix
|
||||||
./traefik.nix
|
./traefik.nix
|
||||||
./ai-memory.nix
|
|
||||||
./vaultwarden.nix
|
./vaultwarden.nix
|
||||||
./wastebin.nix
|
./wastebin.nix
|
||||||
];
|
];
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
}: {
|
}: {
|
||||||
services.gitea-actions-runner = {
|
services.gitea-actions-runner = {
|
||||||
instances.default = {
|
instances.default = {
|
||||||
enable = false;
|
enable = true;
|
||||||
name = "${config.networking.hostName}-runner";
|
name = "${config.networking.hostName}-runner";
|
||||||
url = "https://code.m3ta.dev";
|
url = "https://code.m3ta.dev";
|
||||||
tokenFile = config.age.secrets.gitea-runner-token.path;
|
tokenFile = config.age.secrets.gitea-runner-token.path;
|
||||||
|
|||||||
@@ -0,0 +1,191 @@
|
|||||||
|
{config, ...}: let
|
||||||
|
# Default ElevenLabs voice: Bella (German-capable female)
|
||||||
|
elevenlabsVoiceId = "hpp4J3VqNfWAUOO0d1Us";
|
||||||
|
in {
|
||||||
|
services.hermes-agent = {
|
||||||
|
enable = true;
|
||||||
|
addToSystemPackages = true;
|
||||||
|
|
||||||
|
# Secrets via agenix
|
||||||
|
environmentFiles = [config.age.secrets."hermes-env".path];
|
||||||
|
|
||||||
|
# Non-secret environment variables
|
||||||
|
environment = {
|
||||||
|
#
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Container mode (podman) ──────────────────────────────────────────
|
||||||
|
container = {
|
||||||
|
enable = true;
|
||||||
|
backend = "podman";
|
||||||
|
};
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
# ── Model ──────────────────────────────────────────────────────────
|
||||||
|
model = {
|
||||||
|
default = "glm-5.1";
|
||||||
|
provider = "zai";
|
||||||
|
base_url = "https://api.z.ai/api/coding/paas/v4/";
|
||||||
|
};
|
||||||
|
|
||||||
|
credential_pool_strategies = {
|
||||||
|
zai = "fill_first";
|
||||||
|
};
|
||||||
|
|
||||||
|
toolsets = ["all"];
|
||||||
|
|
||||||
|
# ── Agent ──────────────────────────────────────────────────────────
|
||||||
|
agent = {
|
||||||
|
max_turns = 90;
|
||||||
|
gateway_timeout = 1800;
|
||||||
|
tool_use_enforcement = "auto";
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Terminal ───────────────────────────────────────────────────────
|
||||||
|
terminal = {
|
||||||
|
backend = "local";
|
||||||
|
modal_mode = "auto";
|
||||||
|
cwd = ".";
|
||||||
|
timeout = 180;
|
||||||
|
persistent_shell = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Browser ────────────────────────────────────────────────────────
|
||||||
|
browser = {
|
||||||
|
inactivity_timeout = 120;
|
||||||
|
command_timeout = 30;
|
||||||
|
cloud_provider = "local";
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Checkpoints / Compression ──────────────────────────────────────
|
||||||
|
checkpoints = {
|
||||||
|
enabled = true;
|
||||||
|
max_snapshots = 50;
|
||||||
|
};
|
||||||
|
|
||||||
|
file_read_max_chars = 100000;
|
||||||
|
|
||||||
|
compression = {
|
||||||
|
enabled = true;
|
||||||
|
threshold = 0.5;
|
||||||
|
target_ratio = 0.2;
|
||||||
|
protect_last_n = 20;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Display ────────────────────────────────────────────────────────
|
||||||
|
display = {
|
||||||
|
compact = false;
|
||||||
|
personality = "kawaii";
|
||||||
|
resume_display = "full";
|
||||||
|
busy_input_mode = "interrupt";
|
||||||
|
inline_diffs = true;
|
||||||
|
skin = "default";
|
||||||
|
tool_progress = "all";
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── TTS / STT / Voice ──────────────────────────────────────────────
|
||||||
|
tts = {
|
||||||
|
provider = "elevenlabs";
|
||||||
|
elevenlabs = {
|
||||||
|
voice_id = elevenlabsVoiceId;
|
||||||
|
model_id = "eleven_multilingual_v2";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
stt = {
|
||||||
|
enabled = true;
|
||||||
|
provider = "local";
|
||||||
|
local = {model = "base";};
|
||||||
|
};
|
||||||
|
|
||||||
|
voice = {
|
||||||
|
record_key = "ctrl+b";
|
||||||
|
max_recording_seconds = 120;
|
||||||
|
silence_threshold = 200;
|
||||||
|
silence_duration = 3.0;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Memory ─────────────────────────────────────────────────────────
|
||||||
|
memory = {
|
||||||
|
memory_enabled = true;
|
||||||
|
user_profile_enabled = true;
|
||||||
|
memory_char_limit = 2200;
|
||||||
|
user_char_limit = 1375;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Delegation ─────────────────────────────────────────────────────
|
||||||
|
delegation = {
|
||||||
|
max_iterations = 50;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Discord ────────────────────────────────────────────────────────
|
||||||
|
discord = {
|
||||||
|
require_mention = true;
|
||||||
|
auto_thread = true;
|
||||||
|
reactions = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Approvals / Security ───────────────────────────────────────────
|
||||||
|
approvals = {
|
||||||
|
mode = "manual";
|
||||||
|
timeout = 60;
|
||||||
|
};
|
||||||
|
|
||||||
|
security = {
|
||||||
|
redact_secrets = true;
|
||||||
|
tirith_enabled = true;
|
||||||
|
tirith_fail_open = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Cron / Session ─────────────────────────────────────────────────
|
||||||
|
cron = {wrap_response = true;};
|
||||||
|
|
||||||
|
session_reset = {
|
||||||
|
mode = "both";
|
||||||
|
idle_minutes = 1440;
|
||||||
|
at_hour = 4;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Web ────────────────────────────────────────────────────────────
|
||||||
|
web = {backend = "exa";};
|
||||||
|
|
||||||
|
# ── Platform Toolsets ──────────────────────────────────────────────
|
||||||
|
platform_toolsets = {
|
||||||
|
cli = [
|
||||||
|
"browser"
|
||||||
|
"clarify"
|
||||||
|
"code_execution"
|
||||||
|
"cronjob"
|
||||||
|
"delegation"
|
||||||
|
"file"
|
||||||
|
"image_gen"
|
||||||
|
"memory"
|
||||||
|
"session_search"
|
||||||
|
"skills"
|
||||||
|
"terminal"
|
||||||
|
"todo"
|
||||||
|
"tts"
|
||||||
|
"vision"
|
||||||
|
"web"
|
||||||
|
];
|
||||||
|
telegram = [
|
||||||
|
"browser"
|
||||||
|
"clarify"
|
||||||
|
"code_execution"
|
||||||
|
"cronjob"
|
||||||
|
"delegation"
|
||||||
|
"file"
|
||||||
|
"image_gen"
|
||||||
|
"memory"
|
||||||
|
"session_search"
|
||||||
|
"skills"
|
||||||
|
"terminal"
|
||||||
|
"todo"
|
||||||
|
"tts"
|
||||||
|
"vision"
|
||||||
|
"web"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,9 +1,4 @@
|
|||||||
{
|
{config, ...}: {
|
||||||
config,
|
|
||||||
inputs,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
services.paperless = {
|
services.paperless = {
|
||||||
enable = true;
|
enable = true;
|
||||||
port = config.m3ta.ports.get "paperless";
|
port = config.m3ta.ports.get "paperless";
|
||||||
|
|||||||
@@ -18,11 +18,14 @@
|
|||||||
# Localhost connections (IPv4 and IPv6)
|
# Localhost connections (IPv4 and IPv6)
|
||||||
host all postgres 127.0.0.1/32 scram-sha-256
|
host all postgres 127.0.0.1/32 scram-sha-256
|
||||||
host all postgres ::1/128 scram-sha-256
|
host all postgres ::1/128 scram-sha-256
|
||||||
|
host outline outline 127.0.0.1/32 scram-sha-256
|
||||||
|
host outline outline ::1/128 scram-sha-256
|
||||||
host paperless paperless 127.0.0.1/32 scram-sha-256
|
host paperless paperless 127.0.0.1/32 scram-sha-256
|
||||||
host paperless paperless ::1/128 scram-sha-256
|
host paperless paperless ::1/128 scram-sha-256
|
||||||
|
|
||||||
# Podman network connections for Baserow
|
# Podman network connections for Baserow
|
||||||
host baserow baserow 10.89.0.0/24 scram-sha-256
|
host baserow baserow 10.89.0.0/24 scram-sha-256
|
||||||
|
host kestra kestra 10.89.0.0/24 scram-sha-256
|
||||||
host netbird netbird 10.89.0.0/24 scram-sha-256
|
host netbird netbird 10.89.0.0/24 scram-sha-256
|
||||||
host authentik authentik 10.89.0.0/24 scram-sha-256
|
host authentik authentik 10.89.0.0/24 scram-sha-256
|
||||||
|
|
||||||
@@ -35,7 +38,7 @@
|
|||||||
services.postgresqlBackup = {
|
services.postgresqlBackup = {
|
||||||
enable = true;
|
enable = true;
|
||||||
startAt = "03:10:00";
|
startAt = "03:10:00";
|
||||||
databases = ["baserow" "paperless" "authentik" "netbird"];
|
databases = ["baserow" "paperless" "kestra" "authentik" "netbird"];
|
||||||
};
|
};
|
||||||
networking.firewall = {
|
networking.firewall = {
|
||||||
extraCommands = ''
|
extraCommands = ''
|
||||||
|
|||||||
@@ -6,32 +6,37 @@
|
|||||||
}: {
|
}: {
|
||||||
services.rustfs = {
|
services.rustfs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
environmentFile = config.age.secrets.rustfs-env.path;
|
package = inputs.rustfs.packages.${pkgs.stdenv.hostPlatform.system}.default;
|
||||||
settings = {
|
|
||||||
RUSTFS_VOLUMES = "/var/storage/s3";
|
|
||||||
|
|
||||||
RUSTFS_ADDRESS = ":3008";
|
# Reuse existing MinIO data directory
|
||||||
RUSTFS_CONSOLE_ENABLE = "true";
|
volumes = "/var/storage/s3";
|
||||||
RUSTFS_CONSOLE_ADDRESS = ":3007";
|
|
||||||
|
|
||||||
RUST_LOG = "info";
|
# Keep same ports as MinIO to avoid changing Traefik and client configs
|
||||||
};
|
address = ":3008";
|
||||||
|
consoleEnable = true;
|
||||||
|
consoleAddress = ":3007";
|
||||||
|
|
||||||
|
# Credentials via agenix
|
||||||
|
accessKeyFile = config.age.secrets.rustfs-access-key.path;
|
||||||
|
secretKeyFile = config.age.secrets.rustfs-secret-key.path;
|
||||||
|
|
||||||
|
logLevel = "info";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Traefik configuration — same routes as before
|
# Traefik configuration — same routes as before
|
||||||
services.traefik.dynamicConfigOptions.http = {
|
services.traefik.dynamicConfigOptions.http = {
|
||||||
services.rustfs-console.loadBalancer.servers = [
|
services.minio-console.loadBalancer.servers = [
|
||||||
{
|
{
|
||||||
url = "http://localhost:3007/";
|
url = "http://localhost:3007/";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
services.rustfs.loadBalancer.servers = [
|
services.minio.loadBalancer.servers = [
|
||||||
{
|
{
|
||||||
url = "http://localhost:3008/";
|
url = "http://localhost:3008/";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
||||||
routers.rustfs = {
|
routers.minio = {
|
||||||
rule = "Host(`s3.m3tam3re.com`)";
|
rule = "Host(`s3.m3tam3re.com`)";
|
||||||
tls = {
|
tls = {
|
||||||
certResolver = "godaddy";
|
certResolver = "godaddy";
|
||||||
@@ -39,31 +44,13 @@
|
|||||||
service = "minio";
|
service = "minio";
|
||||||
entrypoints = "websecure";
|
entrypoints = "websecure";
|
||||||
};
|
};
|
||||||
routers.rustfs-console = {
|
routers.minio-console = {
|
||||||
rule = "Host(`s3c.m3ta.dev`)";
|
|
||||||
tls = {
|
|
||||||
certResolver = "godaddy";
|
|
||||||
};
|
|
||||||
service = "rustfs-console";
|
|
||||||
entrypoints = "websecure";
|
|
||||||
};
|
|
||||||
routers.rustfs-old = {
|
|
||||||
rule = "Host(`s3.m3ta.dev`)";
|
|
||||||
tls = {
|
|
||||||
certResolver = "godaddy";
|
|
||||||
};
|
|
||||||
service = "rustfs";
|
|
||||||
entrypoints = "websecure";
|
|
||||||
middlewares = ["subdomain-redirect"];
|
|
||||||
};
|
|
||||||
routers.rustfs-console-old = {
|
|
||||||
rule = "Host(`minio.m3tam3re.com`)";
|
rule = "Host(`minio.m3tam3re.com`)";
|
||||||
tls = {
|
tls = {
|
||||||
certResolver = "godaddy";
|
certResolver = "godaddy";
|
||||||
};
|
};
|
||||||
service = "rustfs";
|
service = "minio-console";
|
||||||
entrypoints = "websecure";
|
entrypoints = "websecure";
|
||||||
middlewares = ["subdomain-redirect"];
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -37,22 +37,12 @@
|
|||||||
};
|
};
|
||||||
websecure = {
|
websecure = {
|
||||||
address = ":443";
|
address = ":443";
|
||||||
# NetBird (signal/management gRPC, proxy mapping stream) requires
|
|
||||||
# long-lived HTTP/2 streams — see https://docs.netbird.io/selfhosted/maintenance/configuration-files
|
|
||||||
# Default readTimeout (60s) kills the streams every minute.
|
|
||||||
transport.respondingTimeouts.readTimeout = "0s";
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
dynamicConfigOptions = {
|
dynamicConfigOptions = {
|
||||||
http = {
|
http = {
|
||||||
services = {
|
services = {
|
||||||
# ── Hermes Dashboard (m3-hermes over Netbird) ────────────────
|
|
||||||
hermes-dashboard = {
|
|
||||||
loadBalancer.servers = [
|
|
||||||
{url = "http://100.81.231.152:9119";}
|
|
||||||
];
|
|
||||||
};
|
|
||||||
dummy = {
|
dummy = {
|
||||||
loadBalancer.servers = [
|
loadBalancer.servers = [
|
||||||
{url = "http://192.168.0.1";} # Diese URL wird nie verwendet
|
{url = "http://192.168.0.1";} # Diese URL wird nie verwendet
|
||||||
|
|||||||
@@ -0,0 +1,37 @@
|
|||||||
|
# hosts/m3-daedalus/home.nix — Host-specific home-manager overrides.
|
||||||
|
# Portable laptop: no Hyprland, no external monitors.
|
||||||
|
# Everything else (shell, editors, media, theme, etc.) comes from
|
||||||
|
# m3ta-home via the profile mapping in hosts/common/users/m3tam3re.nix.
|
||||||
|
{
|
||||||
|
config,
|
||||||
|
lib,
|
||||||
|
...
|
||||||
|
}:
|
||||||
|
with lib; {
|
||||||
|
config = {
|
||||||
|
# ── XDG / MIME defaults ──
|
||||||
|
xdg = {
|
||||||
|
enable = true;
|
||||||
|
configFile."mimeapps.list".force = true;
|
||||||
|
mimeApps = {
|
||||||
|
enable = true;
|
||||||
|
associations.added = {
|
||||||
|
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||||
|
"application/csv" = ["calc.desktop"];
|
||||||
|
"application/pdf" = ["vivaldi-stable.desktop"];
|
||||||
|
"x-scheme-handler/http" = ["vivaldi-stable.desktop"];
|
||||||
|
"x-scheme-handler/https" = ["vivaldi-stable.desktop"];
|
||||||
|
};
|
||||||
|
defaultApplications = {
|
||||||
|
"application/zip" = ["org.gnome.FileRoller.desktop"];
|
||||||
|
"application/csv" = ["calc.desktop"];
|
||||||
|
"application/pdf" = ["vivaldi-stable.desktop"];
|
||||||
|
"application/md" = ["dev.zed.Zed.desktop"];
|
||||||
|
"application/text" = ["dev.zed.Zed.desktop"];
|
||||||
|
"x-scheme-handler/http" = ["vivaldi-stable.desktop"];
|
||||||
|
"x-scheme-handler/https" = ["vivaldi-stable.desktop"];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -42,7 +42,6 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
extraServices = {
|
extraServices = {
|
||||||
colmenaDeploy.enable = true;
|
|
||||||
flatpak.enable = true;
|
flatpak.enable = true;
|
||||||
ollama.enable = false;
|
ollama.enable = false;
|
||||||
podman.enable = true;
|
podman.enable = true;
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
# Add any missing dynamic libraries for unpackaged programs
|
# Add any missing dynamic libraries for unpackaged programs
|
||||||
# here, NOT in environment.systemPackages
|
# here, NOT in environment.systemPackages
|
||||||
];
|
];
|
||||||
|
programs.fish.enable = true;
|
||||||
programs.nh = {
|
programs.nh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
clean.enable = true;
|
clean.enable = true;
|
||||||
|
|||||||
@@ -8,7 +8,6 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
extraServices = {
|
extraServices = {
|
||||||
colmenaDeploy.enable = true;
|
|
||||||
flatpak.enable = false;
|
flatpak.enable = false;
|
||||||
ollama.enable = false;
|
ollama.enable = false;
|
||||||
podman.enable = false;
|
podman.enable = false;
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
programs.nix-ld.enable = true;
|
programs.nix-ld.enable = true;
|
||||||
programs.nix-ld.libraries = with pkgs; [];
|
programs.nix-ld.libraries = with pkgs; [];
|
||||||
programs.mosh.enable = true;
|
programs.fish.enable = true;
|
||||||
programs.nh = {
|
programs.nh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
clean.enable = true;
|
clean.enable = true;
|
||||||
|
|||||||
@@ -1,26 +1,12 @@
|
|||||||
{
|
{
|
||||||
age = {
|
age = {
|
||||||
secrets = {
|
secrets = {
|
||||||
agent-gitea-token-m3ta = {
|
|
||||||
file = ../../secrets/agent-gitea-token-m3ta.age;
|
|
||||||
owner = "m3tam3re";
|
|
||||||
};
|
|
||||||
hermes-env = {
|
hermes-env = {
|
||||||
file = ../../secrets/hermes-env.age;
|
file = ../../secrets/hermes-env.age;
|
||||||
};
|
};
|
||||||
hermes-cloud-env = {
|
hermes-cloud-env = {
|
||||||
file = ../../secrets/hermes-cloud-env.age;
|
file = ../../secrets/hermes-cloud-env.age;
|
||||||
};
|
};
|
||||||
hermes-api-server-key = {
|
|
||||||
file = ../../secrets/hermes-api-server-key.age;
|
|
||||||
};
|
|
||||||
ai-memory-server-env = {
|
|
||||||
file = ../../secrets/ai-memory-server-env.age;
|
|
||||||
};
|
|
||||||
ai-memory-hermes-token = {
|
|
||||||
file = ../../secrets/ai-memory-hermes-token.age;
|
|
||||||
owner = "hermes";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -1,55 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
# Mesh-only via interface match on wt0 (NetBird) — an IPv4 CIDR in -s
|
|
||||||
# would abort the ip6tables run of ip46tables and fail the unit.
|
|
||||||
port = config.m3ta.ports.get "ai-memory";
|
|
||||||
in {
|
|
||||||
# ── ai-memory server ──────────────────────────────────────────────────
|
|
||||||
# Shared agent memory for all hosts (private + work), see
|
|
||||||
# https://aimemory.sh. Clients: m3ta-home `coding.aiMemory`.
|
|
||||||
#
|
|
||||||
# Flow: Agent → memory.m3ta.dev (TLS via m3-atlas Traefik) → Netbird → :${toString port}
|
|
||||||
# Hermes on this host talks to 127.0.0.1 directly.
|
|
||||||
services.ai-memory = {
|
|
||||||
enable = true;
|
|
||||||
# Same build as the clients (m3ta-home uses llm-agents.ai-memory),
|
|
||||||
# prebuilt via the numtide cache instead of compiling the flake.
|
|
||||||
package = pkgs.llm-agents.ai-memory;
|
|
||||||
bind = "0.0.0.0";
|
|
||||||
inherit port;
|
|
||||||
enableWeb = true;
|
|
||||||
# Root bearer, token pepper, recovery token, cookie/proxy settings and
|
|
||||||
# the LLM provider key. Never put any of these into `settings`.
|
|
||||||
ageSecret = "ai-memory-server-env";
|
|
||||||
settings = {
|
|
||||||
allowed_hosts = ["memory.m3ta.dev" "localhost" "127.0.0.1" "::1"];
|
|
||||||
# One operator, several workspaces (private, az, home): keep one
|
|
||||||
# cross-project profile for all of them. With database users the
|
|
||||||
# profile is off unless enabled explicitly.
|
|
||||||
profile = {
|
|
||||||
enabled = true;
|
|
||||||
share = "global";
|
|
||||||
};
|
|
||||||
# Shared server: auto-improvement proposals wait for approval.
|
|
||||||
auto_improve.require_approval = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# A changed secret (model, keys, tokens) does not change the unit file, so
|
|
||||||
# without this the running server keeps the old environment after a switch.
|
|
||||||
systemd.services.ai-memory.restartTriggers = [config.age.secrets."ai-memory-server-env".file];
|
|
||||||
|
|
||||||
networking.firewall = {
|
|
||||||
extraCommands = ''
|
|
||||||
# Allow ai-memory only from Netbird mesh VPN
|
|
||||||
ip46tables -A nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept
|
|
||||||
'';
|
|
||||||
|
|
||||||
extraStopCommands = ''
|
|
||||||
ip46tables -D nixos-fw -p tcp --dport ${toString port} -i wt0 -j nixos-fw-accept 2>/dev/null || true
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,10 +1,5 @@
|
|||||||
{
|
{
|
||||||
imports = [
|
imports = [
|
||||||
./hermes-agent.nix
|
./hermes-agent.nix
|
||||||
./herdr-sandbox.nix
|
|
||||||
./hermes-dashboard.nix
|
|
||||||
./ai-memory.nix
|
|
||||||
./netbird.nix
|
|
||||||
./t3code.nix
|
|
||||||
];
|
];
|
||||||
}
|
}
|
||||||
@@ -1,152 +0,0 @@
|
|||||||
# Agent Fleet Sandbox (R2) — dedicated herdr runtime user without fleet secrets.
|
|
||||||
#
|
|
||||||
# Implements the Hub Pattern (agent-fleet-access skill, locked 2026-09-27):
|
|
||||||
# - Workers run as system user `herdr` (own home, no fleet SSH keys).
|
|
||||||
# - herdr server as systemd system service, socket in RuntimeDirectory (0700).
|
|
||||||
# - Orchestrator (hermes) descends via exactly ONE sudo wrapper.
|
|
||||||
# - Worker LLM access via the NetBird Agent Network endpoint (keyless —
|
|
||||||
# the proxy injects provider keys server-side; budget caps live in the
|
|
||||||
# NetBird policy, set UNDER plan quota).
|
|
||||||
#
|
|
||||||
# Deliberately NOT in this module (documented follow-ups):
|
|
||||||
# - moshi-hook binary for the herdr user is installed imperatively once
|
|
||||||
# (`sudo -u herdr bash -c 'curl -fsSL https://getmoshi.app/install.sh | sh'`)
|
|
||||||
# until we package moshi-hook for nixpkgs — service unit below is
|
|
||||||
# declarative, only the binary path is /var/lib/herdr/.local/bin.
|
|
||||||
# - Pairing is the user's manual phone step (moshi app → token → pair).
|
|
||||||
# - Gitea push key for the herdr user: follow-up agenix secret (needs the
|
|
||||||
# placeholder+encrypt dance on this host).
|
|
||||||
{
|
|
||||||
config,
|
|
||||||
lib,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
herdrPkg = pkgs.llm-agents.herdr;
|
|
||||||
herdrBin = "${herdrPkg}/bin/herdr";
|
|
||||||
|
|
||||||
# Keyless LLM endpoint for workers (NetBird Agent Network / m3ta-gateway).
|
|
||||||
# Same endpoint the orchestrator's opencode already uses — verified working.
|
|
||||||
workerOpencodeConfig = pkgs.writeText "opencode.jsonc" (builtins.toJSON {
|
|
||||||
"$schema" = "https://opencode.ai/config.json";
|
|
||||||
provider = {
|
|
||||||
m3ta-gateway = {
|
|
||||||
npm = "@ai-sdk/openai-compatible";
|
|
||||||
name = "m3ta-gateway";
|
|
||||||
options = {
|
|
||||||
baseURL = "https://downy-cardamom.p.m3ta.dev/v1";
|
|
||||||
apiKey = "none";
|
|
||||||
};
|
|
||||||
models = {
|
|
||||||
claude-sonnet-5 = {
|
|
||||||
name = "Claude Sonnet 5";
|
|
||||||
};
|
|
||||||
claude-opus-5 = {
|
|
||||||
name = "Claude Opus 5";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
model = "m3ta-gateway/claude-sonnet-5";
|
|
||||||
});
|
|
||||||
|
|
||||||
# The single sudo-descending wrapper: orchestrator may run ONLY this,
|
|
||||||
# ONLY as user herdr, and it whitelists herdr client subcommands.
|
|
||||||
herdrRun = pkgs.writeShellScriptBin "herdr-run" ''
|
|
||||||
set -euo pipefail
|
|
||||||
cmd="''${1:-}"
|
|
||||||
case "$cmd" in
|
|
||||||
agent|pane|workspace|status|integration|help|--version)
|
|
||||||
exec ${herdrBin} "$@"
|
|
||||||
;;
|
|
||||||
*)
|
|
||||||
echo "herdr-run: subcommand '$cmd' not allowed (agent|pane|workspace|status|integration)" >&2
|
|
||||||
exit 64
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
'';
|
|
||||||
in {
|
|
||||||
# ── Sandbox user ──────────────────────────────────────────────────────
|
|
||||||
users.users.herdr = {
|
|
||||||
isSystemUser = true;
|
|
||||||
group = "herdr";
|
|
||||||
home = "/var/lib/herdr";
|
|
||||||
createHome = true;
|
|
||||||
homeMode = "750";
|
|
||||||
description = "Agent fleet worker sandbox (herdr runtime, no fleet keys)";
|
|
||||||
shell = pkgs.bashInteractive;
|
|
||||||
};
|
|
||||||
users.groups.herdr = {};
|
|
||||||
|
|
||||||
# herdr binary + sudo wrapper reachable system-wide (herdr-run references
|
|
||||||
# the store path of herdr; wrapper is for interactive admin debugging)
|
|
||||||
environment.systemPackages = [herdrPkg herdrRun];
|
|
||||||
|
|
||||||
# ── herdr server (system service, sandbox user) ───────────────────────
|
|
||||||
systemd.services.herdr-server = {
|
|
||||||
description = "herdr server (agent fleet runtime sandbox)";
|
|
||||||
after = ["network.target"];
|
|
||||||
wantedBy = ["multi-user.target"];
|
|
||||||
serviceConfig = {
|
|
||||||
User = "herdr";
|
|
||||||
Group = "herdr";
|
|
||||||
StateDirectory = "herdr";
|
|
||||||
StateDirectoryMode = "0750";
|
|
||||||
RuntimeDirectory = "herdr";
|
|
||||||
RuntimeDirectoryMode = "0700";
|
|
||||||
ExecStart = "${herdrBin} server";
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "5";
|
|
||||||
};
|
|
||||||
# Idiomatisch statt PATH-Env (kollidiert sonst mit systemds Default-PATH)
|
|
||||||
path = with pkgs; [git coreutils gnused gnugrep procps];
|
|
||||||
environment = {
|
|
||||||
# herdr legt den Socket im 0700-RuntimeDirectory ab
|
|
||||||
XDG_RUNTIME_DIR = "/run/herdr";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── moshi-hook daemon (sandbox user, system unit — no user-manager
|
|
||||||
# dependency, avoids the DBUS/XDG headless trap entirely) ───────────
|
|
||||||
systemd.services.moshi-hook-herdr = {
|
|
||||||
description = "moshi-hook daemon (herdr sandbox user)";
|
|
||||||
after = ["network-online.target"];
|
|
||||||
wants = ["network-online.target"];
|
|
||||||
wantedBy = ["multi-user.target"];
|
|
||||||
serviceConfig = {
|
|
||||||
User = "herdr";
|
|
||||||
Group = "herdr";
|
|
||||||
ExecStart = "/var/lib/herdr/.local/bin/moshi-hook serve";
|
|
||||||
WorkingDirectory = "/var/lib/herdr";
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = "5";
|
|
||||||
# App-push flows outbound (WebSocket to api.getmoshi.app); the socket
|
|
||||||
# for agent CLI events lands in the herdr home state dir.
|
|
||||||
Environment = "XDG_RUNTIME_DIR=/run/herdr";
|
|
||||||
};
|
|
||||||
# Binary is installed imperatively (see header) — do not start the unit
|
|
||||||
# until that one-time install happened; systemd would just restart-loop.
|
|
||||||
unitConfig.ConditionPathExists = ["/var/lib/herdr/.local/bin/moshi-hook"];
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Worker environment: keyless LLM endpoint config ───────────────────
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d /var/lib/herdr/.config 0750 herdr herdr -"
|
|
||||||
"d /var/lib/herdr/.config/opencode 0750 herdr herdr -"
|
|
||||||
"L+ /var/lib/herdr/.config/opencode/opencode.jsonc - - - - ${workerOpencodeConfig}"
|
|
||||||
];
|
|
||||||
|
|
||||||
# ── Orchestrator → sandbox: exactly ONE sudo rule, descending only ─────
|
|
||||||
security.sudo.extraRules = [
|
|
||||||
{
|
|
||||||
users = ["hermes"];
|
|
||||||
runAs = "herdr";
|
|
||||||
commands = [
|
|
||||||
{
|
|
||||||
command = "/run/current-system/sw/bin/herdr-run *";
|
|
||||||
options = ["NOPASSWD"];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
];
|
|
||||||
}
|
|
||||||
@@ -1,6 +1,5 @@
|
|||||||
{
|
{
|
||||||
config,
|
config,
|
||||||
lib,
|
|
||||||
pkgs,
|
pkgs,
|
||||||
inputs,
|
inputs,
|
||||||
...
|
...
|
||||||
@@ -8,54 +7,39 @@
|
|||||||
# Edge TTS: Seraphina — friendly, multilingual German female voice (free, no API key)
|
# Edge TTS: Seraphina — friendly, multilingual German female voice (free, no API key)
|
||||||
edgeVoice = "de-DE-SeraphinaMultilingualNeural";
|
edgeVoice = "de-DE-SeraphinaMultilingualNeural";
|
||||||
|
|
||||||
hermesHome = "${config.services.hermes-agent.stateDir}/.hermes";
|
# Extra Python packages from the container's writable venv layer.
|
||||||
|
# matrix-nio is installed via pip in /home/hermes/.venv but the hermes
|
||||||
|
# process uses the read-only Nix store Python, so we inject the venv's
|
||||||
|
# site-packages via PYTHONPATH and provide libstdc++ for libolm (e2e).
|
||||||
|
venvSitePackages = "/home/hermes/.venv/lib/python3.11/site-packages";
|
||||||
|
gccLibPath = "${pkgs.stdenv.cc.cc.lib}/lib";
|
||||||
|
|
||||||
# Same interpreter env the upstream merge script uses, so no extra
|
# Build skills using agents flake lib for hermes user
|
||||||
# closure cost — the derivation is shared.
|
hermesSkills = inputs.agents.lib.mkOpencodeSkills {
|
||||||
yamlPython = pkgs.python3.withPackages (ps: [ps.pyyaml]);
|
inherit pkgs;
|
||||||
|
customSkills = "${inputs.agents}/skills";
|
||||||
# ── ai-memory client (server: ./ai-memory.nix, same host) ─────────────
|
externalSkills = [
|
||||||
# The MCP bridge reads the bearer from [auth].bearer_token_file in the
|
|
||||||
# data dir's config.toml; the native `hook` command only looks at
|
|
||||||
# <data_dir>/auth-token (what `install-hooks --apply` would seed), so that
|
|
||||||
# file is a symlink to the same secret. Neither config.yaml nor the
|
|
||||||
# process environment ever carries the token.
|
|
||||||
aiMemory = "${config.services.ai-memory.package}/bin/ai-memory";
|
|
||||||
aiMemoryUrl = "http://127.0.0.1:${toString (config.m3ta.ports.get "ai-memory")}";
|
|
||||||
aiMemoryDataDir = "/var/lib/hermes/.local/share/ai-memory";
|
|
||||||
aiMemoryHook = event: [
|
|
||||||
{
|
{
|
||||||
command = "${aiMemory} --data-dir ${aiMemoryDataDir} hook --event ${event} --agent hermes --server-url ${aiMemoryUrl}";
|
src = inputs.skills-basecamp;
|
||||||
timeout = 20;
|
skillsDir = "skills";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
src = inputs.skills-anthropic;
|
||||||
|
skillsDir = "skills";
|
||||||
|
}
|
||||||
|
{
|
||||||
|
src = inputs.skills-kestra;
|
||||||
|
skillsDir = "skills";
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
};
|
||||||
in {
|
in {
|
||||||
virtualisation.docker.enable = true;
|
virtualisation.docker.enable = true;
|
||||||
|
|
||||||
systemd.tmpfiles.rules = [
|
systemd.tmpfiles.rules = [
|
||||||
"d /var/lib/hermes/.config 0755 hermes hermes -"
|
"d /home/hermes/.config 0755 hermes hermes -"
|
||||||
"d /var/lib/hermes/.config/tea 0755 hermes hermes -"
|
"d /home/hermes/.config/tea 0755 hermes hermes -"
|
||||||
"d /var/lib/hermes/.local 0755 hermes hermes -"
|
"L+ /home/hermes/.config/tea/yml - - - - ${pkgs.writeText "tea-yml" ''
|
||||||
"d /var/lib/hermes/.local/share 0755 hermes hermes -"
|
|
||||||
"d ${aiMemoryDataDir} 0700 hermes hermes -"
|
|
||||||
"L+ ${aiMemoryDataDir}/config.toml - - - - ${pkgs.writeText "ai-memory-hermes-config.toml" ''
|
|
||||||
server_url = "${aiMemoryUrl}"
|
|
||||||
|
|
||||||
[auth]
|
|
||||||
bearer_token_file = "${config.age.secrets."ai-memory-hermes-token".path}"
|
|
||||||
''}"
|
|
||||||
"L+ ${aiMemoryDataDir}/auth-token - - - - ${config.age.secrets."ai-memory-hermes-token".path}"
|
|
||||||
# Scope marker: Hermes reports its process directory as cwd, so every
|
|
||||||
# assistant session lands in one project of the `home` workspace
|
|
||||||
# (coding checkouts below $HOME with their own marker still win).
|
|
||||||
"L+ /var/lib/hermes/.ai-memory.toml - - - - ${pkgs.writeText "ai-memory-hermes-marker.toml" ''
|
|
||||||
workspace = "home"
|
|
||||||
project = "assistant"
|
|
||||||
|
|
||||||
[capture]
|
|
||||||
ignore_paths = ["/run/agenix/**", "**/.env*", "/var/lib/hermes/.hermes/auth*", "/var/lib/hermes/.ssh/**"]
|
|
||||||
''}"
|
|
||||||
"L+ /var/lib/hermes/.config/tea/yml - - - - ${pkgs.writeText "tea-yml" ''
|
|
||||||
logins:
|
logins:
|
||||||
- name: m3ta
|
- name: m3ta
|
||||||
url: https://code.m3ta.dev
|
url: https://code.m3ta.dev
|
||||||
@@ -64,71 +48,51 @@ in {
|
|||||||
user: m3ta-chiron
|
user: m3ta-chiron
|
||||||
default: true
|
default: true
|
||||||
''}"
|
''}"
|
||||||
|
"f /home/hermes/.gitconfig 0644 hermes hermes - ${pkgs.writeText "gitconfig" ''
|
||||||
|
[user]
|
||||||
|
name = m3ta-chiron
|
||||||
|
email = m3ta-chiron@agentmail.to
|
||||||
|
[init]
|
||||||
|
defaultBranch = main
|
||||||
|
''}"
|
||||||
];
|
];
|
||||||
|
|
||||||
|
systemd.services.copy-hermes-skills = {
|
||||||
|
description = "Copy agent skills to hermes home directory";
|
||||||
|
wantedBy = ["hermes-agent.service"];
|
||||||
|
before = ["hermes-agent.service"];
|
||||||
|
serviceConfig.Type = "oneshot";
|
||||||
|
serviceConfig.RemainAfterExit = true;
|
||||||
|
script = ''
|
||||||
|
mkdir -p /var/lib/hermes/.agents
|
||||||
|
cp -rT ${hermesSkills} /var/lib/hermes/.agents/skills
|
||||||
|
chown -R hermes:hermes /var/lib/hermes/.agents
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
|
||||||
|
# Ensure 'uv' is in the hermes-agent service PATH so CronJobs and terminal
|
||||||
|
# sessions can use 'uv run' for PEP 723 scripts (e.g. garmin-daily.py).
|
||||||
|
systemd.services.hermes-agent.path = [pkgs.uv];
|
||||||
|
|
||||||
services.hermes-agent = {
|
services.hermes-agent = {
|
||||||
enable = true;
|
enable = true;
|
||||||
addToSystemPackages = true;
|
addToSystemPackages = true;
|
||||||
# v0.14 lazy-installs heavy optional backends by default. In the sealed
|
|
||||||
# Nix package, include the backends this host config actively uses so the
|
|
||||||
# gateway, Matrix bridge, memory, web search, TTS, and local STT work
|
|
||||||
# without runtime pip/uv mutation.
|
|
||||||
extraDependencyGroups = [
|
|
||||||
"matrix"
|
|
||||||
"exa"
|
|
||||||
"edge-tts"
|
|
||||||
"voice"
|
|
||||||
];
|
|
||||||
|
|
||||||
extraPackages = with pkgs; [
|
extraPackages = with pkgs; [docker git tea nix];
|
||||||
agent-lib
|
|
||||||
basecamp
|
|
||||||
docker
|
|
||||||
llm-agents.herdr
|
|
||||||
llm-agents.opencode2
|
|
||||||
pi-coding-agent
|
|
||||||
bun
|
|
||||||
git
|
|
||||||
curl
|
|
||||||
jq
|
|
||||||
tea
|
|
||||||
nix
|
|
||||||
python3Minimal
|
|
||||||
llm-agents.qmd
|
|
||||||
uv
|
|
||||||
];
|
|
||||||
|
|
||||||
# Secrets via agenix
|
# Secrets via agenix
|
||||||
environmentFiles = [
|
environmentFiles = [
|
||||||
config.age.secrets."hermes-env".path
|
config.age.secrets."hermes-env".path
|
||||||
config.age.secrets."hermes-cloud-env".path
|
config.age.secrets."hermes-cloud-env".path
|
||||||
config.age.secrets."hermes-api-server-key".path
|
|
||||||
];
|
];
|
||||||
|
|
||||||
# Non-secret environment variables
|
# Non-secret environment variables
|
||||||
# Git identity is set entirely via env vars (GIT_AUTHOR_*, GIT_COMMITTER_*,
|
|
||||||
# GIT_INIT_DEFAULT_BRANCH) — no .gitconfig file needed. Env vars take
|
|
||||||
# precedence over any gitconfig, and the hermes gateway injects them into
|
|
||||||
# all terminal sessions via .env.
|
|
||||||
environment = {
|
environment = {
|
||||||
GLM_BASE_URL = "https://api.z.ai/api/coding/paas/v4/";
|
GLM_BASE_URL = "https://api.z.ai/api/coding/paas/v4/";
|
||||||
GIT_AUTHOR_NAME = "m3ta-chiron";
|
GIT_AUTHOR_NAME = "m3ta-chiron";
|
||||||
GIT_AUTHOR_EMAIL = "m3ta-chiron@agentmail.to";
|
GIT_AUTHOR_EMAIL = "m3ta-chiron@agentmail.to";
|
||||||
GIT_COMMITTER_NAME = "m3ta-chiron";
|
GIT_COMMITTER_NAME = "m3ta-chiron";
|
||||||
GIT_COMMITTER_EMAIL = "m3ta-chiron@agentmail.to";
|
GIT_COMMITTER_EMAIL = "m3ta-chiron@agentmail.to";
|
||||||
GIT_INIT_DEFAULT_BRANCH = "master";
|
|
||||||
|
|
||||||
# ── API Server (OpenAI-compatible, for Hermes Desktop App) ─────────
|
|
||||||
# Accessible via Netbird mesh VPN — not exposed to the public internet.
|
|
||||||
# Bind to 0.0.0.0 so the Netbird interface can reach it.
|
|
||||||
API_SERVER_ENABLED = "true";
|
|
||||||
API_SERVER_HOST = "0.0.0.0";
|
|
||||||
API_SERVER_PORT = toString (config.m3ta.ports.get "hermes-api");
|
|
||||||
};
|
|
||||||
|
|
||||||
mcpServers.ai-memory = {
|
|
||||||
command = aiMemory;
|
|
||||||
args = ["mcp-bridge" "--no-session-id" "--server-url" "${aiMemoryUrl}/mcp" "--data-dir" aiMemoryDataDir];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# ── Container mode (podman) ──────────────────────────────────────────
|
# ── Container mode (podman) ──────────────────────────────────────────
|
||||||
@@ -136,27 +100,21 @@ in {
|
|||||||
enable = false;
|
enable = false;
|
||||||
backend = "podman";
|
backend = "podman";
|
||||||
extraVolumes = ["/home/m3tam3re/p:/projects:rw"];
|
extraVolumes = ["/home/m3tam3re/p:/projects:rw"];
|
||||||
extraOptions = [];
|
extraOptions = [
|
||||||
|
"--env"
|
||||||
|
"PYTHONPATH=${venvSitePackages}"
|
||||||
|
"--env"
|
||||||
|
"LD_LIBRARY_PATH=${gccLibPath}"
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
# ── Model ──────────────────────────────────────────────────────────
|
# ── Model ──────────────────────────────────────────────────────────
|
||||||
model = {
|
model = {
|
||||||
default = "glm-5.3";
|
default = "glm-5.1";
|
||||||
provider = "zai";
|
provider = "zai";
|
||||||
};
|
};
|
||||||
|
|
||||||
fallback_providers = [
|
|
||||||
{
|
|
||||||
provider = "openai-codex";
|
|
||||||
model = "gpt-5.5";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
provider = "minimax";
|
|
||||||
model = "MiniMax-M3";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
credential_pool_strategies = {
|
credential_pool_strategies = {
|
||||||
zai = "fill_first";
|
zai = "fill_first";
|
||||||
};
|
};
|
||||||
@@ -168,28 +126,13 @@ in {
|
|||||||
max_turns = 90;
|
max_turns = 90;
|
||||||
gateway_timeout = 1800;
|
gateway_timeout = 1800;
|
||||||
tool_use_enforcement = "auto";
|
tool_use_enforcement = "auto";
|
||||||
reasoning_effort = "high";
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# ── Skills ─────────────────────────────────────────────────────────
|
# ── Skills ─────────────────────────────────────────────────────────
|
||||||
|
|
||||||
skills = {
|
skills = {
|
||||||
external_dirs = [
|
external_dirs = [
|
||||||
"~/.agents/skills"
|
"/var/lib/hermes/.agents/skills"
|
||||||
];
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Plugins ────────────────────────────────────────────────────────
|
|
||||||
# Declared after the 2026-10-04 corruption incident: the runtime had
|
|
||||||
# enabled these plugins in config.yaml (via plugin-install), and a
|
|
||||||
# runtime bug appended the second entry at mapping-level indent,
|
|
||||||
# breaking the whole file. Declaring them here keeps them active even
|
|
||||||
# if a corrupt runtime config ever has to be quarantined and
|
|
||||||
# regenerated (see hermes-config-quarantine activation snippet below).
|
|
||||||
plugins = {
|
|
||||||
enabled = [
|
|
||||||
"herdr-agent-state"
|
|
||||||
"moshi-hooks"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
@@ -209,8 +152,7 @@ in {
|
|||||||
cloud_provider = "local";
|
cloud_provider = "local";
|
||||||
};
|
};
|
||||||
|
|
||||||
# ── Checkpoints v2 ─────────────────────────────────────────────────
|
# ── Checkpoints / Compression ──────────────────────────────────────
|
||||||
# v0.13.0: Single-store rewrite with real pruning + disk guardrails.
|
|
||||||
checkpoints = {
|
checkpoints = {
|
||||||
enabled = true;
|
enabled = true;
|
||||||
max_snapshots = 50;
|
max_snapshots = 50;
|
||||||
@@ -257,23 +199,9 @@ in {
|
|||||||
silence_duration = 3.0;
|
silence_duration = 3.0;
|
||||||
};
|
};
|
||||||
|
|
||||||
# ── ai-memory hooks ────────────────────────────────────────────────
|
|
||||||
# From `ai-memory install-hooks --agent hermes` (3.2.2). ai-memory is
|
|
||||||
# the one shared memory for every agent; Honcho was dropped in favour
|
|
||||||
# of it (2026-10-25), only Hermes' small built-in notes remain.
|
|
||||||
hooks_auto_accept = true;
|
|
||||||
hooks = {
|
|
||||||
pre_tool_call = aiMemoryHook "pre-tool-use";
|
|
||||||
post_tool_call = aiMemoryHook "post-tool-use";
|
|
||||||
on_session_start = aiMemoryHook "session-start";
|
|
||||||
pre_llm_call = aiMemoryHook "user-prompt-submit";
|
|
||||||
on_session_end = aiMemoryHook "stop";
|
|
||||||
on_session_finalize = aiMemoryHook "session-end";
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Memory ─────────────────────────────────────────────────────────
|
# ── Memory ─────────────────────────────────────────────────────────
|
||||||
memory = {
|
memory = {
|
||||||
provider = "builtin";
|
provider = "honcho";
|
||||||
memory_enabled = true;
|
memory_enabled = true;
|
||||||
user_profile_enabled = true;
|
user_profile_enabled = true;
|
||||||
memory_char_limit = 2200;
|
memory_char_limit = 2200;
|
||||||
@@ -287,24 +215,12 @@ in {
|
|||||||
max_spawn_depth = 2;
|
max_spawn_depth = 2;
|
||||||
};
|
};
|
||||||
|
|
||||||
# ── Kanban (v0.13.0 — Multi-Agent Board) ──────────────────────────
|
|
||||||
# Durable task board with embedded dispatcher in gateway process.
|
|
||||||
# Workers are full OS processes with identity, heartbeat, reclaim,
|
|
||||||
# zombie detection, and hallucination gate.
|
|
||||||
kanban = {
|
|
||||||
dispatch_in_gateway = true;
|
|
||||||
dispatch_interval_seconds = 60;
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Matrix ────────────────────────────────────────────────────────
|
# ── Matrix ────────────────────────────────────────────────────────
|
||||||
matrix = {
|
matrix = {
|
||||||
homeserver = "https://matrix.m3ta.dev";
|
homeserver = "https://matrix.m3ta.dev";
|
||||||
user_id = "@chiron:m3ta.dev";
|
user_id = "@chiron:m3ta.dev";
|
||||||
allowed_users = ["@m3tam3re:m3ta.dev"];
|
allowed_users = ["@m3tam3re:m3ta.dev"];
|
||||||
encryption = true;
|
encryption = true;
|
||||||
group_sessions_per_user = true;
|
|
||||||
auto_thread = true;
|
|
||||||
dm_mention_threads = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# ── Approvals / Security ───────────────────────────────────────────
|
# ── Approvals / Security ───────────────────────────────────────────
|
||||||
@@ -337,53 +253,6 @@ in {
|
|||||||
isNormalUser = false;
|
isNormalUser = false;
|
||||||
openssh.authorizedKeys.keys = [
|
openssh.authorizedKeys.keys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICAVF7jGP1S6vc5CxeBFD/UxiImHOgbPlKg8WYyNtOA3"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICAVF7jGP1S6vc5CxeBFD/UxiImHOgbPlKg8WYyNtOA3"
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBZcjCKl0DRuOUOMXbM0GKY5JjvmyFpVZ/tRlTKWu/zp"
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# ── ai-memory skills ──────────────────────────────────────────────────
|
|
||||||
# Hermes ignores MCP server instructions; the routing rules reach the
|
|
||||||
# model through these skills in ~/.hermes/skills, refreshed on each boot
|
|
||||||
# so they track the installed ai-memory version.
|
|
||||||
systemd.services.hermes-ai-memory-skills = {
|
|
||||||
description = "Install ai-memory skills for Hermes";
|
|
||||||
before = ["hermes-agent.service"];
|
|
||||||
wantedBy = ["hermes-agent.service"];
|
|
||||||
environment = {
|
|
||||||
HOME = "/var/lib/hermes";
|
|
||||||
HERMES_HOME = hermesHome;
|
|
||||||
};
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
User = "hermes";
|
|
||||||
Group = "hermes";
|
|
||||||
ExecStart = "${aiMemory} --data-dir ${aiMemoryDataDir} install-skills --scope global --agent hermes";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Activation hardening ─────────────────────────────────────────────
|
|
||||||
# Upstream (hermes-agent v2026.9.24) deep-merges the Nix settings into
|
|
||||||
# the runtime-writable config.yaml via a bare `yaml.safe_load()` with no
|
|
||||||
# error handling. The hermes runtime corrupts that file occasionally
|
|
||||||
# (2026-10-04: enabling a plugin appended "- moshi-hooks" at
|
|
||||||
# mapping-level indent → yaml.parser.ParserError), which made every
|
|
||||||
# `nixos-rebuild switch` fail inside the 'hermes-agent-setup' snippet.
|
|
||||||
# Quarantine unparsable YAML before the upstream snippet runs so
|
|
||||||
# activation regenerates a clean file from Nix settings instead of
|
|
||||||
# blocking system updates. The corrupt file is kept next to it for
|
|
||||||
# manual recovery of any runtime-added keys.
|
|
||||||
system.activationScripts = {
|
|
||||||
hermes-config-quarantine = lib.stringAfter ["users"] ''
|
|
||||||
if [ -f ${hermesHome}/config.yaml ] && ! ${yamlPython}/bin/python3 -c 'import sys, yaml; yaml.safe_load(open(sys.argv[1]))' ${hermesHome}/config.yaml 2>/dev/null; then
|
|
||||||
_quarantined="${hermesHome}/config.yaml.corrupt-$(date +%Y%m%d-%H%M%S)"
|
|
||||||
mv ${hermesHome}/config.yaml "$_quarantined"
|
|
||||||
chmod 0600 "$_quarantined"
|
|
||||||
echo "[hermes-config-quarantine] config.yaml was not valid YAML — moved to $_quarantined; a clean one is regenerated from Nix settings" >&2
|
|
||||||
fi
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Order the quarantine before the upstream merge snippet (deps lists
|
|
||||||
# concatenate, so this adds to upstream's ["users", "setupSecrets"]).
|
|
||||||
hermes-agent-setup.deps = ["hermes-config-quarantine"];
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
@@ -1,68 +0,0 @@
|
|||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
inputs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
# Mesh-only via interface match on wt0 (NetBird) — works for ip46tables
|
|
||||||
# where an IPv4 CIDR in -s would abort the ip6tables run.
|
|
||||||
apiPort = config.m3ta.ports.get "hermes-api";
|
|
||||||
dashboardPort = config.m3ta.ports.get "hermes-dashboard";
|
|
||||||
|
|
||||||
# Reference the hermes-agent package from the running service config
|
|
||||||
hermesPkg = config.services.hermes-agent.package or (inputs.hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.default or pkgs.hermes-agent);
|
|
||||||
in {
|
|
||||||
# ── Hermes Dashboard systemd service ───────────────────────────────────
|
|
||||||
# Web UI for managing Hermes Agent — sessions, config, kanban, cron, etc.
|
|
||||||
#
|
|
||||||
# Flow: Browser → dash.m3ta.dev (TLS via m3-atlas Traefik) → Netbird → :${toString dashboardPort}
|
|
||||||
#
|
|
||||||
# --insecure is required to bind 0.0.0.0 (hermes refuses non-localhost otherwise).
|
|
||||||
# Safe because firewall restricts the dashboard/API ports to Netbird mesh only.
|
|
||||||
systemd.services.hermes-dashboard = {
|
|
||||||
description = "Hermes Agent Web Dashboard";
|
|
||||||
after = ["network.target" "hermes-agent.service"];
|
|
||||||
wants = ["hermes-agent.service"];
|
|
||||||
wantedBy = ["multi-user.target"];
|
|
||||||
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "simple";
|
|
||||||
User = "hermes";
|
|
||||||
Group = "hermes";
|
|
||||||
|
|
||||||
ExecStart = "${hermesPkg}/bin/hermes dashboard --host 0.0.0.0 --port ${toString dashboardPort} --no-open --insecure";
|
|
||||||
|
|
||||||
# Environment matching the hermes-agent service
|
|
||||||
Environment = [
|
|
||||||
"HERMES_HOME=/var/lib/hermes/.hermes"
|
|
||||||
"HERMES_MANAGED=true"
|
|
||||||
"HOME=/var/lib/hermes"
|
|
||||||
];
|
|
||||||
|
|
||||||
# Security hardening (matching hermes-agent service pattern)
|
|
||||||
NoNewPrivileges = true;
|
|
||||||
ProtectSystem = "strict";
|
|
||||||
ProtectHome = "read-only";
|
|
||||||
ReadWritePaths = ["/var/lib/hermes" "/tmp"];
|
|
||||||
PrivateTmp = true;
|
|
||||||
|
|
||||||
# Restart policy
|
|
||||||
Restart = "on-failure";
|
|
||||||
RestartSec = 5;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Firewall: Hermes network endpoints only from Netbird mesh ──────────
|
|
||||||
networking.firewall = {
|
|
||||||
extraCommands = ''
|
|
||||||
# Allow Hermes Dashboard and OpenAI-compatible API only from Netbird mesh VPN
|
|
||||||
ip46tables -A nixos-fw -p tcp --dport ${toString dashboardPort} -i wt0 -j nixos-fw-accept
|
|
||||||
ip46tables -A nixos-fw -p tcp --dport ${toString apiPort} -i wt0 -j nixos-fw-accept
|
|
||||||
'';
|
|
||||||
|
|
||||||
extraStopCommands = ''
|
|
||||||
ip46tables -D nixos-fw -p tcp --dport ${toString dashboardPort} -i wt0 -j nixos-fw-accept 2>/dev/null || true
|
|
||||||
ip46tables -D nixos-fw -p tcp --dport ${toString apiPort} -i wt0 -j nixos-fw-accept 2>/dev/null || true
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,190 +0,0 @@
|
|||||||
# T3 Code server (https://t3.codes) — interactive coding-agent cockpit.
|
|
||||||
#
|
|
||||||
# Part of the three-lane agent setup (agreed 2026-10-26):
|
|
||||||
# - Lane 1, interactive cockpit: T3 Code on m3-hermes, reached over the
|
|
||||||
# NetBird mesh via direct pairing (no T3 Connect cloud relay).
|
|
||||||
# - Lane 2, autonomous workers: herdr sandbox (see herdr-sandbox.nix).
|
|
||||||
# - Lane 3, control & inbox: Hermes via Matrix (unchanged).
|
|
||||||
#
|
|
||||||
# Flow: T3 desktop/mobile app ──NetBird mesh──▶ wt0 :3773 (this server).
|
|
||||||
# The server itself comes from m3ta-home's t3code module: it binds the
|
|
||||||
# current NetBird address of wt0 and opens the port on wt0 only. This file
|
|
||||||
# adds the hermes-specific agent runtime around it.
|
|
||||||
#
|
|
||||||
# Agent runtime for the T3 harnesses (OpenCode / Claude Code, 2026-10-31):
|
|
||||||
# - Skills/commands/agents via agent-lib v2: a timer syncs the work repo
|
|
||||||
# (gitea m3tam3re/agent-lib — anonymously readable over HTTPS, verified,
|
|
||||||
# so no deploy token) into ~/.agents/skills + ~/.config/opencode/*. A
|
|
||||||
# path unit mirrors skills into ~/.claude/skills for Claude Code
|
|
||||||
# (port of m3ta-home profiles/sets/coding/agents/claude-skills.nix).
|
|
||||||
# - Git identity and Gitea push auth: m3ta-chiron for every harness spawned
|
|
||||||
# by T3, baked into the package (m3ta-home overlay
|
|
||||||
# t3code-agent-identity), so m3tam3re's interactive git is untouched.
|
|
||||||
# - Gitea SSH: m3tam3re's ssh config pins User gitea + key ~/.ssh/gitea
|
|
||||||
# (one-time keygen; pubkey added to the m3ta-chiron account) for
|
|
||||||
# interactive use and git+ssh:// flake inputs. Host key pinned system-wide.
|
|
||||||
# - Gitea change requests: tea with the agent-gitea-token-m3ta agenix secret,
|
|
||||||
# baked into the same package.
|
|
||||||
#
|
|
||||||
# One-time interactive steps after deploy (deliberately NOT declarative —
|
|
||||||
# subscription auth must live in each harness's own credential store and
|
|
||||||
# may not be shared with other tools per provider ToS):
|
|
||||||
# - Pair clients: `sudo -u m3tam3re t3 pair` (or take the pairing URL
|
|
||||||
# from `journalctl -u t3code` after first start) and add the
|
|
||||||
# environment in the T3 app via the printed URL/QR code.
|
|
||||||
# - Claude Code: `sudo -u m3tam3re claude auth login`
|
|
||||||
# (persists in /home/m3tam3re/.claude).
|
|
||||||
# - OpenCode: `sudo -u m3tam3re opencode auth login`
|
|
||||||
# (subscription auth persists in OpenCode's own state dir).
|
|
||||||
# - Gitea push key for the T3 lane (a private key must not live in the
|
|
||||||
# nix store, so imperative like the harness auths above):
|
|
||||||
# sudo -u m3tam3re ssh-keygen -t ed25519 -N "" \
|
|
||||||
# -C chiron-t3-m3-hermes -f /home/m3tam3re/.ssh/gitea
|
|
||||||
# Then add the pubkey to the m3ta-chiron account on code.m3ta.dev
|
|
||||||
# (m3ta-chiron → Settings → SSH / GPG Keys → "chiron-t3-m3-hermes").
|
|
||||||
# Verify: sudo -u m3tam3re ssh -T gitea@code.m3ta.dev
|
|
||||||
{
|
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: let
|
|
||||||
# ── Lane-1 agent runtime ─────────────────────────────────────────────
|
|
||||||
cockpitUser = "m3tam3re";
|
|
||||||
cockpitHome = "/home/${cockpitUser}";
|
|
||||||
|
|
||||||
# SSH to the private Gitea for the T3 lane. Sits in m3tam3re's ssh
|
|
||||||
# config (per-user — Hermes' own gitea access via its own ssh config
|
|
||||||
# is unaffected). URL-embedded users (gitea@code.m3ta.dev) match the
|
|
||||||
# Host block, so IdentityFile applies to git remotes and flake inputs
|
|
||||||
# alike.
|
|
||||||
t3SshConfig = pkgs.writeText "t3-gitea-ssh-config" ''
|
|
||||||
Host code.m3ta.dev
|
|
||||||
User gitea
|
|
||||||
IdentityFile ${cockpitHome}/.ssh/gitea
|
|
||||||
IdentitiesOnly yes
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Mirror ~/.agents/skills → ~/.claude/skills so Claude Code sees the
|
|
||||||
# same skills OpenCode does. Per-skill symlinks: Claude's own entries
|
|
||||||
# and hand-made skills stay untouched, vanished skills get unlinked.
|
|
||||||
claudeSkillsSync = pkgs.writeShellApplication {
|
|
||||||
name = "t3-claude-skills-sync";
|
|
||||||
runtimeInputs = [pkgs.coreutils];
|
|
||||||
text = ''
|
|
||||||
src="${cockpitHome}/.agents/skills"
|
|
||||||
dst="${cockpitHome}/.claude/skills"
|
|
||||||
mkdir -p "$src" "$dst"
|
|
||||||
|
|
||||||
# Drop links whose target is gone.
|
|
||||||
for link in "$dst"/*; do
|
|
||||||
[ -L "$link" ] || continue
|
|
||||||
case "$(readlink "$link")" in
|
|
||||||
"$src"/*) [ -e "$link" ] || rm -f "$link" ;;
|
|
||||||
esac
|
|
||||||
done
|
|
||||||
|
|
||||||
# Link every skill folder; never replace a real dir or foreign link.
|
|
||||||
for skill in "$src"/*/; do
|
|
||||||
skill="''${skill%/}"
|
|
||||||
[ -f "$skill/SKILL.md" ] || continue
|
|
||||||
name="$(basename "$skill")"
|
|
||||||
target="$dst/$name"
|
|
||||||
if [ -L "$target" ] || [ ! -e "$target" ]; then
|
|
||||||
ln -sfn "$skill" "$target"
|
|
||||||
fi
|
|
||||||
done
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
# CLI on the system for interactive admin (t3 pair, t3 service status)
|
|
||||||
# plus the harnesses T3 Code orchestrates. Login shells need them for
|
|
||||||
# the one-time auth flows documented in the header. agent-lib enables
|
|
||||||
# interactive syncs by the cockpit user (`agent-lib sync` / `status`).
|
|
||||||
environment.systemPackages = [
|
|
||||||
pkgs.llm-agents.t3code
|
|
||||||
pkgs.llm-agents.opencode2
|
|
||||||
pkgs.llm-agents.claude-code
|
|
||||||
pkgs.llm-agents.beads
|
|
||||||
pkgs.agent-lib
|
|
||||||
];
|
|
||||||
|
|
||||||
# ── T3 Code server (m3ta-home module, cockpit user) ─────────────────
|
|
||||||
# The harnesses, git and beads for the agents come from the system
|
|
||||||
# profile above (the module puts /run/current-system/sw on the path).
|
|
||||||
m3ta.t3code = {
|
|
||||||
enable = true;
|
|
||||||
user = cockpitUser;
|
|
||||||
port = config.m3ta.ports.get "t3code";
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Gitea (code.m3ta.dev) for the T3 lane ────────────────────────────
|
|
||||||
# Host key pinned system-wide: non-interactive SSH (git clone, nix
|
|
||||||
# flake git+ssh inputs) works for every user without a first-connect
|
|
||||||
# prompt. Read-only fact, safe to share across users.
|
|
||||||
environment.etc."ssh/ssh_known_hosts".text = ''
|
|
||||||
code.m3ta.dev ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFmmqZ4GgDEXJgj8uYrZAr/EoLIA6LJGkTIyKGQD/60a
|
|
||||||
'';
|
|
||||||
|
|
||||||
# Per-user SSH config (User gitea + key, see t3SshConfig). NOTE: L+
|
|
||||||
# replaces a pre-existing real file — none existed at PR time. If
|
|
||||||
# m3tam3re ever grows his own ssh config here, fold the Host block in
|
|
||||||
# by hand and drop this rule.
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d ${cockpitHome}/.ssh 0700 ${cockpitUser} users -"
|
|
||||||
"L+ ${cockpitHome}/.ssh/config - - - - ${t3SshConfig}"
|
|
||||||
# The fleet-wide key path the T3 package expects (see t3code-agent-identity).
|
|
||||||
"L+ ${cockpitHome}/.ssh/m3ta-chiron - - - - ${cockpitHome}/.ssh/gitea"
|
|
||||||
];
|
|
||||||
|
|
||||||
# ── agent-lib v2 client: skills/commands/agents for the harnesses ────
|
|
||||||
# Fleet rollout pattern (agent-lib docs/fleet-handoff.md): one
|
|
||||||
# admin-protected config at /etc/agent-lib/config.json, root-owned and
|
|
||||||
# world-readable (mode 0644 by default). The work repo is anonymously
|
|
||||||
# readable over HTTPS (verified 2026-10-31) — no token in the config.
|
|
||||||
environment.etc."agent-lib/config.json".text =
|
|
||||||
builtins.toJSON {repo_url = "https://code.m3ta.dev/m3tam3re/agent-prod.git";};
|
|
||||||
|
|
||||||
# Sync runs in the cockpit user's context (deployment targets resolve
|
|
||||||
# against $HOME) and mirrors skills into Claude Code right after.
|
|
||||||
systemd.services.agent-lib-sync = {
|
|
||||||
description = "agent-lib sync — deploy work repo into T3 agent runtime paths";
|
|
||||||
after = ["network-online.target"];
|
|
||||||
wants = ["network-online.target"];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
User = cockpitUser;
|
|
||||||
Group = "users";
|
|
||||||
ExecStart = "${pkgs.agent-lib}/bin/agent-lib sync";
|
|
||||||
ExecStartPost = "${claudeSkillsSync}/bin/t3-claude-skills-sync";
|
|
||||||
};
|
|
||||||
environment.HOME = cockpitHome;
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.timers.agent-lib-sync = {
|
|
||||||
description = "agent-lib sync every 2h (skills for T3 Code agents)";
|
|
||||||
wantedBy = ["timers.target"];
|
|
||||||
timerConfig = {
|
|
||||||
OnBootSec = "5min";
|
|
||||||
OnUnitActiveSec = "2h";
|
|
||||||
Persistent = true;
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Catch manual `agent-lib sync` runs by the cockpit user as well.
|
|
||||||
systemd.paths.t3-claude-skills-sync = {
|
|
||||||
description = "Watch ~/.agents/skills for changes (mirror to Claude Code)";
|
|
||||||
wantedBy = ["multi-user.target"];
|
|
||||||
pathConfig.PathChanged = "${cockpitHome}/.agents/skills";
|
|
||||||
};
|
|
||||||
|
|
||||||
systemd.services.t3-claude-skills-sync = {
|
|
||||||
description = "Mirror ~/.agents/skills into ~/.claude/skills (Claude Code)";
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
User = cockpitUser;
|
|
||||||
Group = "users";
|
|
||||||
ExecStart = "${claudeSkillsSync}/bin/t3-claude-skills-sync";
|
|
||||||
};
|
|
||||||
environment.HOME = cockpitHome;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
@@ -1,11 +1,7 @@
|
|||||||
# Edit this configuration file to define what should be installed on
|
# Edit this configuration file to define what should be installed on
|
||||||
# your system. Help is available in the configuration.nix(5) man page, on
|
# your system. Help is available in the configuration.nix(5) man page, on
|
||||||
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
# https://search.nixos.org/options and in the NixOS manual (`nixos-help`).
|
||||||
{
|
{pkgs, ...}: {
|
||||||
config,
|
|
||||||
pkgs,
|
|
||||||
...
|
|
||||||
}: {
|
|
||||||
imports = [
|
imports = [
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
@@ -14,15 +10,14 @@
|
|||||||
# Use the systemd-boot EFI boot loader.
|
# Use the systemd-boot EFI boot loader.
|
||||||
boot.supportedFilesystems = ["zfs"];
|
boot.supportedFilesystems = ["zfs"];
|
||||||
boot.zfs.package = pkgs.zfs_unstable;
|
boot.zfs.package = pkgs.zfs_unstable;
|
||||||
boot.zfs.forceImportAll = false;
|
boot.zfs.forceImportAll = true;
|
||||||
boot.zfs.forceImportRoot = false;
|
|
||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = true;
|
boot.loader.efi.canTouchEfiVariables = true;
|
||||||
boot.initrd.kernelModules = ["amdgpu"];
|
boot.initrd.kernelModules = ["amdgpu"];
|
||||||
|
boot.kernelPackages = pkgs.linuxPackages_6_18;
|
||||||
services.xserver.videoDrivers = ["amdgpu"];
|
services.xserver.videoDrivers = ["amdgpu"];
|
||||||
security.polkit.enable = true;
|
security.polkit.enable = true;
|
||||||
# No display manager — keyring unlocks at TTY login instead.
|
security.pam.services.gdm.enableGnomeKeyring = true;
|
||||||
security.pam.services.login.enableGnomeKeyring = true;
|
|
||||||
networking.hostName = "m3-kratos"; # Define your hostname.
|
networking.hostName = "m3-kratos"; # Define your hostname.
|
||||||
networking.hostId = "458bd616";
|
networking.hostId = "458bd616";
|
||||||
# networking.extraHosts = ''
|
# networking.extraHosts = ''
|
||||||
|
|||||||
@@ -43,13 +43,11 @@
|
|||||||
];
|
];
|
||||||
|
|
||||||
extraServices = {
|
extraServices = {
|
||||||
colmenaDeploy.enable = true;
|
|
||||||
flatpak.enable = true;
|
flatpak.enable = true;
|
||||||
ollama.enable = true;
|
ollama.enable = true;
|
||||||
podman.enable = true;
|
podman.enable = true;
|
||||||
virtualisation.enable = true;
|
virtualisation.enable = true;
|
||||||
};
|
};
|
||||||
services.power-profiles-daemon.enable = true;
|
|
||||||
services.ollama = {
|
services.ollama = {
|
||||||
environmentVariables = {
|
environmentVariables = {
|
||||||
# HCC_AMDGPU_TARGET = "gfx1103";
|
# HCC_AMDGPU_TARGET = "gfx1103";
|
||||||
|
|||||||
+19
-81
@@ -7,22 +7,10 @@
|
|||||||
lib,
|
lib,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
with lib; let
|
with lib; {
|
||||||
mkEnvVar = name: value: {
|
|
||||||
_args = [
|
|
||||||
name
|
|
||||||
value
|
|
||||||
];
|
|
||||||
};
|
|
||||||
in {
|
|
||||||
imports = [
|
|
||||||
];
|
|
||||||
|
|
||||||
config = mkMerge [
|
config = mkMerge [
|
||||||
# ── XDG / MIME defaults ──
|
# ── XDG / MIME defaults ──
|
||||||
{
|
{
|
||||||
qt.platformTheme.name = mkForce "qtct";
|
|
||||||
|
|
||||||
xdg = {
|
xdg = {
|
||||||
enable = true;
|
enable = true;
|
||||||
configFile."mimeapps.list".force = true;
|
configFile."mimeapps.list".force = true;
|
||||||
@@ -53,76 +41,26 @@ in {
|
|||||||
wayland.windowManager.hyprland = {
|
wayland.windowManager.hyprland = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
workspace_rule = [
|
monitor = [
|
||||||
{
|
"DP-1,2560x1440@144,0x0,1"
|
||||||
workspace = "1";
|
"DP-2,2560x1440@144,2560x0,1"
|
||||||
monitor = "DP-1";
|
|
||||||
default = true;
|
|
||||||
}
|
|
||||||
{
|
|
||||||
workspace = "2";
|
|
||||||
monitor = "DP-1";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
workspace = "3";
|
|
||||||
monitor = "DP-1";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
workspace = "4";
|
|
||||||
monitor = "DP-2";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
workspace = "5";
|
|
||||||
monitor = "DP-2";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
workspace = "6";
|
|
||||||
monitor = "DP-2";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
workspace = "7";
|
|
||||||
monitor = "DP-2";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
# m3ta-home sets QT_QPA_PLATFORMTHEME to gtk3 globally for Hyprland.
|
workspace = [
|
||||||
# ksnip crashes with duplicate GDK type registration under that Qt GTK
|
"1, monitor:DP-1, default:true"
|
||||||
# platform theme, so use qtct for Qt apps on this host instead.
|
"2, monitor:DP-1"
|
||||||
"env" = mkForce [
|
"3, monitor:DP-1"
|
||||||
(mkEnvVar "XCURSOR_SIZE" "32")
|
"4, monitor:DP-2"
|
||||||
(mkEnvVar "HYPRCURSOR_THEME" "Bibata-Modern-Ice")
|
"5, monitor:DP-2"
|
||||||
(mkEnvVar "WLR_NO_HARDWARE_CURSORS" "1")
|
"6, monitor:DP-2"
|
||||||
(mkEnvVar "XDG_CURRENT_DESKTOP" "Hyprland")
|
"7, monitor:DP-2"
|
||||||
(mkEnvVar "XDG_SESSION_TYPE" "wayland")
|
|
||||||
(mkEnvVar "XDG_SESSION_DESKTOP" "Hyprland")
|
|
||||||
(mkEnvVar "XKB_DEFAULT_LAYOUT" "de")
|
|
||||||
(mkEnvVar "NIXOS_OZONE_WL" "1")
|
|
||||||
(mkEnvVar "QT_QPA_PLATFORM" "wayland;xcb")
|
|
||||||
(mkEnvVar "QT_QPA_PLATFORMTHEME" "qt5ct")
|
|
||||||
(mkEnvVar "QT_QPA_PLATFORMTHEME_QT6" "qt6ct")
|
|
||||||
];
|
];
|
||||||
window_rule = [
|
windowrule = [
|
||||||
{
|
"match:class dev.zed.Zed, workspace 1"
|
||||||
match.class = "dev.zed.Zed";
|
"match:class Msty, workspace 1"
|
||||||
workspace = "1";
|
"match:class ^(com.obsproject.Studio)$, workspace 2"
|
||||||
}
|
"match:class ^(brave-browser)$, workspace 4, opacity 1.0"
|
||||||
{
|
"match:class ^(vivaldi-stable)$, workspace 4, opacity 1.0"
|
||||||
match.class = "^(com.obsproject.Studio)$";
|
"match:class ^steam_app_\\d+$, idle_inhibit focus"
|
||||||
workspace = "2";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
match.class = "^(brave-browser)$";
|
|
||||||
workspace = "4";
|
|
||||||
opacity = "1.0";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
match.class = "^(vivaldi-stable)$";
|
|
||||||
workspace = "4";
|
|
||||||
opacity = "1.0";
|
|
||||||
}
|
|
||||||
{
|
|
||||||
match.class = "^steam_app_\\d+$";
|
|
||||||
idle_inhibit = "focus";
|
|
||||||
}
|
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -19,7 +19,6 @@
|
|||||||
dedicatedServer.openFirewall = true;
|
dedicatedServer.openFirewall = true;
|
||||||
gamescopeSession.enable = true;
|
gamescopeSession.enable = true;
|
||||||
};
|
};
|
||||||
programs.localsend.enable = true;
|
|
||||||
programs.obs-studio = {
|
programs.obs-studio = {
|
||||||
enable = true;
|
enable = true;
|
||||||
enableVirtualCamera = true;
|
enableVirtualCamera = true;
|
||||||
@@ -31,6 +30,7 @@
|
|||||||
wlrobs
|
wlrobs
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
programs.fish.enable = true;
|
||||||
programs.thunar = {
|
programs.thunar = {
|
||||||
enable = true;
|
enable = true;
|
||||||
plugins = with pkgs; [thunar-archive-plugin thunar-volman];
|
plugins = with pkgs; [thunar-archive-plugin thunar-volman];
|
||||||
@@ -45,7 +45,6 @@
|
|||||||
enable = true;
|
enable = true;
|
||||||
clean.enable = true;
|
clean.enable = true;
|
||||||
clean.extraArgs = "--keep-since 4d --keep 3";
|
clean.extraArgs = "--keep-since 4d --keep 3";
|
||||||
flake = "/home/m3tam3re/p/NIX/nixos-config";
|
flake = "/home/m3tam3re/p/nixos/nixos-config";
|
||||||
};
|
};
|
||||||
programs.mosh.enable = true;
|
|
||||||
}
|
}
|
||||||
@@ -1,23 +1,11 @@
|
|||||||
{
|
{
|
||||||
age = {
|
age = {
|
||||||
secrets = {
|
secrets = {
|
||||||
agent-gitea-token-m3ta = {
|
|
||||||
file = ../../secrets/agent-gitea-token-m3ta.age;
|
|
||||||
owner = "m3tam3re";
|
|
||||||
};
|
|
||||||
agent-gitea-token-az = {
|
|
||||||
file = ../../secrets/agent-gitea-token-az.age;
|
|
||||||
owner = "m3tam3re";
|
|
||||||
};
|
|
||||||
anytype-key = {
|
anytype-key = {
|
||||||
file = ../../secrets/anytype-key.age;
|
file = ../../secrets/anytype-key.age;
|
||||||
owner = "m3tam3re";
|
owner = "m3tam3re";
|
||||||
};
|
};
|
||||||
tailscale-key = {file = ../../secrets/tailscale-key.age;};
|
tailscale-key = {file = ../../secrets/tailscale-key.age;};
|
||||||
ai-memory-token = {
|
|
||||||
file = ../../secrets/ai-memory-token-kratos.age;
|
|
||||||
owner = "m3tam3re";
|
|
||||||
};
|
|
||||||
wg-DE = {
|
wg-DE = {
|
||||||
file = ../../secrets/wg-DE.age;
|
file = ../../secrets/wg-DE.age;
|
||||||
path = "/etc/wireguard/DE.conf";
|
path = "/etc/wireguard/DE.conf";
|
||||||
|
|||||||
@@ -1,12 +1,12 @@
|
|||||||
{pkgs, ...}: {
|
{pkgs, ...}: {
|
||||||
imports = [
|
imports = [
|
||||||
./containers
|
./containers
|
||||||
# ./mem0.nix
|
./hermes-agent.nix
|
||||||
|
./mem0.nix
|
||||||
# ./n8n.nix
|
# ./n8n.nix
|
||||||
./netbird.nix
|
./netbird.nix
|
||||||
./postgres.nix
|
./postgres.nix
|
||||||
./sound.nix
|
./sound.nix
|
||||||
./t3code.nix
|
|
||||||
./udev.nix
|
./udev.nix
|
||||||
./wireguard.nix
|
./wireguard.nix
|
||||||
];
|
];
|
||||||
@@ -20,18 +20,16 @@
|
|||||||
gvfs.enable = true;
|
gvfs.enable = true;
|
||||||
trezord.enable = true;
|
trezord.enable = true;
|
||||||
gnome.gnome-keyring.enable = true;
|
gnome.gnome-keyring.enable = true;
|
||||||
accounts-daemon.enable = true;
|
qdrant.enable = true;
|
||||||
# qdrant.enable = true;
|
|
||||||
avahi = {
|
avahi = {
|
||||||
enable = true;
|
enable = true;
|
||||||
nssmdns4 = true;
|
nssmdns4 = true;
|
||||||
# Native Form (publish.* legacy-Optionen sind renamed/obsolete):
|
publish = {
|
||||||
settings.publish = {
|
addresses = true;
|
||||||
disable-publishing = false;
|
workstation = true;
|
||||||
disable-user-service-publishing = false;
|
userServices = true;
|
||||||
publish-addresses = true;
|
|
||||||
publish-workstation = true;
|
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
displayManager.gdm.enable = true;
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
@@ -0,0 +1,184 @@
|
|||||||
|
{config, ...}: let
|
||||||
|
# Default ElevenLabs voice: Bella (German-capable female)
|
||||||
|
elevenlabsVoiceId = "hpp4J3VqNfWAUOO0d1Us";
|
||||||
|
in {
|
||||||
|
services.hermes-agent = {
|
||||||
|
enable = true;
|
||||||
|
addToSystemPackages = true;
|
||||||
|
|
||||||
|
# Secrets via agenix
|
||||||
|
environmentFiles = [config.age.secrets."hermes-env".path];
|
||||||
|
|
||||||
|
# Non-secret environment variables
|
||||||
|
environment = {
|
||||||
|
GLM_BASE_URL = "https://api.z.ai/api/coding/paas/v4/";
|
||||||
|
};
|
||||||
|
|
||||||
|
settings = {
|
||||||
|
# ── Model ──────────────────────────────────────────────────────────
|
||||||
|
model = {
|
||||||
|
default = "glm-5.1";
|
||||||
|
provider = "zai";
|
||||||
|
};
|
||||||
|
|
||||||
|
credential_pool_strategies = {
|
||||||
|
zai = "fill_first";
|
||||||
|
};
|
||||||
|
|
||||||
|
toolsets = ["all"];
|
||||||
|
|
||||||
|
# ── Agent ──────────────────────────────────────────────────────────
|
||||||
|
agent = {
|
||||||
|
max_turns = 90;
|
||||||
|
gateway_timeout = 1800;
|
||||||
|
tool_use_enforcement = "auto";
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Terminal ───────────────────────────────────────────────────────
|
||||||
|
terminal = {
|
||||||
|
backend = "ssh";
|
||||||
|
modal_mode = "auto";
|
||||||
|
cwd = ".";
|
||||||
|
timeout = 180;
|
||||||
|
persistent_shell = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Browser ────────────────────────────────────────────────────────
|
||||||
|
browser = {
|
||||||
|
inactivity_timeout = 120;
|
||||||
|
command_timeout = 30;
|
||||||
|
cloud_provider = "local";
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Checkpoints / Compression ──────────────────────────────────────
|
||||||
|
checkpoints = {
|
||||||
|
enabled = true;
|
||||||
|
max_snapshots = 50;
|
||||||
|
};
|
||||||
|
|
||||||
|
file_read_max_chars = 100000;
|
||||||
|
|
||||||
|
compression = {
|
||||||
|
enabled = true;
|
||||||
|
threshold = 0.5;
|
||||||
|
target_ratio = 0.2;
|
||||||
|
protect_last_n = 20;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Display ────────────────────────────────────────────────────────
|
||||||
|
display = {
|
||||||
|
compact = false;
|
||||||
|
personality = "kawaii";
|
||||||
|
resume_display = "full";
|
||||||
|
busy_input_mode = "interrupt";
|
||||||
|
inline_diffs = true;
|
||||||
|
skin = "default";
|
||||||
|
tool_progress = "all";
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── TTS / STT / Voice ──────────────────────────────────────────────
|
||||||
|
tts = {
|
||||||
|
provider = "elevenlabs";
|
||||||
|
elevenlabs = {
|
||||||
|
voice_id = elevenlabsVoiceId;
|
||||||
|
model_id = "eleven_multilingual_v2";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
stt = {
|
||||||
|
enabled = true;
|
||||||
|
provider = "local";
|
||||||
|
local = {model = "base";};
|
||||||
|
};
|
||||||
|
|
||||||
|
voice = {
|
||||||
|
record_key = "ctrl+b";
|
||||||
|
max_recording_seconds = 120;
|
||||||
|
silence_threshold = 200;
|
||||||
|
silence_duration = 3.0;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Memory ─────────────────────────────────────────────────────────
|
||||||
|
memory = {
|
||||||
|
memory_enabled = true;
|
||||||
|
user_profile_enabled = true;
|
||||||
|
memory_char_limit = 2200;
|
||||||
|
user_char_limit = 1375;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Delegation ─────────────────────────────────────────────────────
|
||||||
|
delegation = {
|
||||||
|
max_iterations = 50;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Discord ────────────────────────────────────────────────────────
|
||||||
|
discord = {
|
||||||
|
require_mention = true;
|
||||||
|
auto_thread = true;
|
||||||
|
reactions = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Approvals / Security ───────────────────────────────────────────
|
||||||
|
approvals = {
|
||||||
|
mode = "manual";
|
||||||
|
timeout = 60;
|
||||||
|
};
|
||||||
|
|
||||||
|
security = {
|
||||||
|
redact_secrets = true;
|
||||||
|
tirith_enabled = true;
|
||||||
|
tirith_fail_open = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Cron / Session ─────────────────────────────────────────────────
|
||||||
|
cron = {wrap_response = true;};
|
||||||
|
|
||||||
|
session_reset = {
|
||||||
|
mode = "both";
|
||||||
|
idle_minutes = 1440;
|
||||||
|
at_hour = 4;
|
||||||
|
};
|
||||||
|
|
||||||
|
# ── Web ────────────────────────────────────────────────────────────
|
||||||
|
web = {backend = "exa";};
|
||||||
|
|
||||||
|
# ── Platform Toolsets ──────────────────────────────────────────────
|
||||||
|
platform_toolsets = {
|
||||||
|
cli = [
|
||||||
|
"browser"
|
||||||
|
"clarify"
|
||||||
|
"code_execution"
|
||||||
|
"cronjob"
|
||||||
|
"delegation"
|
||||||
|
"file"
|
||||||
|
"image_gen"
|
||||||
|
"memory"
|
||||||
|
"session_search"
|
||||||
|
"skills"
|
||||||
|
"terminal"
|
||||||
|
"todo"
|
||||||
|
"tts"
|
||||||
|
"vision"
|
||||||
|
"web"
|
||||||
|
];
|
||||||
|
telegram = [
|
||||||
|
"browser"
|
||||||
|
"clarify"
|
||||||
|
"code_execution"
|
||||||
|
"cronjob"
|
||||||
|
"delegation"
|
||||||
|
"file"
|
||||||
|
"image_gen"
|
||||||
|
"memory"
|
||||||
|
"session_search"
|
||||||
|
"skills"
|
||||||
|
"terminal"
|
||||||
|
"todo"
|
||||||
|
"tts"
|
||||||
|
"vision"
|
||||||
|
"web"
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -1,10 +1,13 @@
|
|||||||
{
|
{lib, ...}: {
|
||||||
services.n8n = {
|
services.n8n = {
|
||||||
enable = true;
|
enable = false;
|
||||||
openFirewall = true;
|
openFirewall = true;
|
||||||
environment = {
|
environment = {
|
||||||
N8N_SECURE_COOKIE = "false";
|
N8N_SECURE_COOKIE = "false";
|
||||||
N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = "false";
|
N8N_ENFORCE_SETTINGS_FILE_PERMISSIONS = "false";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
# Temporary fix for upstream module
|
||||||
|
systemd.services.n8n.serviceConfig.LoadCredential = lib.mkForce [];
|
||||||
|
systemd.services.n8n.environment.N8N_RUNNERS_AUTH_TOKEN_FILE = lib.mkForce null;
|
||||||
}
|
}
|
||||||
@@ -1,7 +0,0 @@
|
|||||||
{config, ...}: {
|
|
||||||
m3ta.t3code = {
|
|
||||||
enable = true;
|
|
||||||
user = "m3tam3re";
|
|
||||||
port = config.m3ta.ports.get "t3code";
|
|
||||||
};
|
|
||||||
}
|
|
||||||
+1
-1
@@ -1,3 +1,3 @@
|
|||||||
{"id":"home-profile-restructuring-edz","title":"Create copy-hermes-skills systemd service","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":1,"created_at":"2026-04-26T12:30:10Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:44:42Z","started_at":"2026-04-26T12:36:30Z","closed_at":"2026-04-26T12:44:42Z","close_reason":"Created systemd service in hosts/m3-hermes/services/hermes-agent.nix - copies skills to /var/lib/hermes/.agents/skills before hermes-agent starts","labels":["hermes-agent","nixos"],"dependencies":[{"issue_id":"home-profile-restructuring-edz","depends_on_id":"home-profile-restructuring-ycz","type":"blocks","created_at":"2026-04-26T14:30:57Z","created_by":"m3tm3re","metadata":"{}"}],"dependency_count":1,"dependent_count":1,"comment_count":0}
|
{"id":"home-profile-restructuring-edz","title":"Create copy-hermes-skills systemd service","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":1,"created_at":"2026-04-26T12:30:10Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:44:42Z","started_at":"2026-04-26T12:36:30Z","closed_at":"2026-04-26T12:44:42Z","close_reason":"Created systemd service in hosts/m3-hermes/services/hermes-agent.nix - copies skills to /var/lib/hermes/.agents/skills before hermes-agent starts","labels":["hermes-agent","nixos"],"dependencies":[{"issue_id":"home-profile-restructuring-edz","depends_on_id":"home-profile-restructuring-ycz","type":"blocks","created_at":"2026-04-26T14:30:57Z","created_by":"m3tm3re","metadata":"{}"}],"dependency_count":1,"dependent_count":1,"comment_count":0}
|
||||||
{"id":"home-profile-restructuring-ycz","title":"Build hermes-agent skills using mkSkills","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":2,"created_at":"2026-04-26T12:30:09Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:35:15Z","started_at":"2026-04-26T12:31:35Z","closed_at":"2026-04-26T12:35:15Z","close_reason":"Added inputs to module signature and defined hermesSkills via inputs.agents.lib.mkSkills with basecamp, anthropic, and kestra external skills. Verified with nixos-rebuild dry-run --flake .#m3-hermes (no errors).","labels":["hermes-agent","nixos"],"dependency_count":0,"dependent_count":1,"comment_count":0}
|
{"id":"home-profile-restructuring-ycz","title":"Build hermes-agent skills using mkOpencodeSkills","status":"closed","priority":1,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":2,"created_at":"2026-04-26T12:30:09Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:35:15Z","started_at":"2026-04-26T12:31:35Z","closed_at":"2026-04-26T12:35:15Z","close_reason":"Added inputs to module signature and defined hermesSkills via inputs.agents.lib.mkOpencodeSkills with basecamp, anthropic, and kestra external skills. Verified with nixos-rebuild dry-run --flake .#m3-hermes (no errors).","labels":["hermes-agent","nixos"],"dependency_count":0,"dependent_count":1,"comment_count":0}
|
||||||
{"id":"home-profile-restructuring-cxa","title":"Verify skills available at /var/lib/hermes/.agents/skills","status":"closed","priority":2,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":1,"created_at":"2026-04-26T12:30:10Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:50:58Z","started_at":"2026-04-26T12:38:15Z","closed_at":"2026-04-26T12:50:58Z","close_reason":"Manually verified - skills are present at /var/lib/hermes/.agents/skills on m3-hermes","labels":["hermes-agent","testing"],"dependencies":[{"issue_id":"home-profile-restructuring-cxa","depends_on_id":"home-profile-restructuring-edz","type":"blocks","created_at":"2026-04-26T14:30:57Z","created_by":"m3tm3re","metadata":"{}"}],"dependency_count":1,"dependent_count":0,"comment_count":0}
|
{"id":"home-profile-restructuring-cxa","title":"Verify skills available at /var/lib/hermes/.agents/skills","status":"closed","priority":2,"issue_type":"task","assignee":"m3tm3re","owner":"p@m3ta.dev","estimated_minutes":1,"created_at":"2026-04-26T12:30:10Z","created_by":"m3tm3re","updated_at":"2026-04-26T12:50:58Z","started_at":"2026-04-26T12:38:15Z","closed_at":"2026-04-26T12:50:58Z","close_reason":"Manually verified - skills are present at /var/lib/hermes/.agents/skills on m3-hermes","labels":["hermes-agent","testing"],"dependencies":[{"issue_id":"home-profile-restructuring-cxa","depends_on_id":"home-profile-restructuring-edz","type":"blocks","created_at":"2026-04-26T14:30:57Z","created_by":"m3tm3re","metadata":"{}"}],"dependency_count":1,"dependent_count":0,"comment_count":0}
|
||||||
+35
-85
@@ -8,78 +8,29 @@
|
|||||||
# You can change versions, add patches, set compilation flags, anything really.
|
# You can change versions, add patches, set compilation flags, anything really.
|
||||||
# https://nixos.wiki/wiki/Overlays
|
# https://nixos.wiki/wiki/Overlays
|
||||||
modifications = final: prev: {
|
modifications = final: prev: {
|
||||||
# aardvark-dns 2.x has a DNS forwarding bug breaking external name
|
# n8n = import ./mods/n8n.nix {inherit prev;};
|
||||||
# resolution in podman networks — pin to last 1.x from nixpkgs-stable.
|
|
||||||
aardvark-dns = import ./mods/aardvark-dns.nix {inherit (final) stable;};
|
|
||||||
|
|
||||||
# font-manager 0.9.4 does not compile against gtk4 4.22 (Vala errors
|
# brave = prev.brave.override {
|
||||||
# in Gtk.DragIcon.get_for_drag) — apply the upstream fix from
|
# commandLineArgs = "--password-store=gnome-libsecret";
|
||||||
# FontManager/font-manager#468 until our nixpkgs lock carries it.
|
# };
|
||||||
# font-manager = import ./mods/font-manager.nix {inherit prev;};
|
|
||||||
|
|
||||||
# rofi-pass{,-wayland} were removed from nixpkgs on 2026-09-04
|
# hyprpanel = inputs.hyprpanel.packages.${prev.system}.default.overrideAttrs (prev: {
|
||||||
# ("unmaintained upstream"). m3ta-home's rofi module and the Hyprland
|
# version = "latest"; # or whatever version you want
|
||||||
# mod+P keybind still use them — resurrect via overlay until a
|
# src = final.fetchFromGitHub {
|
||||||
# maintained replacement is packaged upstream.
|
# owner = "Jas-SinghFSU";
|
||||||
rofi-pass = final.callPackage ./mods/rofi-pass.nix {};
|
# repo = "HyprPanel";
|
||||||
rofi-pass-wayland = final.callPackage ./mods/rofi-pass.nix {backend = "wayland";};
|
# rev = "master"; # or a specific commit hash
|
||||||
# OpenCode v1 attribute names now point at the v2 packages (binary names
|
# hash = "sha256-l623fIVhVCU/ylbBmohAtQNbK0YrWlEny0sC/vBJ+dU=";
|
||||||
# stay `opencode2` / `opencode2-desktop`). Re-pinned after m3ta-nixpkgs'
|
# };
|
||||||
# overlay in the `ai-agents` overlay below.
|
# });
|
||||||
opencode = final.llm-agents.opencode2;
|
|
||||||
opencode-desktop = final.llm-agents.opencode2-desktop;
|
|
||||||
|
|
||||||
# nixpkgs#573479 (upstream fix on master, not yet in our lock): building
|
|
||||||
# khal's sphinx docs as separate "html" + "man" builders produces no man
|
|
||||||
# pages, so the declared man output never materializes → "failed to
|
|
||||||
# produce output path for output 'man'". Upstream builds "html man" in
|
|
||||||
# one invocation; mirror that until the lock advances past the fix.
|
|
||||||
khal = prev.khal.overrideAttrs (old: {
|
|
||||||
sphinxBuilders = ["html man"];
|
|
||||||
});
|
|
||||||
|
|
||||||
# Kernel 6.18 kbuild runs depmod during out-of-tree `modules_install`,
|
|
||||||
# which writes EMPTY depmod metadata (modules.builtin*, modules.dep, …)
|
|
||||||
# into module package outputs. The kernel's own non-empty files collide
|
|
||||||
# with them in the modules tree buildEnv (pkgs.aggregateModules →
|
|
||||||
# config.system.modulesTree): "two given paths contain a conflicting
|
|
||||||
# subpath: … modules.builtin.alias.bin". aggregateModules regenerates
|
|
||||||
# all metadata for the merged tree anyway, so the stray files are
|
|
||||||
# useless. Drop this overlay once nixpkgs carries a proper fix
|
|
||||||
# (checked: not in nixpkgs-master as of 2026-10-22).
|
|
||||||
linuxPackages = prev.linuxPackages.extend (_lpFinal: lpPrev: {
|
|
||||||
v4l2loopback = lpPrev.v4l2loopback.overrideAttrs (old: {
|
|
||||||
postInstall =
|
|
||||||
(old.postInstall or "")
|
|
||||||
+ ''
|
|
||||||
rm -f $out/lib/modules/*/modules.alias* \
|
|
||||||
$out/lib/modules/*/modules.builtin* \
|
|
||||||
$out/lib/modules/*/modules.dep* \
|
|
||||||
$out/lib/modules/*/modules.devname \
|
|
||||||
$out/lib/modules/*/modules.softdep \
|
|
||||||
$out/lib/modules/*/modules.symbols*
|
|
||||||
'';
|
|
||||||
});
|
|
||||||
});
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# Top-level pins for the OpenCode packages from llm-agents. Applied
|
temp-packages = final: _prev: {
|
||||||
# AFTER m3ta-nixpkgs' overlay in hosts/common/default.nix — that overlay
|
temp = import inputs.nixpkgs-9e9486b {
|
||||||
# re-exports `opencode-desktop` from its own `opencode` flake input
|
system = final.stdenv.hostPlatform.system;
|
||||||
# (github:anomalyco/opencode, v1 line), which would clobber a pin placed
|
config.allowUnfree = true;
|
||||||
# in `modifications`.
|
};
|
||||||
ai-agents = final: _prev: {
|
|
||||||
# OpenCode Desktop: v2 app (ai.opencode.desktop, 2.0.x) from llm-agents.
|
|
||||||
# Must stay AFTER m3ta-nixpkgs' overlay so the v1 re-export loses.
|
|
||||||
opencode-desktop = final.llm-agents.opencode2-desktop;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
# temp-packages = final: _prev: {
|
|
||||||
# temp = import inputs.nixpkgs-9e9486b {
|
|
||||||
# system = final.stdenv.hostPlatform.system;
|
|
||||||
# config.allowUnfree = true;
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
stable-packages = final: _prev: {
|
stable-packages = final: _prev: {
|
||||||
stable = import inputs.nixpkgs-stable {
|
stable = import inputs.nixpkgs-stable {
|
||||||
@@ -88,19 +39,19 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# pinned-packages = final: _prev: {
|
pinned-packages = final: _prev: {
|
||||||
# pinned = import inputs.nixpkgs-9472de4 {
|
pinned = import inputs.nixpkgs-9472de4 {
|
||||||
# system = final.stdenv.hostPlatform.system;
|
system = final.stdenv.hostPlatform.system;
|
||||||
# config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
# };
|
};
|
||||||
# };
|
};
|
||||||
|
|
||||||
# locked-packages = final: _prev: {
|
locked-packages = final: _prev: {
|
||||||
# locked = import inputs.nixpkgs-locked {
|
locked = import inputs.nixpkgs-locked {
|
||||||
# system = final.stdenv.hostPlatform.system;
|
system = final.stdenv.hostPlatform.system;
|
||||||
# config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
# };
|
};
|
||||||
# };
|
};
|
||||||
|
|
||||||
master-packages = final: _prev: {
|
master-packages = final: _prev: {
|
||||||
master = import inputs.nixpkgs-master {
|
master = import inputs.nixpkgs-master {
|
||||||
@@ -109,10 +60,9 @@
|
|||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# llm-agent packages (qmd, herdr, beads, …) come from
|
# Factory: not a proper overlay itself — takes system to avoid the infinite
|
||||||
# inputs.llm-agents.overlays.shared-nixpkgs, applied directly in
|
# recursion that occurs when accessing final/prev.system while the fixed-point
|
||||||
# hosts/common/default.nix. They are consumed via the `pkgs.llm-agents.*`
|
# is still being computed. Exposed via outputs.lib, not outputs.overlays.
|
||||||
# namespace — no flattening to top-level attributes (that clobbered
|
mkLlmAgentsOverlay = system: _final: _prev:
|
||||||
# nixpkgs attrs like buildNpmPackage/fetchPnpmDeps and needed a
|
inputs.llm-agents.packages.${system} or {};
|
||||||
# hard-to-maintain blocklist).
|
|
||||||
}
|
}
|
||||||
@@ -1,12 +0,0 @@
|
|||||||
# aardvark-dns pinned to the 1.x series.
|
|
||||||
#
|
|
||||||
# aardvark-dns 2.x has a DNS forwarding bug that breaks resolution of
|
|
||||||
# external hostnames in podman networks. 1.17.1 is the last 1.x release
|
|
||||||
# and is taken from nixpkgs-stable (nixos-26.05), which ships it together
|
|
||||||
# with netavark 1.17.2 — the same netavark version as our unstable input,
|
|
||||||
# so this is the exact upstream-tested combination.
|
|
||||||
#
|
|
||||||
# No further wiring needed: the nixpkgs podman package pulls aardvark-dns
|
|
||||||
# in via callPackage and symlinks it into libexec/podman (helpersBin), so
|
|
||||||
# overriding the top-level attribute propagates to podman automatically.
|
|
||||||
{stable}: stable.aardvark-dns
|
|
||||||
@@ -1,19 +0,0 @@
|
|||||||
# font-manager 0.9.4: fix compilation against gtk4 >= 4.22 / newer Vala.
|
|
||||||
#
|
|
||||||
# In GTK 4.22 the Gtk.DragIcon.get_for_drag binding changed in the gtk4
|
|
||||||
# vapi, turning `Gtk.DragIcon.get_for_drag(drag)` into a hard Vala error
|
|
||||||
# ("use `new' operator to create new objects") in Collections.vala and
|
|
||||||
# FontList.vala. 0.9.4 is the latest upstream release and even upstream
|
|
||||||
# master is unfixed; the fix lives in FontManager/font-manager#468 and is
|
|
||||||
# already carried as a patch by current nixpkgs master — but our locked
|
|
||||||
# nixpkgs (and the locked nixpkgs-master input) predate it.
|
|
||||||
#
|
|
||||||
# Drop this overlay (and the patch file) once our nixpkgs lock advances
|
|
||||||
# past nixpkgs@e2ad529-vendoring (pkgs/by-name/fo/font-manager carries
|
|
||||||
# fix-compilation-error-with-newer-vala-versions.patch).
|
|
||||||
{prev}:
|
|
||||||
prev.font-manager.overrideAttrs (old: {
|
|
||||||
patches =
|
|
||||||
(old.patches or [])
|
|
||||||
++ [./patches/font-manager-fix-compilation-error-with-newer-vala-versions.patch];
|
|
||||||
})
|
|
||||||
-37
@@ -1,37 +0,0 @@
|
|||||||
From e2ad529a88929bbc76906ac78260dacf4d8c8c6b Mon Sep 17 00:00:00 2001
|
|
||||||
From: Jan Baier <jan.baier@amagical.net>
|
|
||||||
Date: Fri, 1 May 2026 17:25:25 +0200
|
|
||||||
Subject: [PATCH] Fix compilation error with newer Vala versions
|
|
||||||
|
|
||||||
Fixes #467
|
|
||||||
---
|
|
||||||
src/font-manager/Collections.vala | 2 +-
|
|
||||||
src/font-manager/FontList.vala | 2 +-
|
|
||||||
2 files changed, 2 insertions(+), 2 deletions(-)
|
|
||||||
|
|
||||||
diff --git a/src/font-manager/Collections.vala b/src/font-manager/Collections.vala
|
|
||||||
index 5e7f5cdb..43531e54 100644
|
|
||||||
--- a/src/font-manager/Collections.vala
|
|
||||||
+++ b/src/font-manager/Collections.vala
|
|
||||||
@@ -523,7 +523,7 @@ namespace FontManager {
|
|
||||||
var row = ((CollectionListRow) source.widget);
|
|
||||||
var drag_icon = new Gtk.Label(row.item_label.label);
|
|
||||||
drag_icon.add_css_class("FontManagerListRowDrag");
|
|
||||||
- var gtk_drag_icon = (Gtk.DragIcon) Gtk.DragIcon.get_for_drag(drag);
|
|
||||||
+ var gtk_drag_icon = new Gtk.DragIcon.get_for_drag(drag);
|
|
||||||
gtk_drag_icon.set_child(drag_icon);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
diff --git a/src/font-manager/FontList.vala b/src/font-manager/FontList.vala
|
|
||||||
index c8b170cb..9720dc2b 100644
|
|
||||||
--- a/src/font-manager/FontList.vala
|
|
||||||
+++ b/src/font-manager/FontList.vala
|
|
||||||
@@ -669,7 +669,7 @@ namespace FontManager {
|
|
||||||
widget_set_name(drag_count, "FontManagerListDragCount");
|
|
||||||
drag_icon.add_overlay(drag_count);
|
|
||||||
drag_count.set_label(selected_items.length.to_string());
|
|
||||||
- var gtk_drag_icon = (Gtk.DragIcon) Gtk.DragIcon.get_for_drag(drag);
|
|
||||||
+ var gtk_drag_icon = new Gtk.DragIcon.get_for_drag(drag);
|
|
||||||
gtk_drag_icon.set_child(drag_icon);
|
|
||||||
return;
|
|
||||||
}
|
|
||||||
@@ -1,113 +0,0 @@
|
|||||||
# Resurrected from nixpkgs after upstream removal on 2026-09-04
|
|
||||||
# ("rofi-pass has been removed as it is unmaintained upstream").
|
|
||||||
# m3ta-home's rofi module (programs.rofi.pass.package) and the Hyprland
|
|
||||||
# mod+P keybind still rely on it. Pinned resurrection — no updateScript.
|
|
||||||
{
|
|
||||||
lib,
|
|
||||||
stdenv,
|
|
||||||
fetchFromGitHub,
|
|
||||||
makeBinaryWrapper,
|
|
||||||
coreutils,
|
|
||||||
util-linuxMinimal,
|
|
||||||
gnugrep,
|
|
||||||
libnotify,
|
|
||||||
pwgen,
|
|
||||||
findutils,
|
|
||||||
gawk,
|
|
||||||
gnused,
|
|
||||||
rofi,
|
|
||||||
# wayland-only deps
|
|
||||||
pass-wayland,
|
|
||||||
wl-clipboard,
|
|
||||||
wtype,
|
|
||||||
# x11-only deps
|
|
||||||
pass,
|
|
||||||
xclip,
|
|
||||||
xdotool,
|
|
||||||
# backend selector
|
|
||||||
backend ? "x11",
|
|
||||||
}:
|
|
||||||
assert lib.assertOneOf "backend" backend [
|
|
||||||
"x11"
|
|
||||||
"wayland"
|
|
||||||
];
|
|
||||||
stdenv.mkDerivation {
|
|
||||||
pname = "rofi-pass";
|
|
||||||
version = "2.0.2-unstable-2024-06-16";
|
|
||||||
|
|
||||||
src = fetchFromGitHub {
|
|
||||||
owner = "carnager";
|
|
||||||
repo = "rofi-pass";
|
|
||||||
rev = "37c4c862deb133a85b7d72989acfdbd2ef16b8ad";
|
|
||||||
hash = "sha256-1lPNj47vTPLBK7mVm+PngV8C/ZsjJ2EN4ffXGU2TlQo=";
|
|
||||||
};
|
|
||||||
|
|
||||||
nativeBuildInputs = [makeBinaryWrapper];
|
|
||||||
|
|
||||||
dontBuild = true;
|
|
||||||
|
|
||||||
installPhase = ''
|
|
||||||
runHook preInstall
|
|
||||||
|
|
||||||
mkdir -p $out/bin
|
|
||||||
cp -a rofi-pass $out/bin/rofi-pass
|
|
||||||
|
|
||||||
mkdir -p $out/share/doc/rofi-pass/
|
|
||||||
cp -a config.example $out/share/doc/rofi-pass/config.example
|
|
||||||
|
|
||||||
runHook postInstall
|
|
||||||
'';
|
|
||||||
|
|
||||||
wrapperPath = lib.makeBinPath (
|
|
||||||
[
|
|
||||||
coreutils
|
|
||||||
findutils
|
|
||||||
gawk
|
|
||||||
gnugrep
|
|
||||||
gnused
|
|
||||||
libnotify
|
|
||||||
pwgen
|
|
||||||
rofi
|
|
||||||
util-linuxMinimal
|
|
||||||
]
|
|
||||||
++ lib.optionals (backend == "x11") [
|
|
||||||
(pass.withExtensions (ext: [ext.pass-otp]))
|
|
||||||
xclip
|
|
||||||
xdotool
|
|
||||||
]
|
|
||||||
++ lib.optionals (backend == "wayland") [
|
|
||||||
(pass-wayland.withExtensions (ext: [ext.pass-otp]))
|
|
||||||
wl-clipboard
|
|
||||||
wtype
|
|
||||||
]
|
|
||||||
);
|
|
||||||
|
|
||||||
fixupPhase = ''
|
|
||||||
runHook preFixup
|
|
||||||
|
|
||||||
patchShebangs $out/bin
|
|
||||||
|
|
||||||
wrapProgram $out/bin/rofi-pass \
|
|
||||||
--prefix PATH : "$wrapperPath" \
|
|
||||||
--set-default ROFI_PASS_BACKEND ${
|
|
||||||
if backend == "wayland"
|
|
||||||
then "wtype"
|
|
||||||
else "xdotool"
|
|
||||||
} \
|
|
||||||
--set-default ROFI_PASS_CLIPBOARD_BACKEND ${
|
|
||||||
if backend == "wayland"
|
|
||||||
then "wl-clipboard"
|
|
||||||
else "xclip"
|
|
||||||
}
|
|
||||||
|
|
||||||
runHook postFixup
|
|
||||||
'';
|
|
||||||
|
|
||||||
meta = {
|
|
||||||
description = "Script to make rofi work with password-store";
|
|
||||||
mainProgram = "rofi-pass";
|
|
||||||
homepage = "https://github.com/carnager/rofi-pass";
|
|
||||||
license = lib.licenses.gpl3;
|
|
||||||
platforms = with lib.platforms; linux;
|
|
||||||
};
|
|
||||||
}
|
|
||||||
+6
-13
@@ -3,13 +3,13 @@ let
|
|||||||
m3-ares = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG+M4CygEQ29eTmLqgyIAFCxy0rgfO23klNiARBEA+3s";
|
m3-ares = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIG+M4CygEQ29eTmLqgyIAFCxy0rgfO23klNiARBEA+3s";
|
||||||
m3-kratos = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDl+LtFGsk/A7BvxwiUCyq5wjRzGtQSrBJzzLGxINF4O";
|
m3-kratos = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDl+LtFGsk/A7BvxwiUCyq5wjRzGtQSrBJzzLGxINF4O";
|
||||||
m3-helios = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIyHuLITpI+M45ZZem33wDusY2X988mBoWpD1HDeZNRJ";
|
m3-helios = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIIyHuLITpI+M45ZZem33wDusY2X988mBoWpD1HDeZNRJ";
|
||||||
m3-atlas = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFmmqZ4GgDEXJgj8uYrZAr/EoLIA6LJGkTIyKGQD/60a";
|
m3-atlas = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAINBYK1wsFkUPIb/lX1BH7+VyXmmGSbdEFHnvhAOcaC7H";
|
||||||
m3-hermes = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOXJ5y9u88KptDaG959Aj6eq0CCBePOw1SvEh/84wb4M";
|
m3-hermes = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIOXJ5y9u88KptDaG959Aj6eq0CCBePOw1SvEh/84wb4M";
|
||||||
|
|
||||||
# USERS
|
# USERS
|
||||||
m3ta-adm = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKCTBFMPCOpKerJBlcvH44602sGyJvgXrwYUegYf96D0";
|
m3tam3re = "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQC3YEmpYbM+cpmyD10tzNRHEn526Z3LJOzYpWEKdJg8DaYyPbDn9iyVX30Nja2SrW4Wadws0Y8DW+Urs25/wVB6mKl7jgPJVkMi5hfobu3XAz8gwSdjDzRSWJrhjynuaXiTtRYED2INbvjLuxx3X8coNwMw58OuUuw5kNJp5aS2qFmHEYQErQsGT4MNqESe3jvTP27Z5pSneBj45LmGK+RcaSnJe7hG+KRtjuhjI7RdzMeDCX73SfUsal+rHeuEw/mmjYmiIItXhFTDn8ZvVwpBKv7xsJG90DkaX2vaTk0wgJdMnpVIuIRBa4EkmMWOQ3bMLGkLQeK/4FUkNcvQ/4+zcZsg4cY9Q7Fj55DD41hAUdF6SYODtn5qMPsTCnJz44glHt/oseKXMSd556NIw2HOvihbJW7Rwl4OEjGaO/dF4nUw4c9tHWmMn9dLslAVpUuZOb7ykgP0jk79ldT3Dv+2Hj0CdAWT2cJAdFX58KQ9jUPT3tBnObSF1lGMI7t77VU=";
|
||||||
sascha.koenig = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEZbg/Z9mnflXuLahGY8WOSBMqbgeqVIkIwRkquys1Ml";
|
sascha.koenig = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIEZbg/Z9mnflXuLahGY8WOSBMqbgeqVIkIwRkquys1Ml";
|
||||||
users = [m3ta-adm sascha.koenig];
|
users = [m3tam3re sascha.koenig];
|
||||||
|
|
||||||
systems = [m3-atlas m3-ares m3-helios m3-kratos m3-hermes];
|
systems = [m3-atlas m3-ares m3-helios m3-kratos m3-hermes];
|
||||||
in {
|
in {
|
||||||
@@ -23,7 +23,8 @@ in {
|
|||||||
"secrets/kestra-config.age".publicKeys = systems ++ users;
|
"secrets/kestra-config.age".publicKeys = systems ++ users;
|
||||||
"secrets/kestra-env.age".publicKeys = systems ++ users;
|
"secrets/kestra-env.age".publicKeys = systems ++ users;
|
||||||
"secrets/minio-root-cred.age".publicKeys = systems ++ users;
|
"secrets/minio-root-cred.age".publicKeys = systems ++ users;
|
||||||
"secrets/rustfs-env.age".publicKeys = systems ++ users;
|
"secrets/rustfs-access-key.age".publicKeys = systems ++ users;
|
||||||
|
"secrets/rustfs-secret-key.age".publicKeys = systems ++ users;
|
||||||
"secrets/n8n-env.age".publicKeys = systems ++ users;
|
"secrets/n8n-env.age".publicKeys = systems ++ users;
|
||||||
"secrets/netbird-auth-secret.age".publicKeys = systems ++ users;
|
"secrets/netbird-auth-secret.age".publicKeys = systems ++ users;
|
||||||
"secrets/netbird-db-password.age".publicKeys = systems ++ users;
|
"secrets/netbird-db-password.age".publicKeys = systems ++ users;
|
||||||
@@ -37,9 +38,6 @@ in {
|
|||||||
"secrets/basecamp-client-id.age".publicKeys = systems ++ users;
|
"secrets/basecamp-client-id.age".publicKeys = systems ++ users;
|
||||||
"secrets/basecamp-client-secret.age".publicKeys = systems ++ users;
|
"secrets/basecamp-client-secret.age".publicKeys = systems ++ users;
|
||||||
"secrets/gitea-runner-token.age".publicKeys = systems ++ users;
|
"secrets/gitea-runner-token.age".publicKeys = systems ++ users;
|
||||||
"secrets/honcho-selfhost-db-password.age".publicKeys = systems ++ users;
|
|
||||||
"secrets/honcho-selfhost-env.age".publicKeys = systems ++ users;
|
|
||||||
"secrets/honcho-selfhost-jwt-secret.age".publicKeys = systems ++ users;
|
|
||||||
"secrets/outline-key.age".publicKeys = systems ++ users;
|
"secrets/outline-key.age".publicKeys = systems ++ users;
|
||||||
"secrets/restreamer-env.age".publicKeys = systems ++ users;
|
"secrets/restreamer-env.age".publicKeys = systems ++ users;
|
||||||
"secrets/searx.age".publicKeys = systems ++ users;
|
"secrets/searx.age".publicKeys = systems ++ users;
|
||||||
@@ -54,11 +52,6 @@ in {
|
|||||||
"secrets/honcho-key.age".publicKeys = systems ++ users;
|
"secrets/honcho-key.age".publicKeys = systems ++ users;
|
||||||
"secrets/hermes-env.age".publicKeys = systems ++ users;
|
"secrets/hermes-env.age".publicKeys = systems ++ users;
|
||||||
"secrets/hermes-cloud-env.age".publicKeys = systems ++ users;
|
"secrets/hermes-cloud-env.age".publicKeys = systems ++ users;
|
||||||
"secrets/hermes-api-server-key.age".publicKeys = systems ++ users;
|
"secrets/hermes-gitea-token.age".publicKeys = systems ++ users;
|
||||||
"secrets/agent-gitea-token-m3ta.age".publicKeys = systems ++ users;
|
|
||||||
"secrets/agent-gitea-token-az.age".publicKeys = [m3-kratos] ++ users;
|
|
||||||
"secrets/tuwunel-registration-token.age".publicKeys = systems ++ users;
|
"secrets/tuwunel-registration-token.age".publicKeys = systems ++ users;
|
||||||
"secrets/ai-memory-server-env.age".publicKeys = [m3-hermes] ++ users;
|
|
||||||
"secrets/ai-memory-hermes-token.age".publicKeys = [m3-hermes] ++ users;
|
|
||||||
"secrets/ai-memory-token-kratos.age".publicKeys = [m3-kratos] ++ users;
|
|
||||||
}
|
}
|
||||||
Loaded 100 of 151 files, more files were not shown because too many files have changed in this diff.
Show more
Reference in new issue
Block a user