Compare commits

...

4 Commits

Author SHA1 Message Date
Sandro - 5a3413a791
Fix backup module symlinks 2024-01-11 21:51:22 +01:00
Sandro - 32a85a9579
flake.lock: Update
Flake lock file updates:

• Updated input 'nixos-modules':
    'github:SuperSandro2000/nixos-modules/be9fdb7e8b9066f7ec4d1ebe5f5c45d0bb9c81cb' (2024-01-11)
  → 'github:SuperSandro2000/nixos-modules/0701c4fdc6eb495db4507732842af1bdbda7be26' (2024-01-11)
2024-01-11 21:51:22 +01:00
Sandro - 65bc6519ec
harmonia: dedupe code with nixos-modules 2024-01-11 21:51:22 +01:00
Sandro - a2925001fa
flake.lock: Update
Flake lock file updates:

• Updated input 'disko':
    'github:nix-community/disko/f0a3425a7b173701922e7959d8bfb136ef53aa54' (2024-01-08)
  → 'github:nix-community/disko/be305848c682f221835c820288264bbf2ccf523c' (2024-01-11)
• Updated input 'nixos-modules':
    'github:SuperSandro2000/nixos-modules/b376eaa114e9dc49650bde18d86c6924081b8fb1' (2024-01-09)
  → 'github:SuperSandro2000/nixos-modules/be9fdb7e8b9066f7ec4d1ebe5f5c45d0bb9c81cb' (2024-01-11)
• Updated input 'openwrt-imagebuilder':
    'github:astro/nix-openwrt-imagebuilder/e7c4b52d89d82f420da60b2699ebcaabc6fa3f58' (2024-01-10)
  → 'github:astro/nix-openwrt-imagebuilder/6095f280008f06d6fb67619cf0d9504630fc0eba' (2024-01-11)
2024-01-11 21:51:22 +01:00
4 changed files with 17 additions and 27 deletions

View File

@ -34,6 +34,7 @@ If you want to have an additional backport, cherry-pick or other change, please
### nixos-modules repo
The nixos-modules repo lives at <https://github.com/supersandro2000/nixos-modules> and is mirrored to <https://gitea.c3d2.de/c3d2/nixos-modules>.
Auto generated documentation about all options is available at <https://supersandro2000.github.io/nixos-modules/>.
It contains options sandro shares between his private nixos configs and the C3D2 one.
It sets many options by default and when searching for a particular setting you should always grep this repo, too.
In question ask sandro and consider improving the documentation about this with comments and readme explanations.

View File

@ -209,11 +209,11 @@
]
},
"locked": {
"lastModified": 1704741201,
"narHash": "sha256-Y420NeqPWRSpxHpXsxhKILfTxT5exjtTgCgDwSpcEfU=",
"lastModified": 1704969432,
"narHash": "sha256-ykc0B9nhp1c6+FeyjJyxAb+0zbZFuYm9LR44cdkWseE=",
"owner": "nix-community",
"repo": "disko",
"rev": "f0a3425a7b173701922e7959d8bfb136ef53aa54",
"rev": "be305848c682f221835c820288264bbf2ccf523c",
"type": "github"
},
"original": {
@ -402,11 +402,11 @@
]
},
"locked": {
"lastModified": 1704837864,
"narHash": "sha256-NpwTmChAv4S8Jpt57e9CVSM3szTqqO0gZhlnSg7SAbw=",
"lastModified": 1705005928,
"narHash": "sha256-r2VVXtWyIlKMtaNDrv2RdUx8S7dULj5wyh5fx3psn+8=",
"owner": "SuperSandro2000",
"repo": "nixos-modules",
"rev": "b376eaa114e9dc49650bde18d86c6924081b8fb1",
"rev": "0701c4fdc6eb495db4507732842af1bdbda7be26",
"type": "github"
},
"original": {
@ -456,11 +456,11 @@
]
},
"locked": {
"lastModified": 1704881815,
"narHash": "sha256-wgCwbycANSfjZtwLFZLsMKdEeyIOVFNW8Y6W1xgj3wM=",
"lastModified": 1704967984,
"narHash": "sha256-npd1W67dO6UkJOla2oj25C6rPXRFlUabqNSODy7aq5E=",
"owner": "astro",
"repo": "nix-openwrt-imagebuilder",
"rev": "e7c4b52d89d82f420da60b2699ebcaabc6fa3f58",
"rev": "6095f280008f06d6fb67619cf0d9504630fc0eba",
"type": "github"
},
"original": {

View File

@ -1,8 +1,5 @@
{ config, lib, libS, pkgs, ... }:
let
cachePort = 5000;
in
{
imports = [
./hardware-configuration.nix
@ -155,15 +152,11 @@ in
'';
};
# A rust nix binary cache
harmonia = {
enable = true;
settings = {
bind = "[::]:${toString cachePort}";
workers = 20;
max_connection_rate = 1024;
priority = 50;
};
domain = "nix-cache.hq.c3d2.de";
port = 5000;
settings.workers = 20;
signKeyPath = config.sops.secrets."nix/signing-key/secretKey".path;
};
@ -182,14 +175,6 @@ in
"nix-cache.hq.c3d2.de" = {
forceSSL = true;
enableACME = true;
locations."/" = {
proxyPass = "http://127.0.0.1:${toString cachePort}";
extraConfig = ''
brotli off;
gzip off;
zstd off;
'';
};
};
};
};

View File

@ -68,6 +68,10 @@ in
config = {
c3d2.deployment.mounts = [ "etc" "home" "var" ];
# make mounts like /etc /home /var available early so that they can be used in system.activationScripts
fileSystems = lib.genAttrs (map (x: "/" + x) config.c3d2.deployment.mounts)
(_: { neededForBoot = true; });
microvm = {
hypervisor = lib.mkDefault "cloud-hypervisor";
mem = lib.mkDefault 512;