titaniumtown/server-config
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

refactoring

Browse Source
This commit is contained in:
Simon Gardling
2024-10-17 15:45:29 -04:00
parent 59dd30a67d
commit 4ec6a035a5
9 changed files with 33 additions and 37 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
services/caddy.nix
View File

@@ -1,4 +1,4 @@
{ service_configs, ... }:
{ config, service_configs, ... }:
{
services.caddy = {
enable = true;
@@ -15,7 +15,7 @@
'';
"immich.gardling.com".extraConfig = ''
reverse_proxy 127.0.0.1:${builtins.toString service_configs.ports.immich}
reverse_proxy 127.0.0.1:${builtins.toString config.services.immich.port}
'';
"jellyfin.gardling.com".extraConfig = ''
@@ -26,7 +26,7 @@
'';
${service_configs.gitea.domain}.extraConfig = ''
reverse_proxy 127.0.0.1:${builtins.toString service_configs.ports.gitea}
reverse_proxy 127.0.0.1:${builtins.toString config.services.gitea.settings.server.HTTP_PORT}
'';
};
};

4
services/gitea.nix
View File

@@ -16,8 +16,8 @@
settings = {
server = {
DOMAIN = service_configs.gitea.domain;
ROOT_URL = "https://" + service_configs.gitea.domain;
HTTP_PORT = service_configs.ports.gitea;
ROOT_URL = "https://" + config.services.gitea.settings.server.DOMAIN;
HTTP_PORT = 3281;
LANDING_PAGE = "/explore/repos";
};
session = {

2
services/immich.nix
View File

@@ -8,7 +8,7 @@
services.immich = {
enable = true;
mediaLocation = service_configs.immich.dir;
port = service_configs.ports.immich;
port = 2283;
host = "0.0.0.0";
database = {
createDB = false;

8
services/jellyfin.nix
View File

@@ -16,8 +16,8 @@
# used for local streaming
openFirewall = true;
dataDir = service_configs.jellyfin.data_dir;
cacheDir = service_configs.jellyfin.cache_dir;
dataDir = service_configs.jellyfin.dir;
cacheDir = config.services.jellyfin.dataDir + "/cache";
};
users.users.${config.services.jellyfin.user}.extraGroups = [
@@ -27,7 +27,7 @@
# https://github.com/lyarenei/jellyfin-plugin-listenbrainz/issues/107
system.activationScripts.jellyfinListenBrain.text = ''
cp -v /etc/nixos/secrets/Jellyfin.Plugin.ListenBrainz.xml ${service_configs.jellyfin.data_dir}/plugins/configurations/
chown ${config.services.jellyfin.user}:${config.services.jellyfin.group} ${service_configs.jellyfin.data_dir}/plugins/configurations/Jellyfin.Plugin.ListenBrainz.xml
cp -v /etc/nixos/secrets/Jellyfin.Plugin.ListenBrainz.xml ${config.services.jellyfin.dataDir}/plugins/configurations/
chown ${config.services.jellyfin.user}:${config.services.jellyfin.group} ${config.services.jellyfin.dataDir}/plugins/configurations/Jellyfin.Plugin.ListenBrainz.xml
'';
}

2
services/llm.nix
View File

@@ -8,7 +8,7 @@
services.ollama = {
enable = true;
home = service_configs.ollama.data_dir + "/home";
models = service_configs.ollama.data_dir + "/home/models";
models = config.services.ollama.home + "/models";
environmentVariables = {
OLLAMA_LLM_LIBRARY = "cpu_avx2";
};

5
services/minecraft.nix
View File

@@ -24,11 +24,10 @@ in
enable = true;
package = pkgs.fabricServers.fabric-1_21_1;
# Aikar's flags
jvmOpts = "-Xmx${heap_size} -Xms${heap_size} -XX:+AlwaysPreTouch -XX:+DisableExplicitGC -XX:+ParallelRefProcEnabled -XX:+PerfDisableSharedMem -XX:+UnlockExperimentalVMOptions -XX:+UseG1GC -XX:G1HeapRegionSize=8M -XX:G1HeapWastePercent=5 -XX:G1MaxNewSizePercent=40 -XX:G1MixedGCCountTarget=4 -XX:G1MixedGCLiveThresholdPercent=90 -XX:G1NewSizePercent=30 -XX:G1RSetUpdatingPauseTimePercent=5 -XX:G1ReservePercent=20 -XX:InitiatingHeapOccupancyPercent=15 -XX:MaxGCPauseMillis=200 -XX:MaxTenuringThreshold=1 -XX:SurvivorRatio=32";
jvmOpts = "-Xmx${heap_size} -Xms${heap_size} -XX:+UseZGC -XX:+ZGenerational";
serverProperties = {
server-port = service_configs.ports.minecraft;
server-port = 25565;
enforce-whitelist = true;
gamemode = "survival";
white-list = true;