resolve incus merge conflict

This commit is contained in:
Joseph Hanson 2024-09-01 16:43:08 -05:00
parent 81847253a0
commit 1e29882c46

View file

@ -1,16 +1,73 @@
{ config, pkgs, ... }:
{ config, pkgs, lib, ... }:
let
cfg = config.mySystem.system.incus;
user = "jahanson";
in
{
sops.secrets.secret-domain-0 = {
sopsFile = ./secret.sops.yaml;
# sops.secrets.secret-domain-0 = {
# sopsFile = ./secret.sops.yaml;
# };
options.mySystem.system.incus = {
enable = lib.mkEnableOption "incus";
};
users.users.jahanson.extraGroups = [ "incus-admin" ];
config = lib.mkIf cfg.enable {
virtualisation.incus = {
enable = true;
ui.enable = true;
preseed = {
config = {
"core.https_address" = "10.1.1.15:8445"; # Need quotes around key
};
networks = [
{
config = {
"ipv4.address" = "auto"; # Need quotes around key
"ipv6.address" = "auto"; # Need quotes around key
};
description = "";
name = "incusbr0";
type = "";
project = "default";
}
];
storage_pools = [
{
config = {
source = "eru/incus";
};
description = "";
name = "default";
driver = "zfs";
}
];
profiles = [
{
config = { };
description = "";
devices = {
eth0 = {
name = "eth0";
network = "incusbr0";
type = "nic";
};
root = {
path = "/";
pool = "default";
type = "disk";
};
};
name = "default";
}
];
projects = [ ];
cluster = null;
};
};
users.users.${user}.extraGroups = [ "incus-admin" ];
# systemd.services.incus-preseed.postStart = "${oidcSetup}";
@ -18,7 +75,7 @@
nftables.enable = true;
firewall = {
allowedTCPPorts = [
8443
8445
53
67
];
@ -28,4 +85,5 @@
];
};
};
};
}