many changes and more modularizing

This commit is contained in:
2024-12-12 22:30:24 +01:00
parent df50e70f3e
commit c96c24f864
109 changed files with 20900 additions and 278 deletions

View File

@@ -1,4 +1,4 @@
{ pkgs, ... }:
{ config, pkgs, ... }:
let
cids = import ../modules/staticids.nix;
json = pkgs.formats.json { };
@@ -20,7 +20,7 @@ in {
users.groups.podman.gid = cids.gids.podman;
virtualisation = {
# containers.containersConf.settings = {
# containers.dns_servers = [ "10.42.97.1" ];
# containers.dns_servers = [ "${config.networkPrefix}.97.1" ];
# };
podman = {
enable = true;
@@ -42,8 +42,8 @@ in {
dns_enabled = false;
subnets = [
{
subnet = "10.42.97.0/24";
gateway = "10.42.97.1";
subnet = "${config.networkPrefix}.97.0/24";
gateway = "${config.networkPrefix}.97.1";
}
];
ipam_options = {