Compare commits

..

No commits in common. "1304289db613d382520089685d9581417cf663a3" and "7f2c129ea94d10536c54be39e757ba9cd92e62aa" have entirely different histories.

3 changed files with 114 additions and 80 deletions

View File

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

View File

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

View File

@ -1,12 +1,15 @@
{ config, lib, pkgs, ... }: { lib, pkgs, ... }:
let let
domain = "music.runas.rocks"; domain = "music.runas.rocks";
network = import ./network.nix;
library_path = "/media/Music"; library_path = "/media/Music";
beets_config = "/media/beets.conf"; beets_config = "/media/beets.conf";
auth_block = (import ./openid.nix { inherit lib; }).openresty_oidc_block;
in in
{ {
services.navidrome = { services = {
navidrome = {
enable = true; enable = true;
settings = { settings = {
@ -21,61 +24,68 @@ in
}; };
}; };
architect.vhost.${domain} = { nginx.virtualHosts.${domain} = {
dnsInterfaces = [ "lan" "tailscale" "wireguard" ]; forceSSL = true;
enableACME = true;
locations."/" = { locations."/" = {
port = 4533; proxyPass = "http://127.0.0.1:4533";
allowLan = true; };
allow = [ config.architect.networks."tailscale".net ]; extraConfig = auth_block { access_role = "navidrome"; };
}; };
}; };
# 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" ]; users.groups.media.members = [ "navidrome" ];
} }