Compare commits

...

4 Commits

Author SHA1 Message Date
b56187d58d minecraft: 1.21.5 -> 1.21.6 2025-06-19 21:29:37 -07:00
788abf1515 add more terminfos 2025-06-19 18:11:12 -07:00
eaa84d60e8 update 2025-06-19 18:09:15 -07:00
74abae8363 kernel: use hardened kernel 2025-06-19 18:09:11 -07:00
4 changed files with 43 additions and 42 deletions

View File

@@ -79,7 +79,7 @@
boot = { boot = {
# 6.12 LTS until 2026 # 6.12 LTS until 2026
kernelPackages = pkgs.linuxPackages_6_12; kernelPackages = pkgs.linuxPackages_6_12_hardened;
loader = { loader = {
# Use the systemd-boot EFI boot loader. # Use the systemd-boot EFI boot loader.

18
flake.lock generated
View File

@@ -238,11 +238,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750266626, "lastModified": 1750361054,
"narHash": "sha256-LSCxaOFIVNTdrNiR4IxtNokcaabTFOWA3wT7uqUiO/I=", "narHash": "sha256-MysIyBn05x9HYuKwCfHh0fZvAFr2QReRLoMRO9lrrwI=",
"owner": "ggml-org", "owner": "ggml-org",
"repo": "llama.cpp", "repo": "llama.cpp",
"rev": "8d947136546773f6410756f37fcc5d3e65b8135d", "rev": "8f71d0f3e86ccbba059350058af8758cafed73e6",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -260,11 +260,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1750212369, "lastModified": 1750298798,
"narHash": "sha256-QXZc1il1KSGTtARN5ZI6wx1HxCXjEFZXsRZWl5+tOLc=", "narHash": "sha256-jdwSQWssdK1iOhOUteHiW7IoNEBdK05s8ioLqtKaKas=",
"owner": "Infinidoge", "owner": "Infinidoge",
"repo": "nix-minecraft", "repo": "nix-minecraft",
"rev": "886fbf6b49af5754ed096e04f97fd9d87f0fd7e0", "rev": "efe6de64b35fa9092a5d6605edcf8036106f6d78",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -291,11 +291,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1750133334, "lastModified": 1750259320,
"narHash": "sha256-urV51uWH7fVnhIvsZIELIYalMYsyr2FCalvlRTzqWRw=", "narHash": "sha256-H8J4H2XCIMEJ5g6fZ179QfQvsc2dUqhqfBjC8RAHNRY=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "36ab78dab7da2e4e27911007033713bab534187b", "rev": "9ba04bda9249d5d5e5238303c9755de5a49a79c5",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -203,6 +203,9 @@
# sets up things like the watchdog # sets up things like the watchdog
srvos.nixosModules.server srvos.nixosModules.server
# diff terminal support
srvos.nixosModules.mixins-terminfo
./disk-config.nix ./disk-config.nix
disko.nixosModules.disko disko.nixosModules.disko
./configuration.nix ./configuration.nix

View File

@@ -35,7 +35,7 @@
servers.${service_configs.minecraft.server_name} = { servers.${service_configs.minecraft.server_name} = {
enable = true; enable = true;
package = pkgs.fabricServers.fabric-1_21_5; package = pkgs.fabricServers.fabric-1_21_6;
jvmOpts = jvmOpts =
let let
@@ -63,8 +63,8 @@
with pkgs; with pkgs;
builtins.attrValues { builtins.attrValues {
FabricApi = fetchurl { FabricApi = fetchurl {
url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/1Hweb6k1/fabric-api-0.125.3%2B1.21.5.jar"; url = "https://cdn.modrinth.com/data/P7dR8mSH/versions/N3z6cNQv/fabric-api-0.127.1%2B1.21.6.jar";
sha512 = "54d1c195803de90a7055858ab835d527919007f0e80048e854d3beaaad151d30766a78f530a4189eadfbbef3bd98cca69c9f54f565d49b586180cbd5834eda97"; sha512 = "c7b4ea754a486193476b33ac4d1eaeb30b644e05b76a6abe8cf51ca4eb6832063d32293f1c9052c32c806712d26f85b531085a3ff52575021ee831a804167c4d";
}; };
FerriteCore = fetchurl { FerriteCore = fetchurl {
@@ -73,19 +73,25 @@
}; };
Lithium = fetchurl { Lithium = fetchurl {
url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/VWYoZjBF/lithium-fabric-0.16.2%2Bmc1.21.5.jar"; url = "https://cdn.modrinth.com/data/gvQqBUqZ/versions/XWGBHYcB/lithium-fabric-0.17.0%2Bmc1.21.6.jar";
sha512 = "09a68051504bb16069dd6af8901f2bbeadfd08ad5353d8bcc0c4784e814fb293d9197b4fb0a8393be1f2db003cd987a9e4b98391bbe18c50ae181dace20c2fa4"; sha512 = "a8d6a8b69ae2b10dd0cf8f8149260d5bdbd2583147462bad03380014edd857852972b967d97df69728333d8836b1e9db8997712ea26365ddb8a05b8c845c6534";
}; };
NoChatReports = fetchurl { # not updated to 1.21.6
url = "https://cdn.modrinth.com/data/qQyHxfxd/versions/CHlHxkvf/NoChatReports-FABRIC-1.21.5-v2.12.0.jar"; /*
sha512 = "c0825db25672cf8b50face51ec8a6bedb4be50b374a2537640a433c98817bc07c177485e93ab8cee9e3f7bfb1d2eb1460309e818b411764c92426b552487a9f7"; NoChatReports = fetchurl {
}; url = "https://cdn.modrinth.com/data/qQyHxfxd/versions/CHlHxkvf/NoChatReports-FABRIC-1.21.5-v2.12.0.jar";
sha512 = "c0825db25672cf8b50face51ec8a6bedb4be50b374a2537640a433c98817bc07c177485e93ab8cee9e3f7bfb1d2eb1460309e818b411764c92426b552487a9f7";
};
*/
squaremap = fetchurl { # not updated yet to 1.21.6: https://github.com/jpenilla/squaremap/pull/422
url = "https://github.com/jpenilla/squaremap/releases/download/v1.3.6/squaremap-fabric-mc1.21.5-1.3.6.jar"; /*
sha256 = "Y3CiPf8qzZ0q2vfi4z3QoQgXdPZlT/gBm1ghlmGJCZQ="; squaremap = fetchurl {
}; url = "https://github.com/jpenilla/squaremap/releases/download/v1.3.6/squaremap-fabric-mc1.21.5-1.3.6.jar";
sha256 = "Y3CiPf8qzZ0q2vfi4z3QoQgXdPZlT/gBm1ghlmGJCZQ=";
};
*/
scalablelux = fetchurl { scalablelux = fetchurl {
url = "https://cdn.modrinth.com/data/Ps1zyz6x/versions/UueJNiJn/ScalableLux-0.1.3%2Bbeta.1%2Bfabric.4039a8d-all.jar"; url = "https://cdn.modrinth.com/data/Ps1zyz6x/versions/UueJNiJn/ScalableLux-0.1.3%2Bbeta.1%2Bfabric.4039a8d-all.jar";
@@ -93,19 +99,8 @@
}; };
c2me = fetchurl { c2me = fetchurl {
url = "https://cdn.modrinth.com/data/VSNURh3q/versions/jrmtD6AF/c2me-fabric-mc1.21.5-0.3.3.0.0.jar"; url = "https://cdn.modrinth.com/data/VSNURh3q/versions/y6wodInu/c2me-fabric-mc1.21.6-0.3.4%2Balpha.0.42.jar";
sha512 = "4d6a3efcef9aaec8b494f1ac5917c5230175d6485592243a45eb2ee263baf481ce07681b0fb5b65a4969cd08d4708e001a83b17949dad32a646a8ea26052a9f9"; sha512 = "3d53b1dd84a036b5fb91f15a0bc538e6f2a4ac207c4749ab1ab874972178bc2cc20f1fe1c2f8c08e9eef0a66b4f6b2de22314d94d0498abcf025219dfc69d756";
};
# fix `Error sending packet clientbound/minecraft:disconnect` error
disconnectpacketfix = fetchurl {
url = "https://cdn.modrinth.com/data/rd9rKuJT/versions/Gv74xveQ/disconnect-packet-fix-fabric-2.0.0.jar";
sha512 = "1fd6f09a41ce36284e1a8e9def53f3f6834d7201e69e54e24933be56445ba569fbc26278f28300d36926ba92db6f4f9c0ae245d23576aaa790530345587316db";
};
packetfixer = fetchurl {
url = "https://cdn.modrinth.com/data/c7m1mi73/versions/nBmGzZcV/packetfixer-fabric-1.21.5-2.1.2.jar";
sha512 = "b66042f85072e037bb43c6cfa59e889204ffc06768ba6c393f3cfdb735b11192b5390ac79b022713739ac836b9662f5e476690b3d6b9dd350cbe2de5449eddbe";
}; };
krypton = fetchurl { krypton = fetchurl {
@@ -114,14 +109,17 @@
}; };
spark = fetchurl { spark = fetchurl {
url = "https://cdn.modrinth.com/data/l6YH9Als/versions/65SnrRgF/spark-1.10.138-fabric.jar"; url = "https://cdn.modrinth.com/data/l6YH9Als/versions/qW2mPW6y/spark-1.10.139-fabric.jar";
sha512 = "c2bdb171c7ec1783f9efb0ff9a995433fd5838bd8571896be4f498c857ae9f2242d3f24c0541cd96049ea29d742a0e3f8077a3bd1af5d79654f19d34a3adc79c"; sha512 = "cd991acee93c074912f2934b5a9c3967be2f1e9157ca5a7254fd3fce8d280c5aa9a3ab06d3ee19f06c5111181853cf12048d000bf8b9f722c902c080fe258a97";
}; };
better-fabric-console = fetchurl { # not updated to 1.21.6
url = "https://cdn.modrinth.com/data/Y8o1j1Sf/versions/OexcFHtG/better-fabric-console-mc1.21.5-1.2.3.jar"; /*
sha512 = "0a5b0da9d6d3c78ed9af66d2bca3976889649942025aecf7f469bea500ce7914070569259332fefb3629b2eb478ee0cfbf85252aaec5d7969727c1668732e8f4"; better-fabric-console = fetchurl {
}; url = "https://cdn.modrinth.com/data/Y8o1j1Sf/versions/OexcFHtG/better-fabric-console-mc1.21.5-1.2.3.jar";
sha512 = "0a5b0da9d6d3c78ed9af66d2bca3976889649942025aecf7f469bea500ce7914070569259332fefb3629b2eb478ee0cfbf85252aaec5d7969727c1668732e8f4";
};
*/
} }
); );
}; };