mirror of
https://github.com/Swarsel/.dotfiles.git
synced 2025-12-06 09:07:21 +01:00
fix[servers]: fix several issues
- winters: flake path was set wrongly - spotifyd: could not connect (added hosts entry) - nextcloud: plugins used outdated nextcloud version - nextcloud: allow all upload sizes on proxy - matrix: adapt to new bridge config schema
This commit is contained in:
parent
4e2e7d4add
commit
d8e99cf6a7
6 changed files with 54 additions and 20 deletions
|
|
@ -2383,6 +2383,7 @@ This is my main server that I run at home. It handles most tasks that require bi
|
||||||
|
|
||||||
swarselsystems = {
|
swarselsystems = {
|
||||||
info = "ASRock J4105-ITX, 32GB RAM";
|
info = "ASRock J4105-ITX, 32GB RAM";
|
||||||
|
flakePath = "/root/.dotfiles";
|
||||||
isImpermanence = false;
|
isImpermanence = false;
|
||||||
isSecureBoot = true;
|
isSecureBoot = true;
|
||||||
isCrypted = true;
|
isCrypted = true;
|
||||||
|
|
@ -4971,6 +4972,9 @@ Here I only enable =networkmanager= and a few default networks. The rest of the
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
inherit (config.swarselsystems) hostName;
|
inherit (config.swarselsystems) hostName;
|
||||||
|
hosts = {
|
||||||
|
"192.168.178.24" = [ "store.swarsel.win" ];
|
||||||
|
};
|
||||||
wireless.iwd = {
|
wireless.iwd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
@ -6786,6 +6790,13 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t
|
||||||
|
|
||||||
services.pipewire.systemWide = true;
|
services.pipewire.systemWide = true;
|
||||||
|
|
||||||
|
# https://github.com/Spotifyd/spotifyd/issues/1366
|
||||||
|
networking.hosts."0.0.0.0" = [ "apresolve.spotify.com" ];
|
||||||
|
|
||||||
|
# hacky way to enable multi-session
|
||||||
|
# when another user connects, the service will crash and the new user will login
|
||||||
|
systemd.services.spotifyd.serviceConfig.RestartSec = lib.mkForce 1;
|
||||||
|
|
||||||
services.spotifyd = {
|
services.spotifyd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
@ -6793,8 +6804,11 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t
|
||||||
dbus_type = "session";
|
dbus_type = "session";
|
||||||
use_mpris = false;
|
use_mpris = false;
|
||||||
device = "sysdefault:CARD=PCH";
|
device = "sysdefault:CARD=PCH";
|
||||||
|
# device = "default";
|
||||||
device_name = "SwarselSpot";
|
device_name = "SwarselSpot";
|
||||||
mixer = "alsa";
|
# backend = "pulseaudio";
|
||||||
|
backend = "alsa";
|
||||||
|
# mixer = "alsa";
|
||||||
zeroconf_port = servicePort;
|
zeroconf_port = servicePort;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
@ -7154,14 +7168,14 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t
|
||||||
address = "http://localhost:${builtins.toString servicePort}";
|
address = "http://localhost:${builtins.toString servicePort}";
|
||||||
domain = serviceDomain;
|
domain = serviceDomain;
|
||||||
};
|
};
|
||||||
|
database = {
|
||||||
|
type = "postgres";
|
||||||
|
uri = "postgresql:///mautrix-whatsapp?host=/run/postgresql";
|
||||||
|
};
|
||||||
appservice = {
|
appservice = {
|
||||||
address = "http://localhost:${builtins.toString whatsappPort}";
|
address = "http://localhost:${builtins.toString whatsappPort}";
|
||||||
hostname = "0.0.0.0";
|
hostname = "0.0.0.0";
|
||||||
port = whatsappPort;
|
port = whatsappPort;
|
||||||
database = {
|
|
||||||
type = "postgres";
|
|
||||||
uri = "postgresql:///mautrix-whatsapp?host=/run/postgresql";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
bridge = {
|
bridge = {
|
||||||
displayname_template = "{{or .FullName .PushName .JID}} (WA)";
|
displayname_template = "{{or .FullName .PushName .JID}} (WA)";
|
||||||
|
|
@ -7201,14 +7215,14 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t
|
||||||
address = "http://localhost:${builtins.toString servicePort}";
|
address = "http://localhost:${builtins.toString servicePort}";
|
||||||
domain = serviceDomain;
|
domain = serviceDomain;
|
||||||
};
|
};
|
||||||
|
database = {
|
||||||
|
type = "postgres";
|
||||||
|
uri = "postgresql:///mautrix-signal?host=/run/postgresql";
|
||||||
|
};
|
||||||
appservice = {
|
appservice = {
|
||||||
address = "http://localhost:${builtins.toString signalPort}";
|
address = "http://localhost:${builtins.toString signalPort}";
|
||||||
hostname = "0.0.0.0";
|
hostname = "0.0.0.0";
|
||||||
port = signalPort;
|
port = signalPort;
|
||||||
database = {
|
|
||||||
type = "postgres";
|
|
||||||
uri = "postgresql:///mautrix-signal?host=/run/postgresql";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
bridge = {
|
bridge = {
|
||||||
displayname_template = "{{or .ContactName .ProfileName .PhoneNumber}} (Signal)";
|
displayname_template = "{{or .ContactName .ProfileName .PhoneNumber}} (Signal)";
|
||||||
|
|
@ -7332,7 +7346,7 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t
|
||||||
configureRedis = true;
|
configureRedis = true;
|
||||||
maxUploadSize = "4G";
|
maxUploadSize = "4G";
|
||||||
extraApps = {
|
extraApps = {
|
||||||
inherit (pkgs.nextcloud30Packages.apps) mail calendar contacts cospend phonetrack polls tasks sociallogin;
|
inherit (pkgs.nextcloud31Packages.apps) mail calendar contacts cospend phonetrack polls tasks sociallogin;
|
||||||
};
|
};
|
||||||
extraAppsEnable = true;
|
extraAppsEnable = true;
|
||||||
config = {
|
config = {
|
||||||
|
|
@ -7359,6 +7373,9 @@ Here I am forcing =startWhenNeeded= to false so that the value will not be set t
|
||||||
locations = {
|
locations = {
|
||||||
"/" = {
|
"/" = {
|
||||||
proxyPass = "http://${serviceName}";
|
proxyPass = "http://${serviceName}";
|
||||||
|
extraConfig = ''
|
||||||
|
client_max_body_size 0;
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -22,6 +22,7 @@
|
||||||
|
|
||||||
swarselsystems = {
|
swarselsystems = {
|
||||||
info = "ASRock J4105-ITX, 32GB RAM";
|
info = "ASRock J4105-ITX, 32GB RAM";
|
||||||
|
flakePath = "/root/.dotfiles";
|
||||||
isImpermanence = false;
|
isImpermanence = false;
|
||||||
isSecureBoot = true;
|
isSecureBoot = true;
|
||||||
isCrypted = true;
|
isCrypted = true;
|
||||||
|
|
|
||||||
|
|
@ -49,6 +49,9 @@ in
|
||||||
|
|
||||||
networking = {
|
networking = {
|
||||||
inherit (config.swarselsystems) hostName;
|
inherit (config.swarselsystems) hostName;
|
||||||
|
hosts = {
|
||||||
|
"192.168.178.24" = [ "store.swarsel.win" ];
|
||||||
|
};
|
||||||
wireless.iwd = {
|
wireless.iwd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
|
||||||
|
|
@ -215,14 +215,14 @@ in
|
||||||
address = "http://localhost:${builtins.toString servicePort}";
|
address = "http://localhost:${builtins.toString servicePort}";
|
||||||
domain = serviceDomain;
|
domain = serviceDomain;
|
||||||
};
|
};
|
||||||
|
database = {
|
||||||
|
type = "postgres";
|
||||||
|
uri = "postgresql:///mautrix-whatsapp?host=/run/postgresql";
|
||||||
|
};
|
||||||
appservice = {
|
appservice = {
|
||||||
address = "http://localhost:${builtins.toString whatsappPort}";
|
address = "http://localhost:${builtins.toString whatsappPort}";
|
||||||
hostname = "0.0.0.0";
|
hostname = "0.0.0.0";
|
||||||
port = whatsappPort;
|
port = whatsappPort;
|
||||||
database = {
|
|
||||||
type = "postgres";
|
|
||||||
uri = "postgresql:///mautrix-whatsapp?host=/run/postgresql";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
bridge = {
|
bridge = {
|
||||||
displayname_template = "{{or .FullName .PushName .JID}} (WA)";
|
displayname_template = "{{or .FullName .PushName .JID}} (WA)";
|
||||||
|
|
@ -262,14 +262,14 @@ in
|
||||||
address = "http://localhost:${builtins.toString servicePort}";
|
address = "http://localhost:${builtins.toString servicePort}";
|
||||||
domain = serviceDomain;
|
domain = serviceDomain;
|
||||||
};
|
};
|
||||||
|
database = {
|
||||||
|
type = "postgres";
|
||||||
|
uri = "postgresql:///mautrix-signal?host=/run/postgresql";
|
||||||
|
};
|
||||||
appservice = {
|
appservice = {
|
||||||
address = "http://localhost:${builtins.toString signalPort}";
|
address = "http://localhost:${builtins.toString signalPort}";
|
||||||
hostname = "0.0.0.0";
|
hostname = "0.0.0.0";
|
||||||
port = signalPort;
|
port = signalPort;
|
||||||
database = {
|
|
||||||
type = "postgres";
|
|
||||||
uri = "postgresql:///mautrix-signal?host=/run/postgresql";
|
|
||||||
};
|
|
||||||
};
|
};
|
||||||
bridge = {
|
bridge = {
|
||||||
displayname_template = "{{or .ContactName .ProfileName .PhoneNumber}} (Signal)";
|
displayname_template = "{{or .ContactName .ProfileName .PhoneNumber}} (Signal)";
|
||||||
|
|
|
||||||
|
|
@ -37,7 +37,7 @@ in
|
||||||
configureRedis = true;
|
configureRedis = true;
|
||||||
maxUploadSize = "4G";
|
maxUploadSize = "4G";
|
||||||
extraApps = {
|
extraApps = {
|
||||||
inherit (pkgs.nextcloud30Packages.apps) mail calendar contacts cospend phonetrack polls tasks sociallogin;
|
inherit (pkgs.nextcloud31Packages.apps) mail calendar contacts cospend phonetrack polls tasks sociallogin;
|
||||||
};
|
};
|
||||||
extraAppsEnable = true;
|
extraAppsEnable = true;
|
||||||
config = {
|
config = {
|
||||||
|
|
@ -64,6 +64,9 @@ in
|
||||||
locations = {
|
locations = {
|
||||||
"/" = {
|
"/" = {
|
||||||
proxyPass = "http://${serviceName}";
|
proxyPass = "http://${serviceName}";
|
||||||
|
extraConfig = ''
|
||||||
|
client_max_body_size 0;
|
||||||
|
'';
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
|
|
@ -23,6 +23,13 @@ in
|
||||||
|
|
||||||
services.pipewire.systemWide = true;
|
services.pipewire.systemWide = true;
|
||||||
|
|
||||||
|
# https://github.com/Spotifyd/spotifyd/issues/1366
|
||||||
|
networking.hosts."0.0.0.0" = [ "apresolve.spotify.com" ];
|
||||||
|
|
||||||
|
# hacky way to enable multi-session
|
||||||
|
# when another user connects, the service will crash and the new user will login
|
||||||
|
systemd.services.spotifyd.serviceConfig.RestartSec = lib.mkForce 1;
|
||||||
|
|
||||||
services.spotifyd = {
|
services.spotifyd = {
|
||||||
enable = true;
|
enable = true;
|
||||||
settings = {
|
settings = {
|
||||||
|
|
@ -30,8 +37,11 @@ in
|
||||||
dbus_type = "session";
|
dbus_type = "session";
|
||||||
use_mpris = false;
|
use_mpris = false;
|
||||||
device = "sysdefault:CARD=PCH";
|
device = "sysdefault:CARD=PCH";
|
||||||
|
# device = "default";
|
||||||
device_name = "SwarselSpot";
|
device_name = "SwarselSpot";
|
||||||
mixer = "alsa";
|
# backend = "pulseaudio";
|
||||||
|
backend = "alsa";
|
||||||
|
# mixer = "alsa";
|
||||||
zeroconf_port = servicePort;
|
zeroconf_port = servicePort;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue