forked from Bos55/nix-config
Compare commits
No commits in common. "e91143fd047d088063d21285bc0b839c90427d12" and "5a031b48ed6931460084244f1a395397ecafbcb9" have entirely different histories.
e91143fd04
...
5a031b48ed
25 changed files with 70 additions and 353 deletions
64
README.md
64
README.md
|
|
@ -1,64 +0,0 @@
|
||||||
# Bos55 NixOS Config
|
|
||||||
|
|
||||||
Automated CI/CD deployment for NixOS homelab using `deploy-rs`.
|
|
||||||
|
|
||||||
## Repository Structure
|
|
||||||
|
|
||||||
- `hosts/`: Host-specific configurations.
|
|
||||||
- `modules/`: Shared NixOS modules.
|
|
||||||
- `users/`: User definitions (including the `deploy` user).
|
|
||||||
- `secrets/`: Encrypted secrets via `sops-nix`.
|
|
||||||
|
|
||||||
## Deployment Workflow
|
|
||||||
|
|
||||||
### Prerequisites
|
|
||||||
- SSH access to the `deploy` user on target hosts.
|
|
||||||
- `deploy-rs` installed locally (`nix profile install github:serokell/deploy-rs`).
|
|
||||||
|
|
||||||
### Deployment Modes
|
|
||||||
|
|
||||||
1. **Production Deployment (main branch):**
|
|
||||||
Triggered on push to `main`. Automatically builds and switches all hosts. bootloader is updated.
|
|
||||||
Manual: `deploy .`
|
|
||||||
|
|
||||||
2. **Test Deployment (test-<hostname> branch):**
|
|
||||||
Triggered on push to `test-<hostname>`. Builds and activates the configuration on the specific host **without** updating the bootloader. Reboots will revert to the previous generation.
|
|
||||||
Manual: `deploy .#<hostname>.test`
|
|
||||||
|
|
||||||
3. **Kernel Upgrades / Maintenance:**
|
|
||||||
Use `deploy .#<hostname>.system --boot` to update the bootloader without immediate activation, followed by a manual reboot.
|
|
||||||
|
|
||||||
## Local Development
|
|
||||||
|
|
||||||
### 1. Developer Shell
|
|
||||||
This repository includes a standardized development environment containing all necessary tools (`deploy-rs`, `sops`, `age`, etc.).
|
|
||||||
```bash
|
|
||||||
nix develop
|
|
||||||
# or if using direnv
|
|
||||||
direnv allow
|
|
||||||
```
|
|
||||||
|
|
||||||
### 2. Build a host VM
|
|
||||||
You can build a QEMU VM for any host configuration to test changes locally:
|
|
||||||
```bash
|
|
||||||
nix build .#nixosConfigurations.<hostname>.config.system.build.vm
|
|
||||||
./result/bin/run-<hostname>-vm
|
|
||||||
```
|
|
||||||
|
|
||||||
> [!WARNING]
|
|
||||||
> **Network Conflict**: Default VMs use user-mode networking (NAT) which is safe. However, if you configure the VM to use bridge networking, it will attempt to use the static IP defined in `hostIp`. Ensure you do not have a physical host with that IP active on the same bridge to avoid network interference.
|
|
||||||
|
|
||||||
### 3. Run Integration Tests
|
|
||||||
Run the automated test suite:
|
|
||||||
```bash
|
|
||||||
nix-build test/vm-test.nix
|
|
||||||
```
|
|
||||||
|
|
||||||
### 3. Test CI Workflows Locally
|
|
||||||
Use `act` to test the GitHub Actions workflows:
|
|
||||||
```bash
|
|
||||||
act -W .github/workflows/check.yml
|
|
||||||
```
|
|
||||||
|
|
||||||
## Security
|
|
||||||
See [SECURITY.md](SECURITY.md) for details on the trust model and secret management.
|
|
||||||
76
flake.lock
generated
76
flake.lock
generated
|
|
@ -1,46 +1,8 @@
|
||||||
{
|
{
|
||||||
"nodes": {
|
"nodes": {
|
||||||
"deploy-rs": {
|
|
||||||
"inputs": {
|
|
||||||
"flake-compat": "flake-compat",
|
|
||||||
"nixpkgs": [
|
|
||||||
"nixpkgs"
|
|
||||||
],
|
|
||||||
"utils": "utils"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1770019181,
|
|
||||||
"narHash": "sha256-hwsYgDnby50JNVpTRYlF3UR/Rrpt01OrxVuryF40CFY=",
|
|
||||||
"owner": "serokell",
|
|
||||||
"repo": "deploy-rs",
|
|
||||||
"rev": "77c906c0ba56aabdbc72041bf9111b565cdd6171",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "serokell",
|
|
||||||
"repo": "deploy-rs",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-compat": {
|
|
||||||
"flake": false,
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1733328505,
|
|
||||||
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "edolstra",
|
|
||||||
"repo": "flake-compat",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"flake-utils": {
|
"flake-utils": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"systems": "systems_2"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1731533236,
|
"lastModified": 1731533236,
|
||||||
|
|
@ -73,11 +35,10 @@
|
||||||
},
|
},
|
||||||
"root": {
|
"root": {
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"deploy-rs": "deploy-rs",
|
|
||||||
"flake-utils": "flake-utils",
|
"flake-utils": "flake-utils",
|
||||||
"nixpkgs": "nixpkgs",
|
"nixpkgs": "nixpkgs",
|
||||||
"sops-nix": "sops-nix",
|
"sops-nix": "sops-nix",
|
||||||
"utils": "utils_2"
|
"utils": "utils"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"sops-nix": {
|
"sops-nix": {
|
||||||
|
|
@ -115,40 +76,7 @@
|
||||||
"type": "github"
|
"type": "github"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
"systems_2": {
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1681028828,
|
|
||||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "nix-systems",
|
|
||||||
"repo": "default",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"utils": {
|
"utils": {
|
||||||
"inputs": {
|
|
||||||
"systems": "systems"
|
|
||||||
},
|
|
||||||
"locked": {
|
|
||||||
"lastModified": 1731533236,
|
|
||||||
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
|
|
||||||
"type": "github"
|
|
||||||
},
|
|
||||||
"original": {
|
|
||||||
"owner": "numtide",
|
|
||||||
"repo": "flake-utils",
|
|
||||||
"type": "github"
|
|
||||||
}
|
|
||||||
},
|
|
||||||
"utils_2": {
|
|
||||||
"inputs": {
|
"inputs": {
|
||||||
"flake-utils": [
|
"flake-utils": [
|
||||||
"flake-utils"
|
"flake-utils"
|
||||||
|
|
|
||||||
59
flake.nix
59
flake.nix
|
|
@ -13,81 +13,52 @@
|
||||||
url = "github:gytis-ivaskevicius/flake-utils-plus";
|
url = "github:gytis-ivaskevicius/flake-utils-plus";
|
||||||
inputs.flake-utils.follows = "flake-utils";
|
inputs.flake-utils.follows = "flake-utils";
|
||||||
};
|
};
|
||||||
deploy-rs = {
|
|
||||||
url = "github:serokell/deploy-rs";
|
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = inputs@{
|
outputs = inputs@{
|
||||||
self, nixpkgs,
|
self, nixpkgs,
|
||||||
flake-utils, sops-nix, utils, deploy-rs,
|
flake-utils, sops-nix, utils,
|
||||||
...
|
...
|
||||||
}:
|
}:
|
||||||
let
|
let
|
||||||
system = "x86_64-linux";
|
system = utils.lib.system.x86_64-linux;
|
||||||
lib = nixpkgs.lib;
|
|
||||||
in
|
in
|
||||||
utils.lib.mkFlake {
|
utils.lib.mkFlake {
|
||||||
inherit self inputs;
|
inherit self inputs;
|
||||||
|
|
||||||
hostDefaults.modules = [
|
hostDefaults = {
|
||||||
|
inherit system;
|
||||||
|
|
||||||
|
modules = [
|
||||||
./modules
|
./modules
|
||||||
./users
|
./users
|
||||||
|
|
||||||
sops-nix.nixosModules.sops
|
sops-nix.nixosModules.sops
|
||||||
({ self, ... }: {
|
|
||||||
sops.defaultSopsFile = "${self}/secrets/secrets.yaml";
|
|
||||||
sops.age.keyFile = "/var/lib/sops-nix/key.txt";
|
|
||||||
})
|
|
||||||
];
|
];
|
||||||
|
};
|
||||||
|
|
||||||
hosts = {
|
hosts = {
|
||||||
# Infrastructure
|
# Physical hosts
|
||||||
Niko.modules = [ ./hosts/Niko ];
|
Niko.modules = [ ./hosts/Niko ];
|
||||||
|
|
||||||
|
# Virtual machines
|
||||||
|
|
||||||
|
# Single-service
|
||||||
Ingress.modules = [ ./hosts/Ingress ];
|
Ingress.modules = [ ./hosts/Ingress ];
|
||||||
Gitea.modules = [ ./hosts/Gitea ];
|
Gitea.modules = [ ./hosts/Gitea ];
|
||||||
Vaultwarden.modules = [ ./hosts/Vaultwarden ];
|
Vaultwarden.modules = [ ./hosts/Vaultwarden ];
|
||||||
|
|
||||||
# Production
|
# Production multi-service
|
||||||
Binnenpost.modules = [ ./hosts/Binnenpost ];
|
Binnenpost.modules = [ ./hosts/Binnenpost ];
|
||||||
Production.modules = [ ./hosts/Production ];
|
Production.modules = [ ./hosts/Production ];
|
||||||
ProductionGPU.modules = [ ./hosts/ProductionGPU ];
|
ProductionGPU.modules = [ ./hosts/ProductionGPU ];
|
||||||
ProductionArr.modules = [ ./hosts/ProductionArr ];
|
ProductionArr.modules = [ ./hosts/ProductionArr ];
|
||||||
ACE.modules = [ ./hosts/ACE ];
|
ACE.modules = [ ./hosts/ACE ];
|
||||||
|
|
||||||
# Lab
|
# Others
|
||||||
Template.modules = [ ./hosts/Template ];
|
Template.modules = [ ./hosts/Template ];
|
||||||
Development.modules = [ ./hosts/Development ];
|
Development.modules = [ ./hosts/Development ];
|
||||||
Testing.modules = [ ./hosts/Testing ];
|
Testing.modules = [ ./hosts/Testing ];
|
||||||
};
|
};
|
||||||
|
|
||||||
deploy.nodes = let
|
|
||||||
pkg = deploy-rs.lib.${system};
|
|
||||||
isDeployable = nixos: (nixos.config.homelab.users.deploy.enable or false) && (nixos.config.homelab.networking.hostIp != null);
|
|
||||||
in
|
|
||||||
builtins.mapAttrs (_: nixos: {
|
|
||||||
hostname = nixos.config.homelab.networking.hostIp;
|
|
||||||
sshUser = "deploy";
|
|
||||||
user = "root";
|
|
||||||
profiles.system.path = pkg.activate.nixos nixos;
|
|
||||||
profiles.test.path = pkg.activate.custom nixos.config.system.build.toplevel ''
|
|
||||||
$PROFILE/bin/switch-to-configuration test
|
|
||||||
'';
|
|
||||||
}) (lib.filterAttrs (_: isDeployable) self.nixosConfigurations);
|
|
||||||
|
|
||||||
checks = builtins.mapAttrs (_: lib: lib.deployChecks self.deploy) deploy-rs.lib;
|
|
||||||
|
|
||||||
outputsBuilder = channels: {
|
|
||||||
formatter = channels.nixpkgs.alejandra;
|
|
||||||
devShells.default = channels.nixpkgs.mkShell {
|
|
||||||
name = "homelab-dev";
|
|
||||||
buildInputs = [
|
|
||||||
deploy-rs.packages.${system}.deploy-rs
|
|
||||||
channels.nixpkgs.sops
|
|
||||||
channels.nixpkgs.age
|
|
||||||
];
|
|
||||||
shellHook = "echo '🛡️ Homelab Development Shell Loaded'";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|
|
||||||
|
|
@ -1,12 +1,10 @@
|
||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
homelab = {
|
homelab = {
|
||||||
networking.hostIp = "192.168.0.41";
|
|
||||||
services.actions.enable = true;
|
services.actions.enable = true;
|
||||||
virtualisation.guest.enable = true;
|
virtualisation.guest.enable = true;
|
||||||
users.deploy.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|
@ -26,7 +24,7 @@
|
||||||
interfaces.ens18 = {
|
interfaces.ens18 = {
|
||||||
ipv4.addresses = [
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = config.homelab.networking.hostIp;
|
address = "192.168.0.41";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -1,4 +1,4 @@
|
||||||
{ config, pkgs, ... }:
|
{ pkgs, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
|
|
@ -13,14 +13,12 @@
|
||||||
};
|
};
|
||||||
|
|
||||||
homelab = {
|
homelab = {
|
||||||
networking.hostIp = "192.168.0.89";
|
|
||||||
apps = {
|
apps = {
|
||||||
speedtest.enable = true;
|
speedtest.enable = true;
|
||||||
technitiumDNS.enable = true;
|
technitiumDNS.enable = true;
|
||||||
traefik.enable = true;
|
traefik.enable = true;
|
||||||
};
|
};
|
||||||
virtualisation.guest.enable = true;
|
virtualisation.guest.enable = true;
|
||||||
users.deploy.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|
@ -45,7 +43,7 @@
|
||||||
interfaces.ens18 = {
|
interfaces.ens18 = {
|
||||||
ipv4.addresses = [
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = config.homelab.networking.hostIp;
|
address = "192.168.0.89";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
homelab = {
|
homelab = {
|
||||||
networking.hostIp = "192.168.0.91";
|
|
||||||
apps = {
|
apps = {
|
||||||
bind9.enable = true;
|
bind9.enable = true;
|
||||||
homepage = {
|
homepage = {
|
||||||
|
|
@ -14,7 +13,6 @@
|
||||||
plex.enable = true;
|
plex.enable = true;
|
||||||
};
|
};
|
||||||
virtualisation.guest.enable = true;
|
virtualisation.guest.enable = true;
|
||||||
users.deploy.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|
@ -38,7 +36,7 @@
|
||||||
interfaces.ens18 = {
|
interfaces.ens18 = {
|
||||||
ipv4.addresses = [
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = config.homelab.networking.hostIp;
|
address = "192.168.0.91";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
@ -61,8 +59,7 @@
|
||||||
environment = {
|
environment = {
|
||||||
# NOTE Required
|
# NOTE Required
|
||||||
# The email address used when setting up the initial administrator account to login to pgAdmin.
|
# The email address used when setting up the initial administrator account to login to pgAdmin.
|
||||||
# TODO Hugo: Populate 'pgadmin_email' in sops.
|
PGADMIN_DEFAULT_EMAIL = "kmtl.hugo+pgadmin@gmail.com";
|
||||||
PGADMIN_DEFAULT_EMAIL = config.sops.placeholder.pgadmin_email or "pgadmin-admin@example.com";
|
|
||||||
# NOTE Required
|
# NOTE Required
|
||||||
# The password used when setting up the initial administrator account to login to pgAdmin.
|
# The password used when setting up the initial administrator account to login to pgAdmin.
|
||||||
PGADMIN_DEFAULT_PASSWORD = "ChangeMe";
|
PGADMIN_DEFAULT_PASSWORD = "ChangeMe";
|
||||||
|
|
|
||||||
|
|
@ -3,12 +3,9 @@
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
homelab = {
|
homelab = {
|
||||||
networking.hostIp = "192.168.0.24";
|
|
||||||
apps.gitea.enable = true;
|
apps.gitea.enable = true;
|
||||||
virtualisation.guest.enable = true;
|
virtualisation.guest.enable = true;
|
||||||
|
|
||||||
users.deploy.enable = true;
|
|
||||||
|
|
||||||
users.admin = {
|
users.admin = {
|
||||||
enable = true;
|
enable = true;
|
||||||
authorizedKeys = [
|
authorizedKeys = [
|
||||||
|
|
@ -31,7 +28,7 @@
|
||||||
interfaces.ens18 = {
|
interfaces.ens18 = {
|
||||||
ipv4.addresses = [
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = config.homelab.networking.hostIp;
|
address = "192.168.0.24";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -2,11 +2,7 @@
|
||||||
|
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
homelab = {
|
homelab.virtualisation.guest.enable = true;
|
||||||
networking.hostIp = "192.168.0.10";
|
|
||||||
virtualisation.guest.enable = true;
|
|
||||||
users.deploy.enable = true;
|
|
||||||
};
|
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostName = "Ingress";
|
hostName = "Ingress";
|
||||||
|
|
@ -23,7 +19,7 @@
|
||||||
interfaces.ens18 = {
|
interfaces.ens18 = {
|
||||||
ipv4.addresses = [
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = config.homelab.networking.hostIp;
|
address = "192.168.0.10";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
@ -43,7 +39,6 @@
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
||||||
security.acme = {
|
security.acme = {
|
||||||
acceptTerms = true;
|
acceptTerms = true;
|
||||||
defaults = {
|
defaults = {
|
||||||
|
|
@ -51,7 +46,7 @@
|
||||||
dnsPropagationCheck = true;
|
dnsPropagationCheck = true;
|
||||||
dnsProvider = "cloudflare";
|
dnsProvider = "cloudflare";
|
||||||
dnsResolver = "1.1.1.1:53";
|
dnsResolver = "1.1.1.1:53";
|
||||||
email = config.sops.placeholder.acme_email or "acme-email@example.com";
|
email = "tibo.depeuter@telenet.be";
|
||||||
credentialFiles = {
|
credentialFiles = {
|
||||||
CLOUDFLARE_DNS_API_TOKEN_FILE = "/var/lib/secrets/depeuter-dev-cloudflare-api-token";
|
CLOUDFLARE_DNS_API_TOKEN_FILE = "/var/lib/secrets/depeuter-dev-cloudflare-api-token";
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -165,7 +165,7 @@ providers:
|
||||||
# Certificates
|
# Certificates
|
||||||
"--certificatesresolvers.letsencrypt.acme.dnschallenge=true"
|
"--certificatesresolvers.letsencrypt.acme.dnschallenge=true"
|
||||||
"--certificatesresolvers.letsencrypt.acme.dnschallenge.provider=cloudflare"
|
"--certificatesresolvers.letsencrypt.acme.dnschallenge.provider=cloudflare"
|
||||||
"--certificatesresolvers.letsencrypt.acme.email=${config.sops.placeholder.acme_email or "acme-email@example.com"}"
|
"--certificatesresolvers.letsencrypt.acme.email=tibo.depeuter@telenet.be"
|
||||||
"--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
|
"--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
|
||||||
|
|
||||||
# Additional routes
|
# Additional routes
|
||||||
|
|
@ -176,8 +176,8 @@ providers:
|
||||||
# "8080:8080/tcp" # The Web UI (enabled by --api.insecure=true)
|
# "8080:8080/tcp" # The Web UI (enabled by --api.insecure=true)
|
||||||
];
|
];
|
||||||
environment = {
|
environment = {
|
||||||
# TODO Hugo: Populate 'cloudflare_dns_token' in sops.
|
# TODO Hide this!
|
||||||
"CLOUDFLARE_DNS_API_TOKEN" = config.sops.placeholder.cloudflare_dns_token or "CLOUDFLARE_TOKEN_PLACEHOLDER";
|
"CLOUDFLARE_DNS_API_TOKEN" = "6Vz64Op_a6Ls1ljGeBxFoOVfQ-yB-svRbf6OyPv2";
|
||||||
};
|
};
|
||||||
environmentFiles = [
|
environmentFiles = [
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -7,7 +7,6 @@
|
||||||
];
|
];
|
||||||
|
|
||||||
homelab = {
|
homelab = {
|
||||||
networking.hostIp = "192.168.0.11";
|
|
||||||
apps = {
|
apps = {
|
||||||
technitiumDNS.enable = true;
|
technitiumDNS.enable = true;
|
||||||
traefik.enable = true;
|
traefik.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,11 @@
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
homelab = {
|
homelab = {
|
||||||
networking.hostIp = "192.168.0.31";
|
|
||||||
apps = {
|
apps = {
|
||||||
calibre.enable = true;
|
calibre.enable = true;
|
||||||
traefik.enable = true;
|
traefik.enable = true;
|
||||||
};
|
};
|
||||||
virtualisation.guest.enable = true;
|
virtualisation.guest.enable = true;
|
||||||
users.deploy.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|
@ -33,7 +31,7 @@
|
||||||
interfaces.ens18 = {
|
interfaces.ens18 = {
|
||||||
ipv4.addresses = [
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = config.homelab.networking.hostIp;
|
address = "192.168.0.31";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,11 @@
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
homelab = {
|
homelab = {
|
||||||
networking.hostIp = "192.168.0.33";
|
|
||||||
apps = {
|
apps = {
|
||||||
arr.enable = true;
|
arr.enable = true;
|
||||||
traefik.enable = true;
|
traefik.enable = true;
|
||||||
};
|
};
|
||||||
virtualisation.guest.enable = true;
|
virtualisation.guest.enable = true;
|
||||||
users.deploy.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|
@ -33,7 +31,7 @@
|
||||||
interfaces.ens18 = {
|
interfaces.ens18 = {
|
||||||
ipv4.addresses = [
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = config.homelab.networking.hostIp;
|
address = "192.168.0.33";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -3,10 +3,8 @@
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
homelab = {
|
homelab = {
|
||||||
networking.hostIp = "192.168.0.94";
|
|
||||||
apps.jellyfin.enable = true;
|
apps.jellyfin.enable = true;
|
||||||
virtualisation.guest.enable = true;
|
virtualisation.guest.enable = true;
|
||||||
users.deploy.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|
@ -30,7 +28,7 @@
|
||||||
interfaces.ens18 = {
|
interfaces.ens18 = {
|
||||||
ipv4.addresses = [
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = config.homelab.networking.hostIp;
|
address = "192.168.0.94";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -3,13 +3,11 @@
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
homelab = {
|
homelab = {
|
||||||
networking.hostIp = "192.168.0.92";
|
|
||||||
apps = {
|
apps = {
|
||||||
freshrss.enable = true;
|
freshrss.enable = true;
|
||||||
traefik.enable = true;
|
traefik.enable = true;
|
||||||
};
|
};
|
||||||
virtualisation.guest.enable = true;
|
virtualisation.guest.enable = true;
|
||||||
users.deploy.enable = true;
|
|
||||||
};
|
};
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
|
|
@ -34,7 +32,7 @@
|
||||||
interfaces.ens18 = {
|
interfaces.ens18 = {
|
||||||
ipv4.addresses = [
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = config.homelab.networking.hostIp;
|
address = "192.168.0.92";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -3,7 +3,6 @@
|
||||||
{
|
{
|
||||||
config = {
|
config = {
|
||||||
homelab = {
|
homelab = {
|
||||||
networking.hostIp = "192.168.0.22";
|
|
||||||
apps.vaultwarden = {
|
apps.vaultwarden = {
|
||||||
enable = true;
|
enable = true;
|
||||||
domain = "https://vault.depeuter.dev";
|
domain = "https://vault.depeuter.dev";
|
||||||
|
|
@ -11,17 +10,13 @@
|
||||||
};
|
};
|
||||||
virtualisation.guest.enable = true;
|
virtualisation.guest.enable = true;
|
||||||
|
|
||||||
users = {
|
users.admin = {
|
||||||
deploy.enable = true;
|
|
||||||
|
|
||||||
admin = {
|
|
||||||
enable = true;
|
enable = true;
|
||||||
authorizedKeys = [
|
authorizedKeys = [
|
||||||
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnihoyozOCnm6T9OzL2xoMeMZckBYR2w43us68ABA93"
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJnihoyozOCnm6T9OzL2xoMeMZckBYR2w43us68ABA93"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
hostId = "aaaa1300";
|
hostId = "aaaa1300";
|
||||||
|
|
@ -37,7 +32,7 @@
|
||||||
interfaces.ens18 = {
|
interfaces.ens18 = {
|
||||||
ipv4.addresses = [
|
ipv4.addresses = [
|
||||||
{
|
{
|
||||||
address = config.homelab.networking.hostIp;
|
address = "192.168.0.22";
|
||||||
prefixLength = 24;
|
prefixLength = 24;
|
||||||
}
|
}
|
||||||
];
|
];
|
||||||
|
|
|
||||||
|
|
@ -496,8 +496,7 @@ in {
|
||||||
#FORGEJO__mailer__CLIENT_KEY_FILE = "custom/mailer/key.pem";
|
#FORGEJO__mailer__CLIENT_KEY_FILE = "custom/mailer/key.pem";
|
||||||
# Mail from address, RFC 5322. This can be just an email address, or the
|
# Mail from address, RFC 5322. This can be just an email address, or the
|
||||||
# `"Name" <email@example.com>` format.
|
# `"Name" <email@example.com>` format.
|
||||||
# TODO Hugo: Populate 'gitea_mailer_from' in sops.
|
FORGEJO__mailer__FROM = ''"${title}" <git@depeuter.dev>'';
|
||||||
FORGEJO__mailer__FROM = config.sops.placeholder.gitea_mailer_from or "git@example.com";
|
|
||||||
# Sometimes it is helpful to use a different address on the envelope. Set this to use
|
# Sometimes it is helpful to use a different address on the envelope. Set this to use
|
||||||
# ENVELOPE_FROM as the from on the envelope. Set to `<>` to send an empty address.
|
# ENVELOPE_FROM as the from on the envelope. Set to `<>` to send an empty address.
|
||||||
#FORGEJO__mailer__ENVELOPE_FROM = "";
|
#FORGEJO__mailer__ENVELOPE_FROM = "";
|
||||||
|
|
|
||||||
|
|
@ -72,7 +72,7 @@ in {
|
||||||
# Certificates
|
# Certificates
|
||||||
"--certificatesresolvers.letsencrypt.acme.dnschallenge=true"
|
"--certificatesresolvers.letsencrypt.acme.dnschallenge=true"
|
||||||
"--certificatesresolvers.letsencrypt.acme.dnschallenge.provider=cloudflare"
|
"--certificatesresolvers.letsencrypt.acme.dnschallenge.provider=cloudflare"
|
||||||
"--certificatesresolvers.letsencrypt.acme.email=${config.sops.placeholder.acme_email or "acme-email@example.com"}"
|
"--certificatesresolvers.letsencrypt.acme.email=tibo.depeuter@telenet.be"
|
||||||
"--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
|
"--certificatesresolvers.letsencrypt.acme.storage=/letsencrypt/acme.json"
|
||||||
];
|
];
|
||||||
volumes = [
|
volumes = [
|
||||||
|
|
|
||||||
|
|
@ -344,7 +344,6 @@ in {
|
||||||
# ORG_CREATION_USERS=none
|
# ORG_CREATION_USERS=none
|
||||||
## A comma-separated list means only those users can create orgs:
|
## A comma-separated list means only those users can create orgs:
|
||||||
# ORG_CREATION_USERS=admin1@example.com,admin2@example.com
|
# ORG_CREATION_USERS=admin1@example.com,admin2@example.com
|
||||||
# TODO Hugo: Redact org creation users if needed.
|
|
||||||
|
|
||||||
## Invitations org admins to invite users, even when signups are disabled
|
## Invitations org admins to invite users, even when signups are disabled
|
||||||
# INVITATIONS_ALLOWED=true
|
# INVITATIONS_ALLOWED=true
|
||||||
|
|
@ -591,7 +590,7 @@ in {
|
||||||
## To make sure the email links are pointing to the correct host, set the DOMAIN variable.
|
## To make sure the email links are pointing to the correct host, set the DOMAIN variable.
|
||||||
## Note: if SMTP_USERNAME is specified, SMTP_PASSWORD is mandatory
|
## Note: if SMTP_USERNAME is specified, SMTP_PASSWORD is mandatory
|
||||||
SMTP_HOST = "smtp.gmail.com";
|
SMTP_HOST = "smtp.gmail.com";
|
||||||
SMTP_FROM = config.sops.placeholder.vaultwarden_smtp_from or "vaultwarden@example.com";
|
SMTP_FROM = "vault@depeuter.dev";
|
||||||
SMTP_FROM_NAME = cfg.name;
|
SMTP_FROM_NAME = cfg.name;
|
||||||
# SMTP_USERNAME=username
|
# SMTP_USERNAME=username
|
||||||
# SMTP_PASSWORD=password
|
# SMTP_PASSWORD=password
|
||||||
|
|
|
||||||
|
|
@ -1,9 +1,4 @@
|
||||||
{
|
{
|
||||||
imports = [
|
|
||||||
./networking.nix
|
|
||||||
./secrets.nix
|
|
||||||
];
|
|
||||||
|
|
||||||
config = {
|
config = {
|
||||||
homelab = {
|
homelab = {
|
||||||
services.openssh.enable = true;
|
services.openssh.enable = true;
|
||||||
|
|
|
||||||
|
|
@ -1,19 +0,0 @@
|
||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
options.homelab.networking = {
|
|
||||||
hostIp = lib.mkOption {
|
|
||||||
type = lib.types.nullOr lib.types.str;
|
|
||||||
default = null;
|
|
||||||
description = ''
|
|
||||||
The primary IP address of the host.
|
|
||||||
Used for automated deployment and internal service discovery.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf (config.homelab.networking.hostIp != null) {
|
|
||||||
# If a hostIp is provided, we can potentially use it to configure
|
|
||||||
# networking interfaces or firewall rules automatically here in the future.
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,18 +0,0 @@
|
||||||
{ config, lib, ... }:
|
|
||||||
|
|
||||||
{
|
|
||||||
sops.secrets = {
|
|
||||||
# -- User Public Keys (Anti-Fingerprinting) --
|
|
||||||
"user_keys_admin" = { neededForUsers = true; };
|
|
||||||
"user_keys_deploy" = { neededForUsers = true; };
|
|
||||||
"user_keys_backup" = { neededForUsers = true; };
|
|
||||||
|
|
||||||
# -- Infrastructure Metadata --
|
|
||||||
# Hugo TODO: Populate these in your .sops.yaml / secrets file
|
|
||||||
"acme_email" = {};
|
|
||||||
"cloudflare_dns_token" = {};
|
|
||||||
"pgadmin_email" = {};
|
|
||||||
"gitea_mailer_from" = {};
|
|
||||||
"vaultwarden_smtp_from" = {};
|
|
||||||
};
|
|
||||||
}
|
|
||||||
|
|
@ -1,29 +0,0 @@
|
||||||
{ self, nixpkgs, ... }:
|
|
||||||
|
|
||||||
let
|
|
||||||
system = "x86_64-linux";
|
|
||||||
pkgs = nixpkgs.legacyPackages.${system};
|
|
||||||
in
|
|
||||||
pkgs.nixosTest {
|
|
||||||
name = "deploy-user-test";
|
|
||||||
nodes = {
|
|
||||||
machine = { ... }: {
|
|
||||||
imports = [
|
|
||||||
../modules
|
|
||||||
../users
|
|
||||||
];
|
|
||||||
homelab.users.deploy.enable = true;
|
|
||||||
system.stateVersion = "24.11"; # Match the current nixpkgs version
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
testScript = ''
|
|
||||||
machine.wait_for_unit("multi-user.target")
|
|
||||||
# Verify user exists
|
|
||||||
machine.succeed("id deploy")
|
|
||||||
# Verify we can run nix-env as deploy via sudo
|
|
||||||
machine.succeed("sudo -u deploy -n nix-env --version")
|
|
||||||
# Verify switch-to-configuration is accessible (it's added to path by the module)
|
|
||||||
machine.succeed("whereis switch-to-configuration")
|
|
||||||
'';
|
|
||||||
}
|
|
||||||
|
|
@ -26,9 +26,7 @@ in {
|
||||||
config.users.groups.wheel.name # Enable 'sudo' for the user.
|
config.users.groups.wheel.name # Enable 'sudo' for the user.
|
||||||
];
|
];
|
||||||
initialPassword = "ChangeMe";
|
initialPassword = "ChangeMe";
|
||||||
openssh.authorizedKeys.keyFiles = [
|
openssh.authorizedKeys.keys = cfg.authorizedKeys;
|
||||||
config.sops.secrets.user_keys_admin.path
|
|
||||||
];
|
|
||||||
packages = with pkgs; [
|
packages = with pkgs; [
|
||||||
curl
|
curl
|
||||||
git
|
git
|
||||||
|
|
|
||||||
|
|
@ -12,8 +12,9 @@ in {
|
||||||
extraGroups = [
|
extraGroups = [
|
||||||
"docker" # Allow access to the docker socket.
|
"docker" # Allow access to the docker socket.
|
||||||
];
|
];
|
||||||
openssh.authorizedKeys.keyFiles = [
|
openssh.authorizedKeys.keys = [
|
||||||
config.sops.secrets.user_keys_backup.path
|
# Hugo
|
||||||
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICms6vjhE9kOlqV5GBPGInwUHAfCSVHLI2Gtzee0VXPh"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -3,19 +3,7 @@
|
||||||
let
|
let
|
||||||
cfg = config.homelab.users.deploy;
|
cfg = config.homelab.users.deploy;
|
||||||
in {
|
in {
|
||||||
options.homelab.users.deploy = {
|
options.homelab.users.deploy.enable = lib.mkEnableOption "user Deploy";
|
||||||
enable = lib.mkEnableOption "user Deploy";
|
|
||||||
|
|
||||||
authorizedKeys = lib.mkOption {
|
|
||||||
type = lib.types.listOf lib.types.str;
|
|
||||||
default = [];
|
|
||||||
description = ''
|
|
||||||
Additional SSH public keys authorized for the deploy user.
|
|
||||||
The CI runner key should be provided as a base key; personal
|
|
||||||
workstation keys can be appended here per host or globally.
|
|
||||||
'';
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
config = lib.mkIf cfg.enable {
|
config = lib.mkIf cfg.enable {
|
||||||
users = {
|
users = {
|
||||||
|
|
@ -27,15 +15,12 @@ in {
|
||||||
isSystemUser = true;
|
isSystemUser = true;
|
||||||
home = "/var/empty";
|
home = "/var/empty";
|
||||||
shell = pkgs.bashInteractive;
|
shell = pkgs.bashInteractive;
|
||||||
openssh.authorizedKeys.keyFiles = [
|
openssh.authorizedKeys.keys = [
|
||||||
config.sops.secrets.user_keys_deploy.path
|
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIPrG+ldRBdCeHEXrsy/qHXIJYg8xQXVuiUR0DxhFjYNg"
|
||||||
];
|
];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# Allow the deploy user to push closures to the nix store
|
|
||||||
nix.settings.trusted-users = [ "deploy" ];
|
|
||||||
|
|
||||||
security.sudo.extraRules = [
|
security.sudo.extraRules = [
|
||||||
{
|
{
|
||||||
groups = [
|
groups = [
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue