Compare commits
45 Commits
feat/nixos
...
cbcabe89b6
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
cbcabe89b6 | ||
|
|
7523a38be3 | ||
|
|
86a4daacbb | ||
|
|
723e5b1736 | ||
|
|
0bdf18ef12 | ||
|
|
91c6b4f2a7 | ||
|
|
ab22f85105 | ||
|
|
e498823ab6 | ||
|
|
0672c26897 | ||
|
|
521829c487 | ||
|
|
0e2f15a803 | ||
|
|
7511fd24bb | ||
| 4610a08072 | |||
| 3f985c72de | |||
| 6543de3a45 | |||
| 0db8071300 | |||
| 9038863728 | |||
| 7e3b2520eb | |||
| 80efb68428 | |||
| 3d86af76b9 | |||
| 656570b39e | |||
| 8b6990ceee | |||
| a312c29221 | |||
| 053dd535d3 | |||
| 35e4155b8c | |||
| e8218c322a | |||
| 931ed2ac27 | |||
| 052081616c | |||
| d3d7cdff44 | |||
| 5202bc1fcb | |||
| 9319e32683 | |||
| 7da46d5769 | |||
| 8ea6be7ac1 | |||
| b455bf6866 | |||
| ce7c594562 | |||
| eb5e64ec67 | |||
| ec44012a64 | |||
| 16acc6a153 | |||
| 5ee644e9dd | |||
| efc50d23c4 | |||
| a527b65eae | |||
| 698d3f91eb | |||
| 1f99ca0d37 | |||
| 869d3957b5 | |||
| 2eaffa8cfb |
@@ -1,64 +0,0 @@
|
|||||||
name: NixOS Build & Test
|
|
||||||
run-name: Build ${{ gitea.event_name == 'push' && gitea.ref_name || format('PR #{0}', gitea.event.pull_request.number) }}
|
|
||||||
|
|
||||||
on:
|
|
||||||
push:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
paths:
|
|
||||||
- '**.nix'
|
|
||||||
- 'flake.lock'
|
|
||||||
- 'secrets/**'
|
|
||||||
- 'hosts/**'
|
|
||||||
- 'modules/**'
|
|
||||||
pull_request:
|
|
||||||
branches:
|
|
||||||
- master
|
|
||||||
paths:
|
|
||||||
- '**.nix'
|
|
||||||
- 'flake.lock'
|
|
||||||
- 'secrets/**'
|
|
||||||
- 'hosts/**'
|
|
||||||
- 'modules/**'
|
|
||||||
|
|
||||||
jobs:
|
|
||||||
build:
|
|
||||||
runs-on: nixos-builder
|
|
||||||
steps:
|
|
||||||
- name: Checkout
|
|
||||||
uses: actions/checkout@v4
|
|
||||||
with:
|
|
||||||
fetch-depth: 0
|
|
||||||
|
|
||||||
- name: Set up Nix environment
|
|
||||||
run: |
|
|
||||||
echo "extra-experimental-features = nix-command flakes" >> ~/.config/nix/nix.conf
|
|
||||||
cat ~/.config/nix/nix.conf
|
|
||||||
|
|
||||||
- name: Install nh (nix helper)
|
|
||||||
run: |
|
|
||||||
nix --extra-experimental-features "nix-command flakes" \
|
|
||||||
profile add nixpkgs#nh
|
|
||||||
nh --version
|
|
||||||
|
|
||||||
- name: Build NixOS configuration (lazyworkhorse)
|
|
||||||
run: |
|
|
||||||
nh os build .#lazyworkhorse
|
|
||||||
env:
|
|
||||||
NIX_CONFIG: "extra-experimental-features = nix-command flakes"
|
|
||||||
|
|
||||||
- name: Build NixOS configuration (cyt-pi)
|
|
||||||
run: |
|
|
||||||
nh os build .#cyt-pi
|
|
||||||
env:
|
|
||||||
NIX_CONFIG: "extra-experimental-features = nix-command flakes"
|
|
||||||
|
|
||||||
- name: Integration tests (placeholder)
|
|
||||||
run: |
|
|
||||||
echo "TODO: Add integration tests here"
|
|
||||||
echo ""
|
|
||||||
echo "Suggested future checks:"
|
|
||||||
echo " - nix flake check (evaluate all NixOS configs)"
|
|
||||||
echo " - Validate agenix secrets are decryptable"
|
|
||||||
echo " - Check services are defined correctly"
|
|
||||||
echo " - Run VM test if nixos-test infrastructure exists"
|
|
||||||
3
.gitmodules
vendored
3
.gitmodules
vendored
@@ -1,3 +1,6 @@
|
|||||||
[submodule "assets/compose"]
|
[submodule "assets/compose"]
|
||||||
path = assets/compose
|
path = assets/compose
|
||||||
url = ssh://git@code.lazyworkhorse.net:2222/gortium/compose.git
|
url = ssh://git@code.lazyworkhorse.net:2222/gortium/compose.git
|
||||||
|
[submodule "assets/dotfiles"]
|
||||||
|
path = assets/dotfiles
|
||||||
|
url = ssh://git@code.lazyworkhorse.net:2222/gortium/dotfiles.git
|
||||||
|
|||||||
Submodule assets/compose updated: d3f2e3b7b9...3c92d93366
126
flake.lock
generated
126
flake.lock
generated
@@ -23,6 +23,22 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"argononed": {
|
||||||
|
"flake": false,
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1729566243,
|
||||||
|
"narHash": "sha256-DPNI0Dpk5aym3Baf5UbEe5GENDrSmmXVdriRSWE+rgk=",
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "argononed",
|
||||||
|
"rev": "16dbee54d49b66d5654d228d1061246b440ef7cf",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "argononed",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"flake-compat": {
|
"flake-compat": {
|
||||||
"flake": false,
|
"flake": false,
|
||||||
"locked": {
|
"locked": {
|
||||||
@@ -37,6 +53,21 @@
|
|||||||
"url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
|
"url": "https://git.lix.systems/lix-project/flake-compat/archive/main.tar.gz"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"flake-compat_2": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1767039857,
|
||||||
|
"narHash": "sha256-vNpUSpF5Nuw8xvDLj2KCwwksIbjua2LZCqhV1LNRDns=",
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"rev": "5edf11c44bc78a0d334f6334cdaf7d60d732daab",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "edolstra",
|
||||||
|
"repo": "flake-compat",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"home-manager": {
|
"home-manager": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"nixpkgs": [
|
"nixpkgs": [
|
||||||
@@ -144,6 +175,80 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixos-images": {
|
||||||
|
"inputs": {
|
||||||
|
"nixos-stable": [
|
||||||
|
"nixos-raspberrypi",
|
||||||
|
"nixpkgs"
|
||||||
|
],
|
||||||
|
"nixos-unstable": [
|
||||||
|
"nixos-raspberrypi",
|
||||||
|
"nixpkgs"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1747747741,
|
||||||
|
"narHash": "sha256-LUOH27unNWbGTvZFitHonraNx0JF/55h30r9WxqrznM=",
|
||||||
|
"owner": "nvmd",
|
||||||
|
"repo": "nixos-images",
|
||||||
|
"rev": "cbbd6db325775096680b65e2a32fb6187c09bbb4",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "nvmd",
|
||||||
|
"ref": "sdimage-installer",
|
||||||
|
"repo": "nixos-images",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixos-raspberrypi": {
|
||||||
|
"inputs": {
|
||||||
|
"argononed": "argononed",
|
||||||
|
"flake-compat": "flake-compat_2",
|
||||||
|
"nixos-images": "nixos-images",
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs-uconsole"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1781324200,
|
||||||
|
"narHash": "sha256-JWqxN2Yle86+4Q+GFh12SvB92ZyLeqalVsN9lfMh6eQ=",
|
||||||
|
"owner": "gortium",
|
||||||
|
"repo": "nixos-raspberrypi",
|
||||||
|
"rev": "721a6e9e67dca3a23133db650b87018646bca3e6",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "gortium",
|
||||||
|
"ref": "cm5-cross-v1",
|
||||||
|
"repo": "nixos-raspberrypi",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
|
"nixos-uconsole": {
|
||||||
|
"inputs": {
|
||||||
|
"nixos-raspberrypi": [
|
||||||
|
"nixos-raspberrypi"
|
||||||
|
],
|
||||||
|
"nixpkgs": [
|
||||||
|
"nixpkgs-uconsole"
|
||||||
|
]
|
||||||
|
},
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1781476310,
|
||||||
|
"narHash": "sha256-jY6ujqLXNAWJGvt+pAuw1Wg/OiHRGd1B1Z7Czhiq7Q4=",
|
||||||
|
"owner": "gortium",
|
||||||
|
"repo": "nixos-uconsole",
|
||||||
|
"rev": "38a7fcbffbf2d2e122bc1e1c634fe25f66ecda13",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "gortium",
|
||||||
|
"ref": "pr/dcs-panel-detection",
|
||||||
|
"repo": "nixos-uconsole",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1705033721,
|
"lastModified": 1705033721,
|
||||||
@@ -176,6 +281,22 @@
|
|||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"nixpkgs-uconsole": {
|
||||||
|
"locked": {
|
||||||
|
"lastModified": 1780952837,
|
||||||
|
"narHash": "sha256-Fwd1+spDtQ0hDyBwme6ufG3n4mY0UrjjFdYHv+G/Hds=",
|
||||||
|
"owner": "NixOS",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"rev": "e820eb4a444b46a19b2e03e8dfd2359439ff30fe",
|
||||||
|
"type": "github"
|
||||||
|
},
|
||||||
|
"original": {
|
||||||
|
"owner": "NixOS",
|
||||||
|
"ref": "nixos-25.11",
|
||||||
|
"repo": "nixpkgs",
|
||||||
|
"type": "github"
|
||||||
|
}
|
||||||
|
},
|
||||||
"nixpkgs_2": {
|
"nixpkgs_2": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1774386573,
|
"lastModified": 1774386573,
|
||||||
@@ -212,7 +333,10 @@
|
|||||||
"inputs": {
|
"inputs": {
|
||||||
"agenix": "agenix",
|
"agenix": "agenix",
|
||||||
"lix": "lix",
|
"lix": "lix",
|
||||||
"nixpkgs": "nixpkgs_2"
|
"nixos-raspberrypi": "nixos-raspberrypi",
|
||||||
|
"nixos-uconsole": "nixos-uconsole",
|
||||||
|
"nixpkgs": "nixpkgs_2",
|
||||||
|
"nixpkgs-uconsole": "nixpkgs-uconsole"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems": {
|
"systems": {
|
||||||
|
|||||||
136
flake.nix
136
flake.nix
@@ -12,10 +12,21 @@
|
|||||||
url = "git+https://git.lix.systems/lix-project/lix?ref=main";
|
url = "git+https://git.lix.systems/lix-project/lix?ref=main";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
self.submodules = true;
|
nixpkgs-uconsole.url = "github:NixOS/nixpkgs/nixos-25.11";
|
||||||
|
nixos-uconsole = {
|
||||||
|
url = "github:gortium/nixos-uconsole/pr/dcs-panel-detection";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-uconsole";
|
||||||
|
inputs.nixos-raspberrypi.follows = "nixos-raspberrypi";
|
||||||
|
};
|
||||||
|
nixos-raspberrypi = {
|
||||||
|
url = "github:gortium/nixos-raspberrypi/cm5-cross-v1";
|
||||||
|
inputs.nixpkgs.follows = "nixpkgs-uconsole";
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, agenix, lix, ... }@inputs:
|
outputs = { self, nixpkgs, agenix, lix
|
||||||
|
, nixpkgs-uconsole, nixos-uconsole, nixos-raspberrypi
|
||||||
|
, ... }@inputs:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = "x86_64-linux";
|
||||||
keys = import ./lib/keys.nix;
|
keys = import ./lib/keys.nix;
|
||||||
@@ -30,16 +41,12 @@
|
|||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
inherit system overlays;
|
inherit system overlays;
|
||||||
config.allowUnfree = true;
|
config.allowUnfree = true;
|
||||||
config.permittedInsecurePackages = [
|
config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
||||||
"openclaw-2026.3.12"
|
|
||||||
];
|
|
||||||
};
|
};
|
||||||
|
|
||||||
devShell = import ./shells/nix_dev.nix {
|
devShell = import ./shells/nix_dev.nix {
|
||||||
inherit pkgs system agenix;
|
inherit pkgs system agenix;
|
||||||
};
|
};
|
||||||
in
|
in {
|
||||||
{
|
|
||||||
nixosConfigurations = {
|
nixosConfigurations = {
|
||||||
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
lazyworkhorse = nixpkgs.lib.nixosSystem {
|
||||||
specialArgs = { inherit system self keys paths inputs; };
|
specialArgs = { inherit system self keys paths inputs; };
|
||||||
@@ -48,9 +55,7 @@
|
|||||||
nixpkgs.overlays = overlays;
|
nixpkgs.overlays = overlays;
|
||||||
nixpkgs.config.allowUnfree = true;
|
nixpkgs.config.allowUnfree = true;
|
||||||
nixpkgs.config.rocmSupport = true;
|
nixpkgs.config.rocmSupport = true;
|
||||||
nixpkgs.config.permittedInsecurePackages = [
|
nixpkgs.config.permittedInsecurePackages = [ "openclaw-2026.3.12" ];
|
||||||
"openclaw-2026.3.12"
|
|
||||||
];
|
|
||||||
nix.package = lix.packages.${system}.default;
|
nix.package = lix.packages.${system}.default;
|
||||||
}
|
}
|
||||||
agenix.nixosModules.default
|
agenix.nixosModules.default
|
||||||
@@ -59,7 +64,6 @@
|
|||||||
./modules/nixos/filesystem/hoardingcow-mount.nix
|
./modules/nixos/filesystem/hoardingcow-mount.nix
|
||||||
./modules/nixos/services/docker_manager.nix
|
./modules/nixos/services/docker_manager.nix
|
||||||
./modules/nixos/services/open_code_server.nix
|
./modules/nixos/services/open_code_server.nix
|
||||||
./modules/nixos/services/staging-vm.nix
|
|
||||||
./modules/nixos/services/ollama_init_custom_models.nix
|
./modules/nixos/services/ollama_init_custom_models.nix
|
||||||
./modules/nixos/services/openclaw_node.nix
|
./modules/nixos/services/openclaw_node.nix
|
||||||
./modules/nixos/security/ai-worker-restricted.nix
|
./modules/nixos/security/ai-worker-restricted.nix
|
||||||
@@ -81,7 +85,115 @@
|
|||||||
./hosts/cyt-pi/hardware-configuration.nix
|
./hosts/cyt-pi/hardware-configuration.nix
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
|
uconsole-cm5 = nixpkgs-uconsole.lib.nixosSystem {
|
||||||
|
system = "aarch64-linux";
|
||||||
|
specialArgs = {
|
||||||
|
inherit self keys paths inputs;
|
||||||
|
nixos-raspberrypi = nixos-raspberrypi;
|
||||||
|
isCM4 = false;
|
||||||
};
|
};
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
nixpkgs.buildPlatform = "x86_64-linux";
|
||||||
|
nixpkgs.hostPlatform = "aarch64-linux";
|
||||||
|
nixpkgs.config.allowUnfree = true;
|
||||||
|
boot.loader.raspberry-pi.bootloader = "kernel";
|
||||||
|
# Kill camera packages — not needed on uConsole, break cross-compile
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
# Make camera packages "unavailable" so no pkgs depend on them
|
||||||
|
(final: prev: {
|
||||||
|
libcamera = prev.libcamera.overrideAttrs (_: { meta.platforms = []; });
|
||||||
|
libcamera-rpi = prev.libcamera-rpi.overrideAttrs (_: { meta.platforms = []; });
|
||||||
|
libpisp = prev.libpisp.overrideAttrs (_: { meta.platforms = []; });
|
||||||
|
# Pipewire in nixos-25.11 has libcamera unconditionally in buildInputs;
|
||||||
|
# meta.platforms trick doesn't help — must actually remove it
|
||||||
|
pipewire = prev.pipewire.overrideAttrs (old: {
|
||||||
|
buildInputs = builtins.filter
|
||||||
|
(x: !(x?pname && x.pname == "libcamera"))
|
||||||
|
(old.buildInputs or []);
|
||||||
|
mesonFlags = builtins.filter
|
||||||
|
(flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
|
||||||
|
(old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
|
||||||
|
});
|
||||||
|
# gjs cross-compile fails without GTK; skip intro tests
|
||||||
|
gjs = prev.gjs.overrideAttrs (old: {
|
||||||
|
mesonFlags = (old.mesonFlags or []) ++ [ "-Dskip_gtk_tests=true" ];
|
||||||
|
});
|
||||||
|
# Qt6Quick missing from aarch64 qtdeclarative cross-compile;
|
||||||
|
# skip qtutils runtime deps — Hyprland only needs it for QML UI
|
||||||
|
hyprland = prev.hyprland.override { wrapRuntimeDeps = false; };
|
||||||
|
# hyprwayland-scanner not found by cross pkg-config wrapper
|
||||||
|
xdg-desktop-portal-hyprland = prev.xdg-desktop-portal-hyprland.overrideAttrs (old: {
|
||||||
|
preConfigure = (old.preConfigure or "") + ''
|
||||||
|
# Point cmake to the correct hyprwayland-scanner pkgconfig
|
||||||
|
cmakeFlags="$cmakeFlags -Dhyprwayland-scanner_DIR=${prev.buildPackages.hyprwayland-scanner}/lib/cmake/hyprwayland-scanner" 2>/dev/null || true
|
||||||
|
export PKG_CONFIG_PATH="${prev.buildPackages.hyprwayland-scanner}/lib/pkgconfig:$PKG_CONFIG_PATH"
|
||||||
|
'';
|
||||||
|
});
|
||||||
|
})
|
||||||
|
];
|
||||||
|
}
|
||||||
|
nixos-raspberrypi.nixosModules.nixpkgs-rpi
|
||||||
|
# Disable libcamera in rpi pipewire too (separate nixpkgs instance)
|
||||||
|
({ config, lib, pkgs, ... }: {
|
||||||
|
nixpkgs.overlays = [
|
||||||
|
(final: prev: {
|
||||||
|
pipewire = prev.pipewire.overrideAttrs (old: {
|
||||||
|
buildInputs = builtins.filter
|
||||||
|
(x: !(x?pname && x.pname == "libcamera"))
|
||||||
|
(old.buildInputs or []);
|
||||||
|
mesonFlags = builtins.filter
|
||||||
|
(flag: !(builtins.isString flag && builtins.match ".*libcamera.*" flag != null))
|
||||||
|
(old.mesonFlags or []) ++ [ "-Dlibcamera=disabled" ];
|
||||||
|
});
|
||||||
|
})
|
||||||
|
];
|
||||||
|
})
|
||||||
|
|
||||||
|
# Patches are now in gortium/nixos-uconsole fork (pr/dcs-panel-detection branch)
|
||||||
|
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
|
||||||
|
nixos-raspberrypi.lib.inject-overlays
|
||||||
|
nixos-raspberrypi.lib.inject-overlays-global
|
||||||
|
nixos-uconsole.nixosModules.uconsole-cm5
|
||||||
|
({ config, lib, pkgs, inputs, ... }: let
|
||||||
|
lix-cross = import inputs.nixpkgs-uconsole {
|
||||||
|
localSystem = { system = "x86_64-linux"; };
|
||||||
|
crossSystem = { system = "aarch64-linux"; };
|
||||||
|
overlays = [ inputs.lix.overlays.default ];
|
||||||
|
};
|
||||||
|
in { nix.package = lix-cross.lix; })
|
||||||
|
agenix.nixosModules.default
|
||||||
|
./hosts/uconsole-cm5/configuration.nix
|
||||||
|
./hosts/uconsole-cm5/hardware-configuration.nix
|
||||||
|
];
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
devShells.${system}.default = devShell;
|
devShells.${system}.default = devShell;
|
||||||
|
|
||||||
|
packages.${system} = {
|
||||||
|
uconsole-cm5-image = (nixos-raspberrypi.lib.nixosSystem {
|
||||||
|
system = "aarch64-linux";
|
||||||
|
specialArgs = {
|
||||||
|
inherit self keys inputs;
|
||||||
|
nixos-raspberrypi = nixos-raspberrypi;
|
||||||
|
isCM4 = false;
|
||||||
|
};
|
||||||
|
modules = [
|
||||||
|
{
|
||||||
|
nixpkgs.buildPlatform = system;
|
||||||
|
nixpkgs.hostPlatform = "aarch64-linux";
|
||||||
|
}
|
||||||
|
nixos-raspberrypi.nixosModules.nixpkgs-rpi
|
||||||
|
nixos-raspberrypi.nixosModules.raspberry-pi-5.base
|
||||||
|
nixos-raspberrypi.lib.inject-overlays-global
|
||||||
|
nixos-raspberrypi.nixosModules.sd-image
|
||||||
|
nixos-uconsole.nixosModules.uconsole-cm5
|
||||||
|
agenix.nixosModules.default
|
||||||
|
./hosts/uconsole-cm5/configuration.nix
|
||||||
|
];
|
||||||
|
}).config.system.build.sdImage;
|
||||||
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -9,7 +9,7 @@
|
|||||||
hoardingcow-mount.enable = true;
|
hoardingcow-mount.enable = true;
|
||||||
|
|
||||||
# Flakesss
|
# Flakesss
|
||||||
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" ];
|
nix.settings.experimental-features = [ "nix-command" "flakes" "flake-self-attrs" "ca-derivations" ];
|
||||||
nix.settings.trusted-users = [ "root" "gortium" ];
|
nix.settings.trusted-users = [ "root" "gortium" ];
|
||||||
|
|
||||||
# Garbage collection
|
# Garbage collection
|
||||||
|
|||||||
36
hosts/uconsole-cm5/configuration.nix
Normal file
36
hosts/uconsole-cm5/configuration.nix
Normal file
@@ -0,0 +1,36 @@
|
|||||||
|
{ config, lib, pkgs, keys, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
networking.hostName = "uConsole";
|
||||||
|
time.timeZone = "America/Montreal";
|
||||||
|
i18n.defaultLocale = "en_CA.UTF-8";
|
||||||
|
system.stateVersion = "25.11";
|
||||||
|
|
||||||
|
# SSH — root access avec clés gortium + ai-worker
|
||||||
|
services.openssh = {
|
||||||
|
enable = true;
|
||||||
|
settings = {
|
||||||
|
PermitRootLogin = lib.mkForce "prohibit-password";
|
||||||
|
PasswordAuthentication = lib.mkForce false;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
users.users.root.openssh.authorizedKeys.keys = with keys; [
|
||||||
|
users.gortium.main
|
||||||
|
users.ai-worker.main
|
||||||
|
];
|
||||||
|
|
||||||
|
# WiFi via NetworkManager + secret agenix
|
||||||
|
networking.networkmanager.enable = true;
|
||||||
|
|
||||||
|
# Firmware
|
||||||
|
hardware.enableRedistributableFirmware = true;
|
||||||
|
|
||||||
|
# Hyprland Wayland compositor (manual start — no SDDM)
|
||||||
|
programs.hyprland = {
|
||||||
|
enable = true;
|
||||||
|
xwayland.enable = true;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
|
}
|
||||||
30
hosts/uconsole-cm5/hardware-configuration.nix
Normal file
30
hosts/uconsole-cm5/hardware-configuration.nix
Normal file
@@ -0,0 +1,30 @@
|
|||||||
|
{ config, lib, pkgs, modulesPath, ... }:
|
||||||
|
|
||||||
|
{
|
||||||
|
imports = [
|
||||||
|
(modulesPath + "/installer/scan/not-detected.nix")
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.initrd.availableKernelModules = [ "xhci_pci" "usbhid" "usb_storage" "sdhci_pci" "nvme" ];
|
||||||
|
boot.initrd.kernelModules = [ ];
|
||||||
|
boot.extraModulePackages = [ ];
|
||||||
|
|
||||||
|
# SD card partitions (nixos-uconsole layout)
|
||||||
|
fileSystems."/" = {
|
||||||
|
device = "/dev/disk/by-label/NIXOS_SD";
|
||||||
|
fsType = "ext4";
|
||||||
|
options = [ "noatime" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
fileSystems."/boot/firmware" = {
|
||||||
|
device = "/dev/disk/by-label/FIRMWARE";
|
||||||
|
fsType = "vfat";
|
||||||
|
options = [ "fmask=0022" "dmask=0022" ];
|
||||||
|
};
|
||||||
|
|
||||||
|
swapDevices = [ ];
|
||||||
|
|
||||||
|
nixpkgs.hostPlatform = lib.mkDefault "aarch64-linux";
|
||||||
|
hardware.enableRedistributableFirmware = true;
|
||||||
|
powerManagement.cpuFreqGovernor = lib.mkDefault "ondemand";
|
||||||
|
}
|
||||||
6
modules/nixos/services/default.nix
Normal file
6
modules/nixos/services/default.nix
Normal file
@@ -0,0 +1,6 @@
|
|||||||
|
{
|
||||||
|
imports = [
|
||||||
|
./dotfiles.nix
|
||||||
|
./systemd
|
||||||
|
];
|
||||||
|
}
|
||||||
69
modules/nixos/services/dotfiles.nix
Normal file
69
modules/nixos/services/dotfiles.nix
Normal file
@@ -0,0 +1,69 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.dotfiles;
|
||||||
|
stowDir = cfg.stowDir;
|
||||||
|
|
||||||
|
# Function to recursively find all files in a directory
|
||||||
|
findFiles = dir:
|
||||||
|
let
|
||||||
|
files = builtins.attrNames (builtins.readDir dir);
|
||||||
|
in
|
||||||
|
concatMap (name:
|
||||||
|
let
|
||||||
|
path = dir + "/${name}";
|
||||||
|
in
|
||||||
|
if (builtins.typeOf (builtins.readDir path) == "set")
|
||||||
|
then findFiles path
|
||||||
|
else [ path ]
|
||||||
|
) files;
|
||||||
|
|
||||||
|
# Get a list of all packages (directories) in the stow directory
|
||||||
|
stowPackages = builtins.attrNames (builtins.readDir stowDir);
|
||||||
|
|
||||||
|
# Create an attribute set where each attribute is a package name
|
||||||
|
# and the value is a list of files to be linked.
|
||||||
|
homeManagerLinks = listToAttrs (map (pkg:
|
||||||
|
let
|
||||||
|
pkgPath = stowDir + "/${pkg}";
|
||||||
|
files = findFiles pkgPath;
|
||||||
|
in
|
||||||
|
nameValuePair pkg (map (file: {
|
||||||
|
source = file;
|
||||||
|
target = removePrefix (pkgPath + "/") file;
|
||||||
|
}) files)
|
||||||
|
) stowPackages);
|
||||||
|
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.services.dotfiles = {
|
||||||
|
enable = mkEnableOption "Enable dotfiles management";
|
||||||
|
|
||||||
|
stowDir = mkOption {
|
||||||
|
type = types.path;
|
||||||
|
description = "The directory where your stow packages are located.";
|
||||||
|
};
|
||||||
|
|
||||||
|
user = mkOption {
|
||||||
|
type = types.str;
|
||||||
|
description = "The user to manage dotfiles for.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
home-manager.users.${cfg.user} = {
|
||||||
|
home.file =
|
||||||
|
let
|
||||||
|
allFiles = concatLists (attrValues homeManagerLinks);
|
||||||
|
in
|
||||||
|
listToAttrs (map (file:
|
||||||
|
nameValuePair file.target {
|
||||||
|
source = file.source;
|
||||||
|
}
|
||||||
|
) allFiles);
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
|
|
||||||
@@ -1,415 +0,0 @@
|
|||||||
{ config, lib, pkgs, ... }:
|
|
||||||
|
|
||||||
with lib;
|
|
||||||
|
|
||||||
let
|
|
||||||
cfg = config.services.staging-vm;
|
|
||||||
|
|
||||||
# Resolve the first IP in the subnet (the gateway address for the NAT network)
|
|
||||||
networkIp = head (splitString "/" cfg.network.subnet);
|
|
||||||
|
|
||||||
# ── pr-test-vm helper script ──────────────────────────────────────────
|
|
||||||
pr-test-vm = pkgs.writeShellScriptBin "pr-test-vm" ''
|
|
||||||
set -euo pipefail
|
|
||||||
|
|
||||||
LIBVIRT_URI="qemu:///system"
|
|
||||||
STORAGE_POOL="${cfg.storagePool}"
|
|
||||||
VM_DIR="${cfg.dataDir}"
|
|
||||||
NETWORK="${cfg.network.name}"
|
|
||||||
SCRIPT_NAME="$(basename "$0")"
|
|
||||||
|
|
||||||
usage() {
|
|
||||||
cat <<EOF
|
|
||||||
Usage: $SCRIPT_NAME <command> [options]
|
|
||||||
|
|
||||||
Commands:
|
|
||||||
build <nixos-config> [--name <name>] Build VM image from a NixOS config
|
|
||||||
start <vm-name> Start a VM
|
|
||||||
stop <vm-name> Gracefully shut down a VM
|
|
||||||
destroy <vm-name> Force-power-off and undefine a VM
|
|
||||||
ssh [user@]<vm-name> SSH into a running VM
|
|
||||||
console <vm-name> Connect to VM serial console
|
|
||||||
list List all staging VMs
|
|
||||||
status <vm-name> Show VM status
|
|
||||||
rebuild <vm-name> Redeploy the VM (stop + start)
|
|
||||||
|
|
||||||
Examples:
|
|
||||||
$SCRIPT_NAME build ./vm-config.nix --name my-test
|
|
||||||
$SCRIPT_NAME start my-test
|
|
||||||
$SCRIPT_NAME ssh root@my-test
|
|
||||||
EOF
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
|
|
||||||
# Find the VM's IP address from the DHCP lease
|
|
||||||
vm_ip() {
|
|
||||||
local name="$1"
|
|
||||||
local mac
|
|
||||||
mac=$(${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" domiflist "$name" 2>/dev/null \
|
|
||||||
| ${pkgs.gawk}/bin/awk 'NR>2 && $1 ~ /^vnet/ {print $NF; exit}')
|
|
||||||
[ -z "$mac" ] && { echo "error: cannot find MAC for VM '$name'"; exit 1; }
|
|
||||||
|
|
||||||
local ip
|
|
||||||
ip=$(${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" net-dhcp-leases "$NETWORK" 2>/dev/null \
|
|
||||||
| ${pkgs.gawk}/bin/awk -v mac="$mac" '$0 ~ mac {gsub(/-.*/, "", $3); print $3; exit}')
|
|
||||||
[ -z "$ip" ] && { echo "error: no DHCP lease found for VM '$name' (MAC: $mac)"; exit 1; }
|
|
||||||
echo "$ip"
|
|
||||||
}
|
|
||||||
|
|
||||||
case "''${1:-help}" in
|
|
||||||
build)
|
|
||||||
shift
|
|
||||||
CONFIG="''${1:?Missing NixOS config path}"
|
|
||||||
VM_NAME="''${2:-}"
|
|
||||||
[ -f "$CONFIG" ] || { echo "error: config file not found: $CONFIG"; exit 1; }
|
|
||||||
|
|
||||||
# Extract name from --name flag or config basename
|
|
||||||
if [ "''${2:-}" = "--name" ] && [ -n "''${3:-}" ]; then
|
|
||||||
VM_NAME="$3"
|
|
||||||
elif [ -z "$VM_NAME" ] || [ "''${VM_NAME#--}" != "$VM_NAME" ]; then
|
|
||||||
VM_NAME="$(basename "$CONFIG" .nix)"
|
|
||||||
fi
|
|
||||||
|
|
||||||
BUILD_DIR="$VM_DIR/$VM_NAME"
|
|
||||||
IMAGE="$BUILD_DIR/disk-image.qcow2"
|
|
||||||
|
|
||||||
echo "==> Building VM '$VM_NAME' from config: $CONFIG"
|
|
||||||
mkdir -p "$BUILD_DIR"
|
|
||||||
|
|
||||||
# Build the NixOS VM derivation
|
|
||||||
nix build --no-link -f "$CONFIG" vm 2>&1 || {
|
|
||||||
# Fallback: try as flake output
|
|
||||||
echo "Trying flake build..."
|
|
||||||
nix build "''${CONFIG%/.nix}#nixosConfigurations.$VM_NAME.config.system.build.vm" --no-link 2>&1 || {
|
|
||||||
echo "error: failed to build VM (tried both import and flake)"
|
|
||||||
exit 1
|
|
||||||
}
|
|
||||||
}
|
|
||||||
|
|
||||||
echo "==> Build complete. Run 'pr-test-vm start $VM_NAME' to launch."
|
|
||||||
;;
|
|
||||||
|
|
||||||
start)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
IMAGE="$VM_DIR/$VM_NAME/disk-image.qcow2"
|
|
||||||
[ -f "$IMAGE" ] || { echo "error: no disk image found at $IMAGE. Build first."; exit 1; }
|
|
||||||
|
|
||||||
# Check if already running
|
|
||||||
STATE=$(${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" domstate "$VM_NAME" 2>/dev/null || echo "undefined")
|
|
||||||
if [ "$STATE" = "running" ]; then
|
|
||||||
echo "VM '$VM_NAME' is already running."
|
|
||||||
exit 0
|
|
||||||
fi
|
|
||||||
|
|
||||||
echo "==> Starting VM '$VM_NAME'..."
|
|
||||||
|
|
||||||
# Undefine if defined but not running
|
|
||||||
if [ "$STATE" != "undefined" ]; then
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" undefine "$VM_NAME" 2>/dev/null || true
|
|
||||||
fi
|
|
||||||
|
|
||||||
# Define and start with virt-install
|
|
||||||
${pkgs.virt-manager}/bin/virt-install \
|
|
||||||
--connect "$LIBVIRT_URI" \
|
|
||||||
--name "$VM_NAME" \
|
|
||||||
--memory "${toString cfg.memory}" \
|
|
||||||
--vcpus "${toString cfg.vcpus}" \
|
|
||||||
--disk "$IMAGE",bus=virtio \
|
|
||||||
--import \
|
|
||||||
--network network="$NETWORK",model=virtio \
|
|
||||||
--graphics none \
|
|
||||||
--console pty,target_type=virtio \
|
|
||||||
--serial pty \
|
|
||||||
--memballoon virtio \
|
|
||||||
--rng /dev/urandom \
|
|
||||||
--noautoconsole \
|
|
||||||
--os-variant detect=on,name=generic
|
|
||||||
|
|
||||||
echo "==> VM '$VM_NAME' started. Get IP with: pr-test-vm status $VM_NAME"
|
|
||||||
;;
|
|
||||||
|
|
||||||
stop)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
echo "==> Stoping VM '$VM_NAME'..."
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" shutdown "$VM_NAME" 2>/dev/null && {
|
|
||||||
echo "Waiting for VM to shut down..."
|
|
||||||
for i in $(seq 1 30); do
|
|
||||||
STATE=$(${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" domstate "$VM_NAME" 2>/dev/null || echo "undefined")
|
|
||||||
[ "$STATE" != "running" ] && { echo "VM stopped."; exit 0; }
|
|
||||||
sleep 2
|
|
||||||
done
|
|
||||||
echo "warning: VM did not shut down gracefully, use 'destroy' for force"
|
|
||||||
} || {
|
|
||||||
echo "VM '$VM_NAME' not running or does not exist."
|
|
||||||
}
|
|
||||||
;;
|
|
||||||
|
|
||||||
destroy)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
echo "==> Destroying VM '$VM_NAME'..."
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" destroy "$VM_NAME" 2>/dev/null || true
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" undefine "$VM_NAME" 2>/dev/null || true
|
|
||||||
echo "==> VM '$VM_NAME' destroyed and undefined."
|
|
||||||
;;
|
|
||||||
|
|
||||||
ssh)
|
|
||||||
TARGET="''${1:?Usage: $SCRIPT_NAME ssh [user@]<vm-name>}"
|
|
||||||
# Split user@hostname if present
|
|
||||||
if echo "$TARGET" | ${pkgs.gnugrep}/bin/grep -q '@'; then
|
|
||||||
USER="''${TARGET%@*}"
|
|
||||||
VM_NAME="''${TARGET#*@}"
|
|
||||||
else
|
|
||||||
VM_NAME="$TARGET"
|
|
||||||
USER=""
|
|
||||||
fi
|
|
||||||
|
|
||||||
IP=$(vm_ip "$VM_NAME") || exit 1
|
|
||||||
if [ -n "$USER" ]; then
|
|
||||||
exec ${pkgs.openssh}/bin/ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "''${USER}@''${IP}"
|
|
||||||
else
|
|
||||||
exec ${pkgs.openssh}/bin/ssh -o StrictHostKeyChecking=no -o UserKnownHostsFile=/dev/null "$IP"
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
console)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
exec ${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" console "$VM_NAME"
|
|
||||||
;;
|
|
||||||
|
|
||||||
list)
|
|
||||||
echo "Staging VMs:"
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" list --all
|
|
||||||
echo ""
|
|
||||||
echo "Active networks:"
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" net-list
|
|
||||||
echo ""
|
|
||||||
echo "Storage pools:"
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" pool-list
|
|
||||||
;;
|
|
||||||
|
|
||||||
status)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
echo "VM: $VM_NAME"
|
|
||||||
STATE=$(${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" domstate "$VM_NAME" 2>/dev/null || echo "not found")
|
|
||||||
echo "State: $STATE"
|
|
||||||
if [ "$STATE" = "running" ]; then
|
|
||||||
IP=$(vm_ip "$VM_NAME" 2>/dev/null || echo "N/A")
|
|
||||||
echo "IP: $IP"
|
|
||||||
${pkgs.libvirt}/bin/virsh -c "$LIBVIRT_URI" dommemstat "$VM_NAME" 2>/dev/null | head -3 || true
|
|
||||||
fi
|
|
||||||
;;
|
|
||||||
|
|
||||||
rebuild)
|
|
||||||
VM_NAME="''${1:?Missing VM name}"
|
|
||||||
"$0" destroy "$VM_NAME"
|
|
||||||
"$0" start "$VM_NAME"
|
|
||||||
;;
|
|
||||||
|
|
||||||
help|--help|-h)
|
|
||||||
usage
|
|
||||||
;;
|
|
||||||
|
|
||||||
*)
|
|
||||||
usage
|
|
||||||
;;
|
|
||||||
esac
|
|
||||||
'';
|
|
||||||
in
|
|
||||||
{
|
|
||||||
options.services.staging-vm = {
|
|
||||||
enable = mkEnableOption "Staging VM infrastructure with libvirt/KVM";
|
|
||||||
|
|
||||||
network = {
|
|
||||||
name = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "staging";
|
|
||||||
description = "Name of the libvirt NAT network for staging VMs";
|
|
||||||
};
|
|
||||||
|
|
||||||
bridge = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "virbr1";
|
|
||||||
description = "Bridge interface name for the staging network";
|
|
||||||
};
|
|
||||||
|
|
||||||
subnet = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "192.168.122.0/24";
|
|
||||||
description = "NAT network subnet in CIDR notation";
|
|
||||||
};
|
|
||||||
|
|
||||||
dhcpStart = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "192.168.122.2";
|
|
||||||
description = "Start of the DHCP range";
|
|
||||||
};
|
|
||||||
|
|
||||||
dhcpEnd = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "192.168.122.254";
|
|
||||||
description = "End of the DHCP range";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
storagePool = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "/var/lib/libvirt/images";
|
|
||||||
description = "Directory path for the libvirt storage pool";
|
|
||||||
};
|
|
||||||
|
|
||||||
dataDir = mkOption {
|
|
||||||
type = types.str;
|
|
||||||
default = "/var/lib/staging-vm";
|
|
||||||
description = "Directory for staging VM test data (images, cloud-init configs)";
|
|
||||||
};
|
|
||||||
|
|
||||||
memory = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
default = 2048;
|
|
||||||
description = "Default RAM in MiB for staging VMs";
|
|
||||||
};
|
|
||||||
|
|
||||||
vcpus = mkOption {
|
|
||||||
type = types.int;
|
|
||||||
default = 2;
|
|
||||||
description = "Default number of vCPUs for staging VMs";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = mkIf cfg.enable {
|
|
||||||
# ── libvirtd with QEMU/KVM ──────────────────────────────────────────
|
|
||||||
virtualisation.libvirtd = {
|
|
||||||
enable = true;
|
|
||||||
|
|
||||||
qemu = {
|
|
||||||
package = pkgs.qemu_kvm;
|
|
||||||
runAsRoot = true;
|
|
||||||
|
|
||||||
swtpm = {
|
|
||||||
enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
ovmf = {
|
|
||||||
enable = true;
|
|
||||||
packages = [ pkgs.OVMF ];
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Allow the staging bridge for guest networking
|
|
||||||
allowedBridges = [ cfg.network.bridge ];
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── System packages ─────────────────────────────────────────────────
|
|
||||||
environment.systemPackages = with pkgs; [
|
|
||||||
libvirt # virsh, virt-admin
|
|
||||||
qemu_kvm # QEMU/KVM
|
|
||||||
swtpm # Software TPM
|
|
||||||
OVMF # UEFI firmware for VMs
|
|
||||||
virt-manager # GUI management
|
|
||||||
virt-viewer # SPICE/VNC viewer
|
|
||||||
libguestfs # virt-install, virt-customize, guestfish
|
|
||||||
cdrtools # genisoimage for cloud-init ISOs
|
|
||||||
jq # JSON parsing
|
|
||||||
gawk # awk for DHCP lease parsing
|
|
||||||
gnugrep # grep
|
|
||||||
];
|
|
||||||
|
|
||||||
# ── User permissions ────────────────────────────────────────────────
|
|
||||||
users.users.gortium.extraGroups = [ "libvirtd" ];
|
|
||||||
|
|
||||||
# ── Directories ─────────────────────────────────────────────────────
|
|
||||||
systemd.tmpfiles.rules = [
|
|
||||||
"d ${cfg.storagePool} 0755 root root -"
|
|
||||||
"d ${cfg.dataDir} 0755 root root -"
|
|
||||||
];
|
|
||||||
|
|
||||||
# ── Default NAT network definition ──────────────────────────────────
|
|
||||||
systemd.services.define-staging-network = {
|
|
||||||
description = "Define the staging libvirt NAT network";
|
|
||||||
after = [ "libvirtd.service" ];
|
|
||||||
requires = [ "libvirtd.service" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
before = [ "define-staging-pool.service" ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
};
|
|
||||||
script = let
|
|
||||||
networkXml = pkgs.writeText "staging-network.xml" ''
|
|
||||||
<network>
|
|
||||||
<name>${cfg.network.name}</name>
|
|
||||||
<forward mode='nat'/>
|
|
||||||
<bridge name='${cfg.network.bridge}' stp='on' delay='0'/>
|
|
||||||
<ip address='${networkIp}' netmask='255.255.255.0'>
|
|
||||||
<dhcp>
|
|
||||||
<range start='${cfg.network.dhcpStart}' end='${cfg.network.dhcpEnd}'/>
|
|
||||||
</dhcp>
|
|
||||||
</ip>
|
|
||||||
</network>
|
|
||||||
'';
|
|
||||||
in ''
|
|
||||||
set -e
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system net-info "${cfg.network.name}" 2>/dev/null && {
|
|
||||||
echo "Network '${cfg.network.name}' already exists"
|
|
||||||
} || {
|
|
||||||
echo "Defining network '${cfg.network.name}'..."
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system net-define "${networkXml}"
|
|
||||||
}
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system net-autostart "${cfg.network.name}"
|
|
||||||
# Start the network if not already active
|
|
||||||
STATE=$(${pkgs.libvirt}/bin/virsh -c qemu:///system net-state "${cfg.network.name}" 2>/dev/null || echo "inactive")
|
|
||||||
if [ "$STATE" != "active" ]; then
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system net-start "${cfg.network.name}"
|
|
||||||
fi
|
|
||||||
echo "Network '${cfg.network.name}' is ready."
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Storage pool definition ─────────────────────────────────────────
|
|
||||||
systemd.services.define-staging-pool = {
|
|
||||||
description = "Define the staging libvirt storage pool";
|
|
||||||
after = [ "libvirtd.service" "define-staging-network.service" ];
|
|
||||||
requires = [ "libvirtd.service" ];
|
|
||||||
wantedBy = [ "multi-user.target" ];
|
|
||||||
serviceConfig = {
|
|
||||||
Type = "oneshot";
|
|
||||||
RemainAfterExit = true;
|
|
||||||
};
|
|
||||||
script = ''
|
|
||||||
set -e
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system pool-info staging 2>/dev/null && {
|
|
||||||
echo "Storage pool 'staging' already exists"
|
|
||||||
} || {
|
|
||||||
echo "Defining storage pool 'staging' at ${cfg.storagePool}..."
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system pool-define-as \
|
|
||||||
--name staging --type dir --target "${cfg.storagePool}"
|
|
||||||
}
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system pool-autostart staging
|
|
||||||
STATE=$(${pkgs.libvirt}/bin/virsh -c qemu:///system pool-state staging 2>/dev/null || echo "inactive")
|
|
||||||
if [ "$STATE" != "running" ]; then
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system pool-build staging
|
|
||||||
${pkgs.libvirt}/bin/virsh -c qemu:///system pool-start staging
|
|
||||||
fi
|
|
||||||
echo "Storage pool 'staging' is ready."
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── Firewall rules for libvirt guests ───────────────────────────────
|
|
||||||
networking.firewall = {
|
|
||||||
# Trust the bridge interface to allow guest traffic
|
|
||||||
trustedInterfaces = [ cfg.network.bridge ];
|
|
||||||
|
|
||||||
extraCommands = mkAfter ''
|
|
||||||
# Allow forwarding between the staging bridge and the outside world
|
|
||||||
iptables -I FORWARD -i ${cfg.network.bridge} -j ACCEPT 2>/dev/null || true
|
|
||||||
iptables -I FORWARD -o ${cfg.network.bridge} -m conntrack --ctstate RELATED,ESTABLISHED -j ACCEPT 2>/dev/null || true
|
|
||||||
|
|
||||||
# NAT for guest outbound traffic
|
|
||||||
iptables -t nat -I POSTROUTING -s ${cfg.network.subnet} -j MASQUERADE 2>/dev/null || true
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
|
|
||||||
# ── pr-test-vm helper script ────────────────────────────────────────
|
|
||||||
environment.systemPackages = [ pr-test-vm ];
|
|
||||||
};
|
|
||||||
}
|
|
||||||
10
secrets/home_wifi.age
Normal file
10
secrets/home_wifi.age
Normal file
@@ -0,0 +1,10 @@
|
|||||||
|
-----BEGIN AGE ENCRYPTED FILE-----
|
||||||
|
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IHNzaC1lZDI1NTE5IEdoTUQ4QSAycE1Y
|
||||||
|
YmMvUWZpK2VKQVlqaHFtaERBRGROcFIyL0d6dEVRQmFxLzlqdFZNCkYxWkNIUXRZ
|
||||||
|
V0dQOG4zY3U3Nk1JelBtY0cwUGdxaEI3dmZaVTZId04rVTQKLT4geV1cZC4wMnst
|
||||||
|
Z3JlYXNlIDYgOG1IME1xCkQ0RGN1NU1FUWk0Y1RmamNEY0tJWmFQNGdoMkROcGVy
|
||||||
|
aU5UYVFobVRLMVVUQ1JicUM2c0tSVzRQdEZ0VE5YamQKZUxPeVpLWDZJR0hqemdD
|
||||||
|
cmkyUUdFZEZKZjBDNGhmNFR6bVUKLS0tIDRQUGR5RGI5UEhGNk5EQWw4dFk0R01k
|
||||||
|
TUJWOFpleXBUajFPckFmem52cGsKHzn+QnuYLI2NEh5WWZQHrNuvVzYk+kVjsAsn
|
||||||
|
KNS2dHjvadAopVY2Gypldf1p2RRtmgZkDHaPlNzv5Hk=
|
||||||
|
-----END AGE ENCRYPTED FILE-----
|
||||||
@@ -11,4 +11,5 @@ in
|
|||||||
"lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
|
"lazyworkhorse_host_ssh_key.age".publicKeys = authorizedKeys;
|
||||||
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
"n8n_ssh_key.age".publicKeys = authorizedKeys;
|
||||||
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
"openclaw_gateway_token.age".publicKeys = authorizedKeys;
|
||||||
|
"home_wifi.age".publicKeys = authorizedKeys;
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,4 +1,5 @@
|
|||||||
{ pkgs, inputs, config, keys, ... }: {
|
{ pkgs, inputs, config, keys, ... }: {
|
||||||
|
home-manager.users.gortium = import ./home.nix;
|
||||||
users.users.gortium = {
|
users.users.gortium = {
|
||||||
isNormalUser = true;
|
isNormalUser = true;
|
||||||
extraGroups = [ "wheel" "docker" "video" "render"];
|
extraGroups = [ "wheel" "docker" "video" "render"];
|
||||||
12
users/gortium/home.nix
Normal file
12
users/gortium/home.nix
Normal file
@@ -0,0 +1,12 @@
|
|||||||
|
{ pkgs, ... }: {
|
||||||
|
services.dotfiles = {
|
||||||
|
enable = true;
|
||||||
|
stowDir = ../../../assets/dotfiles;
|
||||||
|
user = "gortium";
|
||||||
|
};
|
||||||
|
|
||||||
|
home.username = "gortium";
|
||||||
|
home.homeDirectory = "/home/gortium";
|
||||||
|
home.stateVersion = "23.11"; # Please change this to your version.
|
||||||
|
programs.home-manager.enable = true;
|
||||||
|
}
|
||||||
Reference in New Issue
Block a user