navidrome: commented out scripts. ported to vhost

hosts/architect/invidious.nix

@@ -2,27 +2,15 @@
 
 let
   domain = "tube.giugl.io";
-
-  utilities = import ./utilities.nix { inherit lib config; };
-  inherit (utilities) architectInterfaceAddress;
 in
 {
-  services = {
+  services.invidious = {
-    invidious = {
     enable = true;
     package = pkgs.unstablePkgs.invidious;
   };
   
-    nginx.virtualHosts.${domain} = {
+  architect.vhost.${domain} = {
-      forceSSL = true;
+    dnsInterfaces = [ "lan" "tailscale" "wireguard" ];
-      enableACME = true;
+    locations."/".port = config.services.invidious.port;
-      locations."/" = { proxyPass = "http://127.0.0.1:${toString config.services.invidious.port}"; };
   };
-  };
-
-  networking.extraHosts = ''
-    ${architectInterfaceAddress "lan"} ${domain}
-    ${architectInterfaceAddress "wireguard"} ${domain}
-    ${architectInterfaceAddress "tailscale"} ${domain}
-  '';
 }

hosts/architect/libreddit.nix

@@ -2,27 +2,15 @@
 
 let
   domain = "reddit.giugl.io";
-
-  utilities = import ./utilities.nix { inherit lib config; };
-  inherit (utilities) architectInterfaceAddress;
 in
 {
-  services = {
+  services.libreddit = {
-    libreddit = {
     enable = true;
     port = 9090;
   };
   
-    nginx.virtualHosts.${domain} = {
+  architect.vhost.${domain} = {
-      forceSSL = true;
+    dnsInterfaces = [ "lan" "tailscale" "wireguard" ];
-      enableACME = true;
+    locations."/".port = config.services.libreddit.port;
-      locations."/" = { proxyPass = "http://127.0.0.1:${toString config.services.libreddit.port}"; };
   };
-  };
-
-  networking.extraHosts = ''
-    ${architectInterfaceAddress "lan"} ${domain}
-    ${architectInterfaceAddress "wireguard"} ${domain}
-    ${architectInterfaceAddress "tailscale"} ${domain}
-  '';
 }

hosts/architect/navidrome.nix

@@ -1,15 +1,12 @@
-{ lib, pkgs, ... }:
+{ config, lib, pkgs, ... }:
 
 let
   domain = "music.runas.rocks";
-  network = import ./network.nix;
   library_path = "/media/Music";
   beets_config = "/media/beets.conf";
-  auth_block = (import ./openid.nix { inherit lib; }).openresty_oidc_block;
 in
 {
-  services = {
+  services.navidrome = {
-    navidrome = {
     enable = true;
 
     settings = {
@@ -24,68 +21,61 @@ in
     };
   };
 
-    nginx.virtualHosts.${domain} = {
+  architect.vhost.${domain} = {
-      forceSSL = true;
+    dnsInterfaces = [ "lan" "tailscale" "wireguard" ];
-      enableACME = true;
     locations."/" = {
-        proxyPass = "http://127.0.0.1:4533";
+      port = 4533;
-      };
+      allowLan = true;
-      extraConfig = auth_block { access_role = "navidrome"; };
+      allow = [ config.architect.networks."tailscale".net ];
     };
   };
 
-  systemd.services = {
+  # systemd.services = {
-    "beets-update" = {
+  #   "beets-update" = {
-      enable = true;
+  #     enable = true;
-      #      requires = [ "remove-badmp3.service" "remove-badflac.service" ];
+  #     #      requires = [ "remove-badmp3.service" "remove-badflac.service" ];
-      before = [ "beets-import.service" ];
+  #     before = [ "beets-import.service" ];
-      serviceConfig = {
+  #     serviceConfig = {
-        Type = "oneshot";
+  #       Type = "oneshot";
-        ExecStart = "${pkgs.beets}/bin/beet -c ${beets_config} update";
+  #       ExecStart = "${pkgs.beets}/bin/beet -c ${beets_config} update";
-      };
+  #     };
-    };
+  #   };
 
-    "beets-import" = {
+  #   "beets-import" = {
-      enable = true;
+  #     enable = true;
-      path = [ pkgs.imagemagick ];
+  #     path = [ pkgs.imagemagick ];
-      requires = [ "beets-update.service" ];
+  #     requires = [ "beets-update.service" ];
-      after = [ "beets-update.service" ];
+  #     after = [ "beets-update.service" ];
-      serviceConfig = {
+  #     serviceConfig = {
-        Type = "oneshot";
+  #       Type = "oneshot";
-        ExecStart =
+  #       ExecStart =
-          "${pkgs.beets}/bin/beet -c ${beets_config} import --flat -q ${library_path}";
+  #         "${pkgs.beets}/bin/beet -c ${beets_config} import --flat -q ${library_path}";
-      };
+  #     };
-      startAt = "weekly";
+  #     startAt = "weekly";
-    };
+  #   };
 
-    "remove-badmp3" = {
+  #   "remove-badmp3" = {
-      enable = true;
+  #     enable = true;
-      before = [ "beets-import.service" "beets-update.service" ];
+  #     before = [ "beets-import.service" "beets-update.service" ];
-      serviceConfig = {
+  #     serviceConfig = {
-        Type = "oneshot";
+  #       Type = "oneshot";
-        ExecStart = ''
+  #       ExecStart = ''
-          ${pkgs.findutils}/bin/find ${library_path} -name "*.mp3" -type f -exec ${pkgs.bash}/bin/sh -c '${pkgs.mp3val}/bin/mp3val "{}" | grep -Pi error 1>/dev/null && ${pkgs.busybox}/bin/rm "{}"' \;
+  #         ${pkgs.findutils}/bin/find ${library_path} -name "*.mp3" -type f -exec ${pkgs.bash}/bin/sh -c '${pkgs.mp3val}/bin/mp3val "{}" | grep -Pi error 1>/dev/null && ${pkgs.busybox}/bin/rm "{}"' \;
-        '';
+  #       '';
-      };
+  #     };
-    };
+  #   };
 
-    "remove-badflac" = {
+  #   "remove-badflac" = {
-      enable = true;
+  #     enable = true;
-      before = [ "beets-import.service" "beets-update.service" ];
+  #     before = [ "beets-import.service" "beets-update.service" ];
-      serviceConfig = {
+  #     serviceConfig = {
-        Type = "oneshot";
+  #       Type = "oneshot";
-        ExecStart = ''
+  #       ExecStart = ''
-          ${pkgs.findutils}/bin/find ${library_path} -name "*.flac" -type f -exec ${pkgs.bash}/bin/sh -c '${pkgs.flac}/bin/flac -st "{}" || ${pkgs.busybox}/bin/rm "{}"' \;
+  #         ${pkgs.findutils}/bin/find ${library_path} -name "*.flac" -type f -exec ${pkgs.bash}/bin/sh -c '${pkgs.flac}/bin/flac -st "{}" || ${pkgs.busybox}/bin/rm "{}"' \;
-        '';
+  #       '';
-      };
+  #     };
-    };
+  #   };
-  };
+  # };
-
-  networking.extraHosts = ''
-    ${network.architect-lan} ${domain}
-    ${network.architect-wg} ${domain}
-    ${network.architect-ts} ${domain}
-  '';
 
   users.groups.media.members = [ "navidrome" ];
 }