update all services most recent 26.05

This commit is contained in:
2026-06-20 16:34:54 -05:00
parent fd20949d48
commit 3e8ccf87a8
23 changed files with 243 additions and 912 deletions
+12 -30
View File
@@ -16,36 +16,18 @@
"type": "github"
}
},
"flake-utils": {
"inputs": {
"systems": "systems"
},
"locked": {
"lastModified": 1731533236,
"narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
"owner": "numtide",
"repo": "flake-utils",
"rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "flake-utils",
"type": "github"
}
},
"nix-minecraft": {
"inputs": {
"flake-compat": "flake-compat",
"flake-utils": "flake-utils",
"nixpkgs": "nixpkgs"
"nixpkgs": "nixpkgs",
"systems": "systems"
},
"locked": {
"lastModified": 1750471420,
"narHash": "sha256-NdmGCaMJH1OxOpscofZ61aqzHfVf8pMXtl9XFO/1T0k=",
"lastModified": 1780375694,
"narHash": "sha256-TznzgYVONg28KiSFB2rVdf/eLVIMtEQOxKt13Kzyrp8=",
"owner": "Infinidoge",
"repo": "nix-minecraft",
"rev": "c2cda7b9a94779abe0632ac5b64207df002fea40",
"rev": "e6f8bec35104ca5955efe73742da58d2823684f7",
"type": "github"
},
"original": {
@@ -56,11 +38,11 @@
},
"nixpkgs": {
"locked": {
"lastModified": 1748929857,
"narHash": "sha256-lcZQ8RhsmhsK8u7LIFsJhsLh/pzR9yZ8yqpTzyGdj+Q=",
"lastModified": 1769461804,
"narHash": "sha256-msG8SU5WsBUfVVa/9RPLaymvi5bI8edTavbIq3vRlhI=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "c2a03962b8e24e669fb37b7df10e7c79531ff1a4",
"rev": "bfc1b8a4574108ceef22f02bafcf6611380c100d",
"type": "github"
},
"original": {
@@ -72,16 +54,16 @@
},
"nixpkgs_2": {
"locked": {
"lastModified": 1750400657,
"narHash": "sha256-3vkjFnxCOP6vm5Pm13wC/Zy6/VYgei/I/2DWgW4RFeA=",
"lastModified": 1781216227,
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "b2485d56967598da068b5a6946dadda8bfcbcd37",
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
+138 -119
View File
@@ -3,146 +3,165 @@
description = "Declarative MC config";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
nix-minecraft.url = "github:Infinidoge/nix-minecraft";
};
outputs = { self, nixpkgs, nix-minecraft }: {
outputs =
{
self,
nixpkgs,
nix-minecraft,
}:
{
nixosModules.mc-service = { config, lib, pkgs, ... }:
let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
overlays = [ nix-minecraft.overlay ];
config = { allowUnfree = true; };
};
opts = config.services.mc-service;
in {
imports = [ nix-minecraft.nixosModules.minecraft-servers ];
options.services.mc-service = {
enable = lib.mkEnableOption "Enable Minecraft Server";
storeDir = lib.mkOption {
type = lib.types.path;
default = "/persist/srv/minecraft";
description = "Minecraft files locations";
};
};
config = lib.mkIf opts.enable {
users.groups.mc-service = {};
users.users.mc-service = {
isSystemUser = true;
createHome = true;
home = "${opts.storeDir}";
group = "mc-service";
};
services.minecraft-servers = {
enable = true;
eula = true;
openFirewall = true;
dataDir = "${opts.storeDir}";
user = "mc-service";
group = "mc-service";
servers.homeServer = {
enable = true;
restart = "always";
jvmOpts = "-Xmx16G -Xms16G";
whitelist = {
SquidMcJiggles = "7ae4f5a9-dc2b-4b42-ab30-f8d10d38fa83";
Baloneyjohn = "aa33ea9c-05ce-46d4-9ae3-715c80f618da";
Beankurd = "4bdd135f-e9a6-4830-9755-6282ec71e338";
couchdomination = "6272ebe9-6191-43fa-adbd-9d1a9ca36a8c";
Grutkoek = "bb1b7067-18d8-4d63-92fa-49b003d39826";
};
serverProperties = {
server-port = 25565;
difficulty = 3;
gamemode = 0;
force-gamemode = true;
max-players = 10;
motd = "Home MC Server";
white-list = true;
spawn-protection = 0;
nixosModules.mc-service =
{
config,
lib,
pkgs,
...
}:
let
system = "x86_64-linux";
pkgs = import nixpkgs {
inherit system;
overlays = [ nix-minecraft.overlay ];
config = {
allowUnfree = true;
};
};
opts = config.services.mc-service;
in
{
package = pkgs.fabricServers.fabric;
imports = [ nix-minecraft.nixosModules.minecraft-servers ];
options.services.mc-service = {
enable = lib.mkEnableOption "Enable Minecraft Server";
storeDir = lib.mkOption {
type = lib.types.path;
default = "/persist/srv/minecraft";
description = "Minecraft files locations";
symlinks = {
mods = pkgs.linkFarmFromDrvs "mods" (builtins.attrValues {
Sleep = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/WTzuSu8P/versions/w4ONshdx/sleep-v4.1.4.jar";
sha512 = "f4f759a6b9f503ed606bbeb3422b5e31c02d99a7ee91befa7fc4afe364db147bd1e03042d4b6e67bebed7f81e34d6aa60a3a5d690011ef0e726190028d903346";
};
Lithium = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/XWGBHYcB/lithium-fabric-0.17.0%2Bmc1.21.6.jar";
sha512 = "a8d6a8b69ae2b10dd0cf8f8149260d5bdbd2583147462bad03380014edd857852972b967d97df69728333d8836b1e9db8997712ea26365ddb8a05b8c845c6534";
};
FabricAPI = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/b2dnY6PN/fabric-api-0.128.0%2B1.21.6.jar";
sha512 = "c668402e1a877c2d572d16e31e6d2783be27a80993fa83bf040ea2007994518786bd3140dcea15334f8ee1630836292b8ae4d41444e47cba0ac43d05f1eb1e78";
};
});
};
};
servers.testingServer = {
enable = true;
restart = "always";
jvmOpts = "-Xmx1G -Xms1G";
whitelist = {
SquidMcJiggles = "7ae4f5a9-dc2b-4b42-ab30-f8d10d38fa83";
};
serverProperties = {
server-port = 43000;
difficulty = 3;
gamemode = 1;
force-gamemode = true;
max-players = 2;
motd = "Mod Test Server";
white-list = true;
spawn-protection = 0;
config = lib.mkIf opts.enable {
users.groups.mc-service = { };
users.users.mc-service = {
isSystemUser = true;
createHome = true;
home = "${opts.storeDir}";
group = "mc-service";
};
package = pkgs.fabricServers.fabric;
services.minecraft-servers = {
enable = true;
eula = true;
openFirewall = true;
dataDir = "${opts.storeDir}";
user = "mc-service";
group = "mc-service";
symlinks = {
mods = pkgs.linkFarmFromDrvs "mods" (builtins.attrValues {
Sleep = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/WTzuSu8P/versions/w4ONshdx/sleep-v4.1.4.jar";
sha512 = "f4f759a6b9f503ed606bbeb3422b5e31c02d99a7ee91befa7fc4afe364db147bd1e03042d4b6e67bebed7f81e34d6aa60a3a5d690011ef0e726190028d903346";
servers.homeServer = {
enable = true;
restart = "always";
jvmOpts = "-Xmx16G -Xms16G";
whitelist = {
SquidMcJiggles = "7ae4f5a9-dc2b-4b42-ab30-f8d10d38fa83";
Baloneyjohn = "aa33ea9c-05ce-46d4-9ae3-715c80f618da";
Beankurd = "4bdd135f-e9a6-4830-9755-6282ec71e338";
couchdomination = "6272ebe9-6191-43fa-adbd-9d1a9ca36a8c";
Grutkoek = "bb1b7067-18d8-4d63-92fa-49b003d39826";
};
Lithium = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/XWGBHYcB/lithium-fabric-0.17.0%2Bmc1.21.6.jar";
sha512 = "a8d6a8b69ae2b10dd0cf8f8149260d5bdbd2583147462bad03380014edd857852972b967d97df69728333d8836b1e9db8997712ea26365ddb8a05b8c845c6534";
serverProperties = {
server-port = 25565;
difficulty = 3;
gamemode = 0;
force-gamemode = true;
max-players = 10;
motd = "Home MC Server";
white-list = true;
spawn-protection = 0;
};
FabricAPI = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/b2dnY6PN/fabric-api-0.128.0%2B1.21.6.jar";
sha512 = "c668402e1a877c2d572d16e31e6d2783be27a80993fa83bf040ea2007994518786bd3140dcea15334f8ee1630836292b8ae4d41444e47cba0ac43d05f1eb1e78";
package = pkgs.fabricServers.fabric;
symlinks = {
mods = pkgs.linkFarmFromDrvs "mods" (
builtins.attrValues {
Sleep = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/WTzuSu8P/versions/w4ONshdx/sleep-v4.1.4.jar";
sha512 = "f4f759a6b9f503ed606bbeb3422b5e31c02d99a7ee91befa7fc4afe364db147bd1e03042d4b6e67bebed7f81e34d6aa60a3a5d690011ef0e726190028d903346";
};
Lithium = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/XWGBHYcB/lithium-fabric-0.17.0%2Bmc1.21.6.jar";
sha512 = "a8d6a8b69ae2b10dd0cf8f8149260d5bdbd2583147462bad03380014edd857852972b967d97df69728333d8836b1e9db8997712ea26365ddb8a05b8c845c6534";
};
FabricAPI = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/b2dnY6PN/fabric-api-0.128.0%2B1.21.6.jar";
sha512 = "c668402e1a877c2d572d16e31e6d2783be27a80993fa83bf040ea2007994518786bd3140dcea15334f8ee1630836292b8ae4d41444e47cba0ac43d05f1eb1e78";
};
}
);
};
ScaleableLux = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/Ps1zyz6x/versions/PQLHDg2Q/ScalableLux-0.1.5%2Bfabric.e4acdcb-all.jar";
sha512 = "ec8fabc3bf991fbcbe064c1e97ded3e70f145a87e436056241cbb1e14c57ea9f59ef312f24c205160ccbda43f693e05d652b7f19aa71f730caec3bb5f7f7820a";
};
servers.testingServer = {
enable = true;
restart = "always";
jvmOpts = "-Xmx1G -Xms1G";
whitelist = {
SquidMcJiggles = "7ae4f5a9-dc2b-4b42-ab30-f8d10d38fa83";
};
Noisium = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/KuNKN7d2/versions/V9mMIy0f/noisium-fabric-2.7.0%2Bmc1.21.6.jar";
sha512 = "80cc286f3a51b2d12304ef6a44f84c11d67cedec1a02fbaf59e2e816d9b5f0abd17cc6b5a0ca5880935e9dadfea3b951b790ee1e54300c009bc419c1c7451785";
serverProperties = {
server-port = 43000;
difficulty = 3;
gamemode = 1;
force-gamemode = true;
max-players = 2;
motd = "Mod Test Server";
white-list = true;
spawn-protection = 0;
};
C2ME = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/VSNURh3q/versions/Erjpfj2l/c2me-fabric-mc1.21.7-0.3.4%2Bbeta.1.0.jar";
sha512 = "8942e82c216315198d4752fbb9396e6d59d6447085ce5c00811ba0189765b20acad0153a10532f7ade29f7c090e0299c01802174aa89d4da642bc10f9429998d";
package = pkgs.fabricServers.fabric;
symlinks = {
mods = pkgs.linkFarmFromDrvs "mods" (
builtins.attrValues {
Sleep = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/WTzuSu8P/versions/w4ONshdx/sleep-v4.1.4.jar";
sha512 = "f4f759a6b9f503ed606bbeb3422b5e31c02d99a7ee91befa7fc4afe364db147bd1e03042d4b6e67bebed7f81e34d6aa60a3a5d690011ef0e726190028d903346";
};
Lithium = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/XWGBHYcB/lithium-fabric-0.17.0%2Bmc1.21.6.jar";
sha512 = "a8d6a8b69ae2b10dd0cf8f8149260d5bdbd2583147462bad03380014edd857852972b967d97df69728333d8836b1e9db8997712ea26365ddb8a05b8c845c6534";
};
FabricAPI = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/b2dnY6PN/fabric-api-0.128.0%2B1.21.6.jar";
sha512 = "c668402e1a877c2d572d16e31e6d2783be27a80993fa83bf040ea2007994518786bd3140dcea15334f8ee1630836292b8ae4d41444e47cba0ac43d05f1eb1e78";
};
ScaleableLux = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/Ps1zyz6x/versions/PQLHDg2Q/ScalableLux-0.1.5%2Bfabric.e4acdcb-all.jar";
sha512 = "ec8fabc3bf991fbcbe064c1e97ded3e70f145a87e436056241cbb1e14c57ea9f59ef312f24c205160ccbda43f693e05d652b7f19aa71f730caec3bb5f7f7820a";
};
Noisium = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/KuNKN7d2/versions/V9mMIy0f/noisium-fabric-2.7.0%2Bmc1.21.6.jar";
sha512 = "80cc286f3a51b2d12304ef6a44f84c11d67cedec1a02fbaf59e2e816d9b5f0abd17cc6b5a0ca5880935e9dadfea3b951b790ee1e54300c009bc419c1c7451785";
};
C2ME = pkgs.fetchurl {
url = "https://cdn.modrinth.com/data/VSNURh3q/versions/Erjpfj2l/c2me-fabric-mc1.21.7-0.3.4%2Bbeta.1.0.jar";
sha512 = "8942e82c216315198d4752fbb9396e6d59d6447085ce5c00811ba0189765b20acad0153a10532f7ade29f7c090e0299c01802174aa89d4da642bc10f9429998d";
};
}
);
};
});
};
};
};
};
};
};
};
}
+4 -4
View File
@@ -2,16 +2,16 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1749727998,
"narHash": "sha256-mHv/yeUbmL91/TvV95p+mBVahm9mdQMJoqaTVTALaFw=",
"lastModified": 1781216227,
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "fd487183437963a59ba763c0cc4f27e3447dd6dd",
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
+2 -2
View File
@@ -2,11 +2,11 @@
description = "minio service for storing images with api access";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
};
outputs =
{ self, nixpkgs, ... }:
{ ... }:
{
nixosModules.minio-service =
{
+27
View File
@@ -0,0 +1,27 @@
{
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1781216227,
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
},
"root": {
"inputs": {
"nixpkgs": "nixpkgs"
}
}
},
"root": "root",
"version": 7
}
+2 -2
View File
@@ -2,11 +2,11 @@
description = "Flake that configures a static site hosted in a k3s pod";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.11";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
};
outputs =
{ self, nixpkgs, ... }:
{ ... }:
{
nixosModules.nimh-static =
{
+4 -4
View File
@@ -2,16 +2,16 @@
"nodes": {
"nixpkgs": {
"locked": {
"lastModified": 1767313136,
"narHash": "sha256-16KkgfdYqjaeRGBaYsNrhPRRENs0qzkQVUooNHtoy2w=",
"lastModified": 1781216227,
"narHash": "sha256-9mUW6gNwoN2SWc/l0fW4svPNOulXLl8ijqKyeSOGgJE=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "ac62194c3917d5f474c1a844b6fd6da2db95077d",
"rev": "a0374025a863d007d98e3297f6aa46cc3141c2f0",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-25.05",
"ref": "nixos-26.05",
"repo": "nixpkgs",
"type": "github"
}
+2 -2
View File
@@ -2,11 +2,11 @@
description = "Declare a new table and user for postgresql";
inputs = {
nixpkgs.url = "github:NixOS/nixpkgs/nixos-25.05";
nixpkgs.url = "github:NixOS/nixpkgs/nixos-26.05";
};
outputs =
{ self, nixpkgs, ... }:
{ ... }:
{
nixosModules.postgresql-db =
{