dachxy/nix-conf
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

feat: terraria server && nextcloud raw camera format support

Browse source
This commit is contained in:
DACHXY 2025-07-14 19:37:16 +08:00
parent fb06f7eee0
commit ac770b6531
11 changed files with 186 additions and 53 deletions
Download patch file Download diff file Expand all files Collapse all files

1
system/dev/dn-server/default.nix
View file

@ -32,6 +32,7 @@
domain = "https://bitwarden.net.dn";
})
(import ../../modules/openldap.nix { })
../../modules/terraria.nix
];
environment.systemPackages = with pkgs; [

37
system/dev/dn-server/nginx.nix
View file

@ -23,6 +23,10 @@ let
port = 443;
ssl = true;
}
{
addr = "0.0.0.0";
port = 80;
}
];
}
else
@ -77,11 +81,6 @@ let
chown nginx:nginx -R /etc/letsencrypt
'';
pre7780 = {
hostname = "pre-nextcloud.net.dn";
ip = "10.0.0.130";
};
vaultwarden = {
domain = "bitwarden.net.dn";
};
@ -128,10 +127,30 @@ in
'';
};
${pre7780.hostname} = mkProxyHost {
domain = pre7780.hostname;
proxyPass = "http://${pre7780.ip}";
ssl = true;
"files.net.dn" = {
listen = [
{
addr = "0.0.0.0";
port = 80;
}
];
root = "/var/www/files";
locations."/" = {
extraConfig = ''
autoindex on;
autoindex_exact_size off;
autoindex_localtime on;
'';
};
extraConfig = ''
types {
image/png png;
image/jpeg jpg jpeg;
image/gif gif;
}
'';
};
${vaultwarden.domain} = mkProxyHost {

11
system/dev/dn-server/services.nix
View file

@ -97,6 +97,11 @@ let
publicKey = "GAayY6p8ST3I66kFSGY3seaHhfkrc6atcrFu2C9BDDs=";
allowedIPs = [ "10.0.0.5/32" ];
}
{
dns = "jonly-mac";
publicKey = "jPmeA0WH3vQw/PDNdJwYLfE7Ibl5oZGuta9UkZNEyTk=";
allowedIPs = [ "10.0.0.9/32" ];
}
{
# YC
dns = "yc";
@ -385,13 +390,14 @@ in
@ IN MX 10 mail.${origin}
IN TXT "v=spf1 mx"
dns IN A ${serverIP}
files IN A ${serverIP}
nextcloud IN A ${serverIP}
bitwarden IN A ${serverIP}
pre-nextcloud IN A ${serverIP}
ca IN A ${serverIP}
${hostname} IN A ${serverIP}
mail IN A ${serverIP}
api-kube IN A ${kubeIP}
vmail IN A 10.0.0.130
${dnsRecords}
'';
};
@ -423,9 +429,10 @@ in
${serverIP} IN PTR mail.${personal.domain}.
${serverIP} IN PTR ${hostname}.${personal.domain}.
${serverIP} IN PTR nextcloud.${personal.domain}.
${serverIP} IN PTR files.${personal.domain}.
${serverIP} IN PTR bitwarden.${personal.domain}.
${serverIP} IN PTR pre-nextcloud.${personal.domain}.
${serverIP} IN PTR ca.${personal.domain}.
130 IN PTR vmail.${personal.domain}.
${dnsReversedRecords}
'';

2
system/modules/gaming.nix
View file

@ -15,6 +15,8 @@
};
};
programs.gamescope.enable = lib.mkDefault true;
programs = {
steam = {
enable = true;

15
system/modules/gnome.nix Normal file
View file

@ -0,0 +1,15 @@
{
lib,
...
}:
{
environment.sessionVariables = {
XDG_CURRENT_DESKTOP = "GNOME";
};
services.xserver = {
enable = lib.mkDefault true;
displayManager.gdm.enable = true;
desktopManager.gnome.enable = true;
};
}

24
system/modules/nextcloud.nix
View file

@ -59,21 +59,11 @@
tasks
;
passwords =
(pkgs.fetchNextcloudApp {
sha256 = "sha256-Nu6WViFawQWby9CEEezAwoBNdp7O5O8a9IhDp/me/E0=";
url = "https://git.mdns.eu/api/v4/projects/45/packages/generic/passwords/2025.2.0/passwords.tar.gz";
license = "agpl3Plus";
}).overrideAttrs
(prev: {
unpackPhase = ''
cp $src passwords.tar.gz
tar -xf passwords.tar.gz
mv passwords/* ./
rm passwords.tar.gz
rm -r passwords
'';
});
camerarawpreviews = pkgs.fetchNextcloudApp {
url = "https://github.com/ariselseng/camerarawpreviews/releases/download/v0.8.7/camerarawpreviews_nextcloud.tar.gz";
sha256 = "sha256-aiMUSJQVbr3xlJkqOaE3cNhdZu3CnPEIWTNVOoG4HSo=";
license = "agpl3Plus";
};
};
extraAppsEnable = true;
@ -97,6 +87,10 @@
"OC\\Preview\\TXT"
"OC\\Preview\\XBitmap"
"OC\\Preview\\HEIC"
"OC\\Preview\\SVG"
"OC\\Preview\\FONT"
"OC\\Preview\\Imaginary"
"OC\\Preview\\ImaginaryPDF"
];
};
};

51
system/modules/terraria.nix Normal file
View file

@ -0,0 +1,51 @@
{ pkgs, ... }:
let
serverPkg = pkgs.tmodloader-server.overrideAttrs (
final: prev: rec {
version = "v2025.04.3.0";
name = "tmodloader-${version}";
url = "https://github.com/tModLoader/tModLoader/releases/download/${version}/tModLoader.zip";
src = pkgs.fetchurl {
inherit url;
hash = "sha256-cu98vb3T2iGC9W3e3nfls3mYTUQ4sviRHyViL0Qexn0=";
};
}
);
in
{
services.tmodloader = {
enable = true;
servers.pokemon = {
enable = true;
openFirewall = true;
port = 7777;
autoStart = true;
package = serverPkg;
world = "/var/lib/tmodloader/pokemon/Worlds/default.wld";
autocreate = "large";
install = [
3039823461
2619954303
2563851005
3378168037
3173371762
2800050107
2785100219
3018447913
2565540604
2563309347
2908170107
2669644269
3439924021
2599842771
2797518634
2565639705
3497111954
2563815443
2707400823
];
};
};
}