Compare commits
No commits in common. "1304289db613d382520089685d9581417cf663a3" and "7f2c129ea94d10536c54be39e757ba9cd92e62aa" have entirely different histories.
1304289db6
...
7f2c129ea9
@ -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 = {
|
||||||
enable = true;
|
invidious = {
|
||||||
package = pkgs.unstablePkgs.invidious;
|
enable = true;
|
||||||
|
package = pkgs.unstablePkgs.invidious;
|
||||||
|
};
|
||||||
|
|
||||||
|
nginx.virtualHosts.${domain} = {
|
||||||
|
forceSSL = true;
|
||||||
|
enableACME = true;
|
||||||
|
locations."/" = { proxyPass = "http://127.0.0.1:${toString config.services.invidious.port}"; };
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
architect.vhost.${domain} = {
|
networking.extraHosts = ''
|
||||||
dnsInterfaces = [ "lan" "tailscale" "wireguard" ];
|
${architectInterfaceAddress "lan"} ${domain}
|
||||||
locations."/".port = config.services.invidious.port;
|
${architectInterfaceAddress "wireguard"} ${domain}
|
||||||
};
|
${architectInterfaceAddress "tailscale"} ${domain}
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
@ -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 = {
|
||||||
enable = true;
|
libreddit = {
|
||||||
port = 9090;
|
enable = true;
|
||||||
|
port = 9090;
|
||||||
|
};
|
||||||
|
|
||||||
|
nginx.virtualHosts.${domain} = {
|
||||||
|
forceSSL = true;
|
||||||
|
enableACME = true;
|
||||||
|
locations."/" = { proxyPass = "http://127.0.0.1:${toString config.services.libreddit.port}"; };
|
||||||
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
architect.vhost.${domain} = {
|
networking.extraHosts = ''
|
||||||
dnsInterfaces = [ "lan" "tailscale" "wireguard" ];
|
${architectInterfaceAddress "lan"} ${domain}
|
||||||
locations."/".port = config.services.libreddit.port;
|
${architectInterfaceAddress "wireguard"} ${domain}
|
||||||
};
|
${architectInterfaceAddress "tailscale"} ${domain}
|
||||||
|
'';
|
||||||
}
|
}
|
||||||
|
@ -1,81 +1,91 @@
|
|||||||
{ 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 = {
|
||||||
enable = true;
|
navidrome = {
|
||||||
|
enable = true;
|
||||||
|
|
||||||
settings = {
|
settings = {
|
||||||
MusicFolder = library_path;
|
MusicFolder = library_path;
|
||||||
LastFM.enable = true;
|
LastFM.enable = true;
|
||||||
LastFM.ApiKey = "5cef5cb5f9d31326b97d0f929ca9cf20";
|
LastFM.ApiKey = "5cef5cb5f9d31326b97d0f929ca9cf20";
|
||||||
LastFM.Secret = "d1296896126f4caae47407aecf080b25";
|
LastFM.Secret = "d1296896126f4caae47407aecf080b25";
|
||||||
Spotify.ID = "3900c029b4f34f3fb61d554dda64794d";
|
Spotify.ID = "3900c029b4f34f3fb61d554dda64794d";
|
||||||
Spotify.Secret = "d931ce5575a9401aa5ff8d37558cca0a";
|
Spotify.Secret = "d931ce5575a9401aa5ff8d37558cca0a";
|
||||||
EnableGravatar = true;
|
EnableGravatar = true;
|
||||||
LogLevel = "WARN";
|
LogLevel = "WARN";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
nginx.virtualHosts.${domain} = {
|
||||||
|
forceSSL = true;
|
||||||
|
enableACME = true;
|
||||||
|
locations."/" = {
|
||||||
|
proxyPass = "http://127.0.0.1:4533";
|
||||||
|
};
|
||||||
|
extraConfig = auth_block { access_role = "navidrome"; };
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
architect.vhost.${domain} = {
|
systemd.services = {
|
||||||
dnsInterfaces = [ "lan" "tailscale" "wireguard" ];
|
"beets-update" = {
|
||||||
locations."/" = {
|
enable = true;
|
||||||
port = 4533;
|
# requires = [ "remove-badmp3.service" "remove-badflac.service" ];
|
||||||
allowLan = true;
|
before = [ "beets-import.service" ];
|
||||||
allow = [ config.architect.networks."tailscale".net ];
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
ExecStart = "${pkgs.beets}/bin/beet -c ${beets_config} update";
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
"beets-import" = {
|
||||||
|
enable = true;
|
||||||
|
path = [ pkgs.imagemagick ];
|
||||||
|
requires = [ "beets-update.service" ];
|
||||||
|
after = [ "beets-update.service" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
ExecStart =
|
||||||
|
"${pkgs.beets}/bin/beet -c ${beets_config} import --flat -q ${library_path}";
|
||||||
|
};
|
||||||
|
startAt = "weekly";
|
||||||
|
};
|
||||||
|
|
||||||
|
"remove-badmp3" = {
|
||||||
|
enable = true;
|
||||||
|
before = [ "beets-import.service" "beets-update.service" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
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 "{}"' \;
|
||||||
|
'';
|
||||||
|
};
|
||||||
|
};
|
||||||
|
|
||||||
|
"remove-badflac" = {
|
||||||
|
enable = true;
|
||||||
|
before = [ "beets-import.service" "beets-update.service" ];
|
||||||
|
serviceConfig = {
|
||||||
|
Type = "oneshot";
|
||||||
|
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 "{}"' \;
|
||||||
|
'';
|
||||||
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
# systemd.services = {
|
networking.extraHosts = ''
|
||||||
# "beets-update" = {
|
${network.architect-lan} ${domain}
|
||||||
# enable = true;
|
${network.architect-wg} ${domain}
|
||||||
# # requires = [ "remove-badmp3.service" "remove-badflac.service" ];
|
${network.architect-ts} ${domain}
|
||||||
# before = [ "beets-import.service" ];
|
'';
|
||||||
# serviceConfig = {
|
|
||||||
# Type = "oneshot";
|
|
||||||
# ExecStart = "${pkgs.beets}/bin/beet -c ${beets_config} update";
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
# "beets-import" = {
|
|
||||||
# enable = true;
|
|
||||||
# path = [ pkgs.imagemagick ];
|
|
||||||
# requires = [ "beets-update.service" ];
|
|
||||||
# after = [ "beets-update.service" ];
|
|
||||||
# serviceConfig = {
|
|
||||||
# Type = "oneshot";
|
|
||||||
# ExecStart =
|
|
||||||
# "${pkgs.beets}/bin/beet -c ${beets_config} import --flat -q ${library_path}";
|
|
||||||
# };
|
|
||||||
# startAt = "weekly";
|
|
||||||
# };
|
|
||||||
|
|
||||||
# "remove-badmp3" = {
|
|
||||||
# enable = true;
|
|
||||||
# before = [ "beets-import.service" "beets-update.service" ];
|
|
||||||
# serviceConfig = {
|
|
||||||
# Type = "oneshot";
|
|
||||||
# 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 "{}"' \;
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
# "remove-badflac" = {
|
|
||||||
# enable = true;
|
|
||||||
# before = [ "beets-import.service" "beets-update.service" ];
|
|
||||||
# serviceConfig = {
|
|
||||||
# Type = "oneshot";
|
|
||||||
# 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 "{}"' \;
|
|
||||||
# '';
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
# };
|
|
||||||
|
|
||||||
users.groups.media.members = [ "navidrome" ];
|
users.groups.media.members = [ "navidrome" ];
|
||||||
}
|
}
|
||||||
|
Loading…
Reference in New Issue
Block a user