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

changes

Browse Source
This commit is contained in:
Simon Gardling 2025-02-03 11:50:44 -05:00
parent 9381222d54
commit d010634dd1
Signed by: titaniumtown
GPG Key ID: 9AB28AC10ECE533D
10 changed files with 37 additions and 29 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
.gitattributes vendored
View File

@ -3,7 +3,7 @@ secrets/hashedPass filter=git-crypt diff=git-crypt
secrets/minecraft-whitelist.nix filter=git-crypt diff=git-crypt secrets/minecraft-whitelist.nix filter=git-crypt diff=git-crypt
secrets/wg0.conf filter=git-crypt diff=git-crypt secrets/wg0.conf filter=git-crypt diff=git-crypt
secrets/caddy_auth filter=git-crypt diff=git-crypt secrets/caddy_auth filter=git-crypt diff=git-crypt
secrets/matrix_reg_token.nix filter=git-crypt diff=git-crypt secrets/matrix_reg_token filter=git-crypt diff=git-crypt
secrets/owntracks_caddy_auth filter=git-crypt diff=git-crypt secrets/owntracks_caddy_auth filter=git-crypt diff=git-crypt
secrets/secureboot.tar filter=git-crypt diff=git-crypt secrets/secureboot.tar filter=git-crypt diff=git-crypt
secrets/zfs-key filter=git-crypt diff=git-crypt secrets/zfs-key filter=git-crypt diff=git-crypt

17
configuration.nix
View File

@ -194,19 +194,6 @@
sbctl sbctl
]; ];
services.zfs = {
autoScrub.enable = true;
trim.enable = true;
autoSnapshot = {
enable = true;
frequent = 4; # 15-minutes
hourly = 24;
daily = 7;
weekly = 4;
monthly = 12;
};
};
systemd.services.no-rgb = systemd.services.no-rgb =
let let
no-rgb = ( no-rgb = (
@ -347,5 +334,9 @@
# }; # };
# }; # };
systemd.tmpfiles.rules = [
"d /tank/music 775 ${username} users"
];
system.stateVersion = "24.11"; system.stateVersion = "24.11";
} }

18
flake.lock generated
View File

@ -183,11 +183,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738374527, "lastModified": 1738547119,
"narHash": "sha256-OcZG42dKolSREIIBM39/kY2TqykihbtYopQSjBbgBjM=", "narHash": "sha256-cc6AfR7W0AavgqA5nHUXRUus4Rr7oPWQNku5nhR4SYs=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "2c815583946bcf1f7327c89fdf9bb4af7f3f5a14", "rev": "5b93268c80c3300dbec0fbbb2b50f674f84a474a",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -198,11 +198,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1738391520, "lastModified": 1738471961,
"narHash": "sha256-6HI58PKjddsC0RA0gBQlt6ox47oH//jLUHwx05RO8g0=", "narHash": "sha256-cgXDFrplNGs7bCVzXhRofjD8oJYqqXGcmUzXjHmip6Y=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "34b64e4e1ddb14e3ffc7db8d4a781396dbbab773", "rev": "537286c3c59b40311e5418a180b38034661d2536",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -214,11 +214,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1738277201, "lastModified": 1738435198,
"narHash": "sha256-6L+WXKCw5mqnUIExvqkD99pJQ41xgyCk6z/H9snClwk=", "narHash": "sha256-5+Hmo4nbqw8FrW85FlNm4IIrRnZ7bn0cmXlScNsNRLo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "666e1b3f09c267afd66addebe80fb05a5ef2b554", "rev": "f6687779bf4c396250831aa5a32cbfeb85bb07a3",
"type": "github" "type": "github"
}, },
"original": { "original": {

1
flake.nix
View File

@ -63,6 +63,7 @@
bitmagnet = 3333; bitmagnet = 3333;
owntracks = 3825; owntracks = 3825;
gitea = 2283; gitea = 2283;
immich = 2284;
}; };
https = { https = {

BIN
secrets/matrix_reg_token Normal file
View File

Binary file not shown.

BIN
secrets/matrix_reg_token.nix
View File

Binary file not shown.

2
services/immich.nix
View File

@ -9,7 +9,7 @@
services.immich = { services.immich = {
enable = true; enable = true;
mediaLocation = service_configs.immich.dir; mediaLocation = service_configs.immich.dir;
port = 2284; port = service_configs.ports.immich;
# openFirewall = true; # openFirewall = true;
host = "0.0.0.0"; host = "0.0.0.0";
database = { database = {

5
services/matrix.nix
View File

@ -6,9 +6,8 @@
... ...
}: }:
{ {
imports = [ services.matrix-conduit.settings.global.registration_token =
../secrets/matrix_reg_token.nix builtins.readFile ../secrets/matrix_reg_token;
];
services.caddy.virtualHosts.${service_configs.https.domain}.extraConfig = lib.mkBefore '' services.caddy.virtualHosts.${service_configs.https.domain}.extraConfig = lib.mkBefore ''
header /.well-known/matrix/* Content-Type application/json header /.well-known/matrix/* Content-Type application/json

4
services/minecraft.nix
View File

@ -51,8 +51,8 @@ in
with pkgs; with pkgs;
builtins.attrValues { builtins.attrValues {
FabricApi = fetchurl { FabricApi = fetchurl {
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/S6sAWXmr/fabric-api-0.115.0%2B1.21.4.jar"; url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/UnrycCWP/fabric-api-0.115.1%2B1.21.4.jar";
sha512 = "abb2b28e9b874adfc82c3c87ddf348e2e98adc5153aed7ae5bcaddf5b1d8bd98982a052ab91411b7fad3bbdffc5d788be60d22b9c95dd21e62b96ea49aa404ca"; sha512 = "d5e9f87679b5edc9786e651fc481f8861a9cf53ed381890a1cb5e129222d6c5fa99f06045007f8e1fba02da686cdb6db2d99b334a1d23881cb56dfa199932eea";
}; };
FerriteCore = fetchurl { FerriteCore = fetchurl {

17
zfs.nix
View File

@ -25,4 +25,21 @@ in
boot.supportedFilesystems = [ "zfs" ]; boot.supportedFilesystems = [ "zfs" ];
boot.zfs.extraPools = [ service_configs.zpool ]; boot.zfs.extraPools = [ service_configs.zpool ];
services.zfs = {
autoScrub.enable = true;
trim.enable = true;
# doesn't work, maybe replace with `services.sanoid` instead
autoSnapshot = {
# attempted to manually set zpool, didn't work
flags = "-k -p -P ${service_configs.zpool}";
enable = true;
frequent = 4; # 15-minutes
hourly = 24;
daily = 7;
weekly = 4;
monthly = 12;
};
};
} }