resolve incus merge conflict

nixos/modules/nixos/system/incus/default.nix

@@ -1,31 +1,89 @@
-{ config, pkgs, ... }:
+{ config, pkgs, lib, ... }:
+let
+  cfg = config.mySystem.system.incus;
+  user = "jahanson";
+in
 {
-  sops.secrets.secret-domain-0 = {
+  # sops.secrets.secret-domain-0 = {
-    sopsFile = ./secret.sops.yaml;
+  #   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 = {
+    virtualisation.incus = {
-    enable = true;
+      enable = true;
-    ui.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;
+      };
+    };
 
-  # systemd.services.incus-preseed.postStart = "${oidcSetup}";
+    users.users.${user}.extraGroups = [ "incus-admin" ];
 
-  networking = {
+    # systemd.services.incus-preseed.postStart = "${oidcSetup}";
-    nftables.enable = true;
+
-    firewall = {
+    networking = {
-      allowedTCPPorts = [
+      nftables.enable = true;
-        8443
+      firewall = {
-        53
+        allowedTCPPorts = [
-        67
+          8445
-      ];
+          53
-      allowedUDPPorts = [
+          67
-        53
+        ];
-        67
+        allowedUDPPorts = [
-      ];
+          53
+          67
+        ];
+      };
     };
   };
 }