Compare commits
18 Commits
911f3589a2
...
master
| Author | SHA1 | Date | |
|---|---|---|---|
| f5b3a04378 | |||
| a4c5a10c4f | |||
| b8a8e1bdce | |||
| 40a48eb605 | |||
| 266f563c2f | |||
| a49c4f40e5 | |||
| a8851c19e4 | |||
| 3497d93dcb | |||
| 955c3255a0 | |||
| 6b367a7c95 | |||
| 02155976ab | |||
| 4c7f22b903 | |||
| f0f7c2613e | |||
| b92ca00054 | |||
| 2315d56db0 | |||
| 98c0142938 | |||
| 4b3eef4150 | |||
| 857f0daa95 |
26
AGENTS.md
Normal file
26
AGENTS.md
Normal file
@@ -0,0 +1,26 @@
|
|||||||
|
# AGENTS.md
|
||||||
|
|
||||||
|
This document outlines the development conventions for this NixOS-based infrastructure repository.
|
||||||
|
|
||||||
|
## Build & Deployment
|
||||||
|
|
||||||
|
- **Build/Deploy:** Use `nixos-rebuild switch --flake .#<hostname>` to build and deploy the configuration for a specific host.
|
||||||
|
- **Development Shell:** Activate the development environment with `nix develop`.
|
||||||
|
|
||||||
|
## Linting & Formatting
|
||||||
|
|
||||||
|
- **Formatting:** This project uses `nixpkgs-fmt` for automatic formatting. Ensure it is run before committing changes.
|
||||||
|
- `nixpkgs-fmt .`
|
||||||
|
- **Linting:** No specific linter is configured, but adhere to standard Nix language conventions.
|
||||||
|
|
||||||
|
## Testing
|
||||||
|
|
||||||
|
- No automated testing suite is configured. Manually verify changes by deploying to a non-critical host.
|
||||||
|
|
||||||
|
## Code Style & Conventions
|
||||||
|
|
||||||
|
- **Imports:** Keep module imports clean and organized at the top of files.
|
||||||
|
- **Naming:** Follow Nix community conventions for variable and function names (e.g., `camelCase` for variables, `kebab-case` for package names).
|
||||||
|
- **Secrets:** Secrets are managed with `agenix`. Edit encrypted files with `agenix -e <file>`.
|
||||||
|
- **Modularity:** Structure configurations into logical, reusable modules under `modules/`. New modules should be registered in `modules/nixos/default.nix` to be available to all hosts.
|
||||||
|
- **Error Handling:** Ensure Nix expressions are robust and handle potential evaluation errors gracefully.
|
||||||
Submodule assets/compose updated: bcaad554a6...5def86e278
12
flake.lock
generated
12
flake.lock
generated
@@ -10,11 +10,11 @@
|
|||||||
"systems": "systems"
|
"systems": "systems"
|
||||||
},
|
},
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1754337839,
|
"lastModified": 1754433428,
|
||||||
"narHash": "sha256-fEc2/4YsJwtnLU7HCFMRckb0u9UNnDZmwGhXT5U5NTw=",
|
"narHash": "sha256-NA/FT2hVhKDftbHSwVnoRTFhes62+7dxZbxj5Gxvghs=",
|
||||||
"owner": "ryantm",
|
"owner": "ryantm",
|
||||||
"repo": "agenix",
|
"repo": "agenix",
|
||||||
"rev": "856df6f6922845abd4fd958ce21febc07ca2fa45",
|
"rev": "9edb1787864c4f59ae5074ad498b6272b3ec308d",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
@@ -46,11 +46,11 @@
|
|||||||
},
|
},
|
||||||
"nixpkgs": {
|
"nixpkgs": {
|
||||||
"locked": {
|
"locked": {
|
||||||
"lastModified": 1753939845,
|
"lastModified": 1755615617,
|
||||||
"narHash": "sha256-K2ViRJfdVGE8tpJejs8Qpvvejks1+A4GQej/lBk5y7I=",
|
"narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=",
|
||||||
"owner": "nixos",
|
"owner": "nixos",
|
||||||
"repo": "nixpkgs",
|
"repo": "nixpkgs",
|
||||||
"rev": "94def634a20494ee057c76998843c015909d6311",
|
"rev": "20075955deac2583bb12f07151c2df830ef346b4",
|
||||||
"type": "github"
|
"type": "github"
|
||||||
},
|
},
|
||||||
"original": {
|
"original": {
|
||||||
|
|||||||
@@ -8,6 +8,7 @@
|
|||||||
inputs.darwin.follows = "";
|
inputs.darwin.follows = "";
|
||||||
inputs.nixpkgs.follows = "nixpkgs";
|
inputs.nixpkgs.follows = "nixpkgs";
|
||||||
};
|
};
|
||||||
|
self.submodules = true;
|
||||||
};
|
};
|
||||||
|
|
||||||
outputs = { self, nixpkgs, agenix, ... }@inputs:
|
outputs = { self, nixpkgs, agenix, ... }@inputs:
|
||||||
@@ -16,7 +17,10 @@
|
|||||||
keys = import ./lib/keys.nix;
|
keys = import ./lib/keys.nix;
|
||||||
paths = {
|
paths = {
|
||||||
flake = "/home/gortium/infra";
|
flake = "/home/gortium/infra";
|
||||||
identities = [ "/home/gortium/.ssh/gortium_ssh_key" "/etc/ssh/ssh_host_ed25519_key" ];
|
identities = [
|
||||||
|
"/home/gortium/.ssh/gortium_ssh_key"
|
||||||
|
"/etc/ssh/ssh_host_ed25519_key"
|
||||||
|
"/root/.age/bootstrap.key" ];
|
||||||
};
|
};
|
||||||
overlays = [ agenix.overlays.default ];
|
overlays = [ agenix.overlays.default ];
|
||||||
pkgs = import nixpkgs {
|
pkgs = import nixpkgs {
|
||||||
|
|||||||
@@ -29,6 +29,8 @@
|
|||||||
boot.loader.systemd-boot.enable = true;
|
boot.loader.systemd-boot.enable = true;
|
||||||
boot.loader.efi.canTouchEfiVariables = false;
|
boot.loader.efi.canTouchEfiVariables = false;
|
||||||
|
|
||||||
|
boot.kernelModules = [ "nct6775" "lm63" ];
|
||||||
|
boot.blacklistedKernelModules = [ "eeepc_wmi" ];
|
||||||
networking.hostName = "lazyworkhorse"; # Define your hostname.
|
networking.hostName = "lazyworkhorse"; # Define your hostname.
|
||||||
# Pick only one of the below networking options.
|
# Pick only one of the below networking options.
|
||||||
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
# networking.wireless.enable = true; # Enables wireless support via wpa_supplicant.
|
||||||
@@ -56,31 +58,6 @@
|
|||||||
LC_CTYPE = "en_CA.UTF-8";
|
LC_CTYPE = "en_CA.UTF-8";
|
||||||
};
|
};
|
||||||
|
|
||||||
# Private host ssh key
|
|
||||||
age = {
|
|
||||||
identityPaths = paths.identities;
|
|
||||||
secrets = {
|
|
||||||
lazyworkhorse_host_ssh_key = {
|
|
||||||
file = "${self}/secrets/lazyworkhorse_host_ssh_key.age";
|
|
||||||
owner = "root";
|
|
||||||
group = "root";
|
|
||||||
mode = "0600";
|
|
||||||
path = "/etc/ssh/ssh_host_ed25519_key";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
|
|
||||||
# Public host ssh key
|
|
||||||
environment.etc."ssh/ssh_host_ed25519_key.pub".text = keys.hosts.lazyworkhorse.main;
|
|
||||||
|
|
||||||
# Prevent sshd from generating new keys and use this one
|
|
||||||
services.openssh.hostKeys = [
|
|
||||||
{
|
|
||||||
path = "/etc/ssh/ssh_host_ed25519_key";
|
|
||||||
type = "ed25519";
|
|
||||||
}
|
|
||||||
];
|
|
||||||
|
|
||||||
# Configure network proxy if necessary
|
# Configure network proxy if necessary
|
||||||
# networking.proxy.default = "http://user:password@proxy:port/";
|
# networking.proxy.default = "http://user:password@proxy:port/";
|
||||||
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
# networking.proxy.noProxy = "127.0.0.1,localhost,internal.domain";
|
||||||
@@ -130,6 +107,7 @@
|
|||||||
age
|
age
|
||||||
git
|
git
|
||||||
nh
|
nh
|
||||||
|
lm_sensors
|
||||||
];
|
];
|
||||||
|
|
||||||
# Some programs need SUID wrappers, can be configured further or are
|
# Some programs need SUID wrappers, can be configured further or are
|
||||||
@@ -142,10 +120,59 @@
|
|||||||
|
|
||||||
# List services that you want to enable:
|
# List services that you want to enable:
|
||||||
|
|
||||||
# Enable the OpenSSH daemon.
|
# Enable the OpenSSH daemon
|
||||||
services.openssh = {
|
services.openssh = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings.PermitRootLogin = "no";
|
settings.PermitRootLogin = "no";
|
||||||
|
hostKeys = [
|
||||||
|
{
|
||||||
|
path = "/etc/ssh/ssh_host_ed25519_key";
|
||||||
|
type = "ed25519";
|
||||||
|
}
|
||||||
|
];
|
||||||
|
};
|
||||||
|
|
||||||
|
# Private host ssh key managed by agenix
|
||||||
|
age = {
|
||||||
|
identityPaths = paths.identities;
|
||||||
|
secrets = {
|
||||||
|
containers_env = {
|
||||||
|
file = ../../secrets/containers.env.age;
|
||||||
|
path = "/run/secrets/containers.env";
|
||||||
|
owner = "root";
|
||||||
|
group = "root";
|
||||||
|
mode = "0400";
|
||||||
|
};
|
||||||
|
lazyworkhorse_host_ssh_key = {
|
||||||
|
file = ../../secrets/lazyworkhorse_host_ssh_key.age;
|
||||||
|
owner = "root";
|
||||||
|
group = "root";
|
||||||
|
mode = "0600";
|
||||||
|
path = "/etc/ssh/ssh_host_ed25519_key";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
# Public host ssh key (kept in sync with the private one)
|
||||||
|
environment.etc."ssh/ssh_host_ed25519_key.pub".text =
|
||||||
|
"${keys.hosts.lazyworkhorse.main}";
|
||||||
|
|
||||||
|
services.fstrim.enable = true;
|
||||||
|
|
||||||
|
services.zfs.autoSnapshot.enable = true;
|
||||||
|
services.zfs.autoScrub.enable = true;
|
||||||
|
|
||||||
|
hardware.graphics = {
|
||||||
|
enable = true;
|
||||||
|
enable32Bit = true;
|
||||||
|
extraPackages = with pkgs; [
|
||||||
|
rocmPackages.clr
|
||||||
|
rocmPackages.rocblas
|
||||||
|
rocmPackages.rocrand
|
||||||
|
rocmPackages.rocminfo
|
||||||
|
rocmPackages.hipcc
|
||||||
|
rocmPackages.hiprt
|
||||||
|
];
|
||||||
};
|
};
|
||||||
|
|
||||||
# Open ports in the firewall.
|
# Open ports in the firewall.
|
||||||
|
|||||||
@@ -12,6 +12,7 @@
|
|||||||
main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBmPv4JssvhHGIx85UwFxDSrL5anR4eXB/cd9V2i9wdW";
|
main = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIBmPv4JssvhHGIx85UwFxDSrL5anR4eXB/cd9V2i9wdW";
|
||||||
github = "";
|
github = "";
|
||||||
gitea = "";
|
gitea = "";
|
||||||
|
bootstrap = "age1r796v2uldtspawyh863pks74sd2pwcan8j4e4pjzsvkmr3vjja9qpz5ste";
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -1,7 +1,7 @@
|
|||||||
{ pkgs, lib, config, ... }: {
|
{ pkgs, lib, config, ... }: {
|
||||||
|
|
||||||
options = {
|
options = {
|
||||||
hoardingcow-mount.enable = lib.mkEnableOption "enable hoardingcow acces";
|
hoardingcow-mount.enable = lib.mkEnableOption "enable hoardingcow access";
|
||||||
};
|
};
|
||||||
config = lib.mkIf config.hoardingcow-mount.enable {
|
config = lib.mkIf config.hoardingcow-mount.enable {
|
||||||
fileSystems."/mnt/HoardingCow_docker_data" = {
|
fileSystems."/mnt/HoardingCow_docker_data" = {
|
||||||
|
|||||||
@@ -4,6 +4,7 @@
|
|||||||
./network.nix
|
./network.nix
|
||||||
./passwordmanager.nix
|
./passwordmanager.nix
|
||||||
./versioncontrol.nix
|
./versioncontrol.nix
|
||||||
|
./fancontrol.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
virtualisation.docker = {
|
virtualisation.docker = {
|
||||||
@@ -12,17 +13,4 @@
|
|||||||
"dns" = [ "1.1.1.1" "8.8.8.8" ];
|
"dns" = [ "1.1.1.1" "8.8.8.8" ];
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
age = {
|
|
||||||
identityPaths = paths.identities;
|
|
||||||
secrets = {
|
|
||||||
containers_env = {
|
|
||||||
file = self + "/secrets/containers.env.age";
|
|
||||||
path = "/run/secrets/containers.env";
|
|
||||||
owner = "root";
|
|
||||||
group = "root";
|
|
||||||
mode = "0400";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
}
|
||||||
|
|||||||
37
modules/nixos/services/systemd/fancontrol.nix
Normal file
37
modules/nixos/services/systemd/fancontrol.nix
Normal file
@@ -0,0 +1,37 @@
|
|||||||
|
{ config, lib, pkgs, ... }:
|
||||||
|
|
||||||
|
with lib;
|
||||||
|
|
||||||
|
let
|
||||||
|
cfg = config.services.systemd-fancon;
|
||||||
|
in
|
||||||
|
{
|
||||||
|
options.services.systemd-fancon = {
|
||||||
|
enable = mkEnableOption "systemd-fancon service for fan control";
|
||||||
|
config = mkOption {
|
||||||
|
type = types.lines;
|
||||||
|
default = "";
|
||||||
|
description = "Configuration for systemd-fancon.";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
config = mkIf cfg.enable {
|
||||||
|
environment.systemPackages = with pkgs; [
|
||||||
|
systemd-fancon
|
||||||
|
lm_sensors
|
||||||
|
];
|
||||||
|
|
||||||
|
boot.kernelModules = [ "amdgpu" ];
|
||||||
|
|
||||||
|
systemd.services.systemd-fancon = {
|
||||||
|
description = "systemd-fancon service";
|
||||||
|
wantedBy = [ "multi-user.target" ];
|
||||||
|
after = [ "network-online.target" ];
|
||||||
|
serviceConfig = {
|
||||||
|
ExecStart = "${pkgs.systemd-fancon}/bin/systemd-fancon -c ${cfg.configFile}";
|
||||||
|
Restart = "on-failure";
|
||||||
|
};
|
||||||
|
configFile = pkgs.writeText "systemd-fancon.conf" cfg.config;
|
||||||
|
};
|
||||||
|
};
|
||||||
|
}
|
||||||
@@ -16,8 +16,8 @@ in
|
|||||||
|
|
||||||
systemd.services.network_stack = {
|
systemd.services.network_stack = {
|
||||||
description = "Traefik + DDNS updater via Docker Compose";
|
description = "Traefik + DDNS updater via Docker Compose";
|
||||||
after = [ "network.target" "docker.service" ];
|
after = [ "network-online.target" "docker.service" ];
|
||||||
requires = [ "network.target" "docker.service" ];
|
wants = [ "network-online.target" "docker.service" ];
|
||||||
serviceConfig = {
|
serviceConfig = {
|
||||||
WorkingDirectory = "${network_compose_dir}";
|
WorkingDirectory = "${network_compose_dir}";
|
||||||
|
|
||||||
|
|||||||
@@ -22,10 +22,10 @@ in
|
|||||||
# Stop left over container by the same name
|
# Stop left over container by the same name
|
||||||
ExecStartPre = "${pkgs.bash}/bin/bash -c '${pkgs.docker-compose}/bin/docker-compose down || true'";
|
ExecStartPre = "${pkgs.bash}/bin/bash -c '${pkgs.docker-compose}/bin/docker-compose down || true'";
|
||||||
|
|
||||||
# Démarrer les conteneurs avec Docker Compose
|
# Start the services using Docker Compose
|
||||||
ExecStart = "${pkgs.docker-compose}/bin/docker-compose up -d";
|
ExecStart = "${pkgs.docker-compose}/bin/docker-compose up -d";
|
||||||
|
|
||||||
# Arrêter et supprimer les conteneurs à l’arrêt
|
# Stop and remove containers on shutdown
|
||||||
ExecStop = "${pkgs.docker-compose}/bin/docker-compose down";
|
ExecStop = "${pkgs.docker-compose}/bin/docker-compose down";
|
||||||
|
|
||||||
RemainAfterExit = true;
|
RemainAfterExit = true;
|
||||||
|
|||||||
@@ -24,10 +24,10 @@ in
|
|||||||
# Stop left over container by the same name
|
# Stop left over container by the same name
|
||||||
ExecStartPre = "${pkgs.bash}/bin/bash -c '${pkgs.docker-compose}/bin/docker-compose down || true'";
|
ExecStartPre = "${pkgs.bash}/bin/bash -c '${pkgs.docker-compose}/bin/docker-compose down || true'";
|
||||||
|
|
||||||
# Démarrer les conteneurs avec Docker Compose
|
# Start the services using Docker Compose
|
||||||
ExecStart = "${pkgs.docker-compose}/bin/docker-compose up -d";
|
ExecStart = "${pkgs.docker-compose}/bin/docker-compose up -d";
|
||||||
|
|
||||||
# Arrêter et supprimer les conteneurs à l’arrêt
|
# Stop and remove containers on shutdown
|
||||||
ExecStop = "${pkgs.docker-compose}/bin/docker-compose down";
|
ExecStop = "${pkgs.docker-compose}/bin/docker-compose down";
|
||||||
|
|
||||||
RemainAfterExit = true;
|
RemainAfterExit = true;
|
||||||
|
|||||||
Binary file not shown.
Binary file not shown.
@@ -1,6 +1,6 @@
|
|||||||
let
|
let
|
||||||
keys = import ../lib/keys.nix;
|
keys = import ../lib/keys.nix;
|
||||||
authorizedKeys = [ keys.users.gortium.main keys.hosts.lazyworkhorse.main ];
|
authorizedKeys = [ keys.users.gortium.main keys.hosts.lazyworkhorse.main keys.hosts.lazyworkhorse.bootstrap ];
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
"containers.env.age".publicKeys = authorizedKeys;
|
"containers.env.age".publicKeys = authorizedKeys;
|
||||||
|
|||||||
Reference in New Issue
Block a user