Merge branch 'zenix/master' into alpine/master
This commit is contained in:
commit
2c406b36d3
38 changed files with 843 additions and 360 deletions
|
|
@ -2,6 +2,12 @@
|
|||
inherit (config) sops;
|
||||
inherit (sops) templates placeholder;
|
||||
in {
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"aspnetcore-runtime-6.0.36"
|
||||
"aspnetcore-runtime-wrapped-6.0.36"
|
||||
"dotnet-sdk-6.0.428"
|
||||
"dotnet-sdk-wrapped-6.0.428"
|
||||
];
|
||||
users.groups.media = {};
|
||||
services.jackett = {
|
||||
enable = true;
|
||||
|
|
@ -37,20 +43,21 @@ in {
|
|||
ports = ["9091:9091"];
|
||||
volumes = [
|
||||
"/mnt/storage/downloads:/data"
|
||||
"transmission-config:/config"
|
||||
"/home/tristan/pods/transmission/config:/config"
|
||||
"/mnt/storage/media/unsorted:/data/completed"
|
||||
];
|
||||
environmentFiles = [ templates."transmission/env".path ];
|
||||
environment = {
|
||||
PUID = "1000";
|
||||
GUID = "1000";
|
||||
SUBNET = "100.0.0.0/8";
|
||||
LOCAL_NETWORK = "100.0.0.0/8";
|
||||
};
|
||||
privileged = true;
|
||||
capabilities = {
|
||||
"NET_ADMIN" = true;
|
||||
"NET_RAW" = true;
|
||||
"MKNOD" = true;
|
||||
};
|
||||
extraOptions = builtins.map (cap: "--cap-add=${cap}") [
|
||||
"NET_ADMIN"
|
||||
"NET_RAW"
|
||||
"MKNOD"
|
||||
];
|
||||
};
|
||||
sops.secrets = {
|
||||
"transmission/auth/OPENVPN_PROVIDER" = {};
|
||||
|
|
|
|||
|
|
@ -1,12 +1,14 @@
|
|||
{config, ...}: {
|
||||
nixpkgs.config.permittedInsecurePackages = [
|
||||
"olm-3.2.16"
|
||||
];
|
||||
|
||||
{config, ...}:
|
||||
{
|
||||
# TODO: totally borked for some reason. DB migration?
|
||||
services.mautrix-whatsapp = {
|
||||
enable = true;
|
||||
registerToSynapse = true;
|
||||
settings = {
|
||||
appservice.database = {
|
||||
type = "sqlite3";
|
||||
uri = "/var/lib/mautrix-whatsapp/mautrix-whatsapp.db";
|
||||
};
|
||||
homeserver = {
|
||||
address = "http://localhost:8008";
|
||||
domain = "tristans.cloud";
|
||||
|
|
|
|||
24
nixos/services/musnix.nix
Normal file
24
nixos/services/musnix.nix
Normal file
|
|
@ -0,0 +1,24 @@
|
|||
{ inputs, user, pkgs, lib, ... }: {
|
||||
imports = [inputs.musnix.nixosModules.musnix];
|
||||
users.users.${user}.extraGroups = ["audio"];
|
||||
musnix = {
|
||||
enable = true;
|
||||
rtcqs.enable = true;
|
||||
kernel.realtime = true;
|
||||
};
|
||||
environment.systemPackages = with pkgs; [
|
||||
ardour
|
||||
musescore
|
||||
muse
|
||||
helm
|
||||
calf
|
||||
qjackctl
|
||||
sfizz
|
||||
tap-plugins
|
||||
x42-plugins
|
||||
x42-gmsynth
|
||||
carla
|
||||
drumgizmo
|
||||
distrho-ports
|
||||
];
|
||||
}
|
||||
|
|
@ -81,17 +81,13 @@ in {
|
|||
maps
|
||||
previewgenerator
|
||||
deck
|
||||
news
|
||||
;
|
||||
oidc_login = pkgs.fetchNextcloudApp {
|
||||
sha256 = "sha256-DrbaKENMz2QJfbDKCMrNGEZYpUEvtcsiqw9WnveaPZA=";
|
||||
url = "https://github.com/pulsejet/nextcloud-oidc-login/releases/download/v3.2.0/oidc_login.tar.gz";
|
||||
license = "agpl3Only";
|
||||
};
|
||||
news = pkgs.fetchNextcloudApp {
|
||||
sha256 = "sha256-jH1F/IZItlZEpsfgXhRojiYD6ZEVhsuRvz8Qs0Z3UFI=";
|
||||
url = "https://github.com/nextcloud/news/releases/download/25.0.0-alpha9/news.tar.gz";
|
||||
license = "agpl3Only";
|
||||
};
|
||||
};
|
||||
maxUploadSize = "5G";
|
||||
};
|
||||
|
|
|
|||
|
|
@ -86,12 +86,6 @@ in {
|
|||
};
|
||||
};
|
||||
|
||||
services.matrix-sliding-sync = {
|
||||
enable = true;
|
||||
environmentFile = templates."synapse/sliding_sync_env".path;
|
||||
settings.SYNCV3_SERVER = "https://${domain}";
|
||||
};
|
||||
|
||||
services.nginx.virtualHosts = {
|
||||
${domain} = {
|
||||
locations."= /.well-known/matrix/server".extraConfig = mkWellKnown {
|
||||
|
|
@ -99,7 +93,6 @@ in {
|
|||
};
|
||||
locations."= /.well-known/matrix/client".extraConfig = mkWellKnown {
|
||||
"m.homeserver".base_url = "https://${fqdn}";
|
||||
"org.matrix.msc3575.proxy"."url" = "https://${fqdn}";
|
||||
};
|
||||
locations."= /.well-known/matrix/support".extraConfig = mkWellKnown {
|
||||
admins = [
|
||||
|
|
@ -112,14 +105,12 @@ in {
|
|||
};
|
||||
locations."/_matrix".proxyPass = "http://localhost:${toString port}";
|
||||
locations."/_synapse/client".proxyPass = "http://localhost:${toString port}";
|
||||
locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
|
||||
};
|
||||
${fqdn} = {
|
||||
enableACME = true;
|
||||
forceSSL = true;
|
||||
locations."/_matrix".proxyPass = "http://localhost:${toString port}";
|
||||
locations."/_synapse/client".proxyPass = "http://localhost:${toString port}";
|
||||
locations."/_matrix/client/unstable/org.matrix.msc3575/sync".proxyPass = "http://${toString matrix-sliding-sync.settings.SYNCV3_BINDADDR}";
|
||||
};
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue