Compare commits

..

No commits in common. "f215390d8e56d4c5fc71b6d8ac26eff979d83713" and "6d26f9c9a0f67e229dd3cf53559e8bcf5d71f108" have entirely different histories.

2 changed files with 16 additions and 30 deletions

32
flake.lock generated
View file

@ -172,11 +172,11 @@
"zig": "zig" "zig": "zig"
}, },
"locked": { "locked": {
"lastModified": 1726848912, "lastModified": 1726527664,
"narHash": "sha256-6eQ3VFinchM6fq7wYwIVd4zZkbYph1GtxBsSXdem+rU=", "narHash": "sha256-9so8Ke7mZNOh6/cLxn7FIGHbaobzzwWQs47njO9w7gM=",
"ref": "refs/heads/main", "ref": "refs/heads/main",
"rev": "761223f0f366ce3ebdc0a7ec19c490102eb63d87", "rev": "0109cb5ba49aa5af0f32b04a0075183242175cd9",
"revCount": 7377, "revCount": 7327,
"type": "git", "type": "git",
"url": "ssh://git@github.com/ghostty-org/ghostty" "url": "ssh://git@github.com/ghostty-org/ghostty"
}, },
@ -192,11 +192,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726863345, "lastModified": 1726440980,
"narHash": "sha256-fjbKe1/UJpLT6tQLAKJ/djJFdnmAh2kkdsgmylyFrQA=", "narHash": "sha256-ChhIrjtdu5d83W+YDRH+Ec5g1MmM0xk6hJnkz15Ot7M=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "dfe4d334b172071e7189d971ddecd3a7f811b48d", "rev": "a9c9cc6e50f7cbd2d58ccb1cd46a1e06e9e445ff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -243,11 +243,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726646517, "lastModified": 1726473728,
"narHash": "sha256-cr16Lq7/vEx69WHMeY5oPVelSf6w8ol+uc2tsPTzfUg=", "narHash": "sha256-m2mG06frqv1lEk3xpvZul0fEE7iC7CpcdlM6JWap+io=",
"owner": "soopyc", "owner": "soopyc",
"repo": "mystia", "repo": "mystia",
"rev": "606b9833ea609a3a8fe915437f1833c42db5fd5a", "rev": "fb18d4cfa98e94552c301c793da75ba39662f920",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -302,11 +302,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1726755586, "lastModified": 1726463316,
"narHash": "sha256-PmUr/2GQGvFTIJ6/Tvsins7Q43KTMvMFhvG6oaYK+Wk=", "narHash": "sha256-gI9kkaH0ZjakJOKrdjaI/VbaMEo9qBbSUl93DnU7f4c=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "c04d5652cfa9742b1d519688f65d1bbccea9eb7e", "rev": "99dc8785f6a0adac95f5e2ab05cc2e1bf666d172",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -421,11 +421,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1726796602, "lastModified": 1726536105,
"narHash": "sha256-rYMcODISSljSETcqUUTMo++ZEa1CC6Xx6d3xuydishM=", "narHash": "sha256-/HAjEdG5UN/Pk5Jap1jjxhXWRPHMXYe9/9xy+3WlMww=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "91dea80194080f017c6edf84fd94e33f6c12aec3", "rev": "03bd00378bb108c1902ba60be89b2536febb9b05",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -21,25 +21,11 @@
MODRINTH_MODPACK = "https://modrinth.com/modpack/adrenaserver/version/1.6.0+1.20.6.fabric"; MODRINTH_MODPACK = "https://modrinth.com/modpack/adrenaserver/version/1.6.0+1.20.6.fabric";
}; };
}; };
vanilla = _utils.mkMinecraftServer config {
name = "vanilla";
port = 25565;
remotePort = 6005;
memory = "4G";
envFiles = [secret.path];
env = {
USE_AIKAR_FLAGS = "true";
TYPE = "MODRINTH";
MODRINTH_MODPACK = "https://modrinth.com/modpack/adrenaline/version/1.24.0+1.21.1.fabric";
};
};
in { in {
imports = [ imports = [
secret.generate secret.generate
lynn lynn
vanilla
]; ];
systemd.services.restart-minecraft-servers = { systemd.services.restart-minecraft-servers = {