Merge branch 'master' of ssh://git.pasetto.me/pazpi/nix

hosts/caddy/default.nix

@@ -177,6 +177,21 @@ in
             host = "http://${p.hosts.homeassistant}:8123";
             domain = p.domains.public;
           }
+          {
+            subdomain = "bacco.ts";
+            host = "https://${p.hosts.bacco}:8006";
+            domain = p.domains.public;
+          }
+          {
+            subdomain = "krzo.ts";
+            host = "https://${p.hosts.krzo}:8006";
+            domain = p.domains.public;
+          }
+          {
+            subdomain = "node.ts";
+            host = "https://${p.hosts.node}:8006";
+            domain = p.domains.public;
+          }
           {
             subdomain = "torrent.ts";
             host = "http://qbittorrent.${p.domains.tsDns}:8090";
@@ -202,6 +217,11 @@ in
             host = "http://${p.hosts.docker-vm}:6060";
             domain = p.domains.public;
           }
+          {
+            subdomain = "pulse.ts";
+            host = "http://${p.hosts.pulse}:7655";
+            domain = p.domains.public;
+          }
         ];
 
       };

hosts/deployments.nix

@@ -7,12 +7,11 @@ let
   # Generate complete colmena host configs (imports + deployment)
   mkColmenaHosts = builtins.mapAttrs (name: cfg: {
     imports = inputs.self.nixosConfigurations.${name}._module.args.modules;
-    deployment =
+    deployment = {
-      {
+      targetHost = hosts.${name} or null;
-        targetHost = hosts.${name} or null;
+      tags = cfg.tags;
-        tags = cfg.tags;
+    }
-      }
+    // (if cfg ? colmenaSshPort then { targetPort = cfg.colmenaSshPort; } else { });
-      // (if cfg ? colmenaSshPort then { targetPort = cfg.colmenaSshPort; } else { });
   }) hostDefs;
 
 in

hosts/parameters.nix

@@ -20,8 +20,9 @@ in
     plex = "plex.${private-domain}";
     docker = "docker.${private-domain}";
     colmena = "colmena.${private-domain}";
-    pve01 = "bacco${private-domain}";
+    bacco = "bacco.${private-domain}";
-    pve02 = "node.${private-domain}";
+    node = "node.${private-domain}";
+    krzo = "krzo.${private-domain}";
     dns01 = "192.168.1.2";
     dns02 = "192.168.1.3";
     shadowsocks = "shadowsocks.${private-domain}";
@@ -38,6 +39,7 @@ in
     actual = "actual-budget.${private-domain}";
     karakeep = "karakeep.${private-domain}";
     docker-vm = "docker-vm.${private-domain}";
+    pulse = "pulse.${private-domain}";
   };
   personal = {
     username = "pazpi";

modules/services/nextcloud.nix

@@ -65,7 +65,7 @@ in
 
         nextcloud = {
           enable = true;
-          package = pkgs.nextcloud32;
+          package = pkgs.nextcloud33;
           hostName = "cloud.${cfg.proxy.domain}";
           https = true;