muon/flake
1
0
Fork 0
mirror of https://codeberg.org/muon/home.git synced 2025-12-06 08:07:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

Fix astral

Browse source
This commit is contained in:
mups 2024-07-14 01:23:57 +00:00
parent 33895b9c46
commit dcfd4b7f3a
4 changed files with 25 additions and 9 deletions
Download patch file Download diff file Expand all files Collapse all files

6
hosts/mups/configuration.nix
View file

@ -20,7 +20,11 @@ in {
mods.theme.scheme = "woodland"; mods.theme.scheme = "woodland";
mods.theme.wallpaper = ./wallpaper.png; mods.theme.wallpaper = ./wallpaper.png;
# mods.server.astral.enable = true; mods.tailscale.enable = true;
mods.unfree.minecraft.enable = true;
mods.server.astral.enable = true;
mods.server.astral.memory = "2G";
# Use the GRUB 2 boot loader. # Use the GRUB 2 boot loader.
boot.loader.grub.enable = true; boot.loader.grub.enable = true;

9
hosts/mups/hardware-configuration.nix
View file

@ -20,9 +20,12 @@ in {
fsType = "ext4"; fsType = "ext4";
}; };
swapDevices = swapDevices = [{
[ { device = "/dev/disk/by-uuid/bc6acd1f-98bb-4f94-b52c-40aa7312e838"; } device = "/dev/disk/by-uuid/bc6acd1f-98bb-4f94-b52c-40aa7312e838";
]; } {
device = "/var/lib/swapfile";
size = 2*1024;
}];
networking.useDHCP = lib.mkForce false; networking.useDHCP = lib.mkForce false;
networking.domain = ""; networking.domain = "";

11
modules/nixos/server/gaming/astral.nix
View file

@ -4,7 +4,7 @@ let
# version = "main"; # version = "main";
url = "https://github.com/nix-astral/create-astral/raw/main/pack.toml"; url = "https://github.com/nix-astral/create-astral/raw/main/pack.toml";
packHash = "sha256-QcUg4PRxgGdQIB5d+XnJCmhh6+r/zDtWRFSTkSOR1ik="; packHash = "sha256-QcUg4PRxgGdQIB5d+XnJCmhh6+r/zDtWRFSTkSOR1ik=";
manifestHash = "sha256:0kcwbj2f9h30v8kwxhaxzzs2gi3bydzmjgxb2ysf8jv1av1l21n3"; manifestHash = "sha256:16pjv73nv7a5fy6rvzgg88228niirnwd0ip7mw5dmzd7q1b0xqsr";
}; };
mcVersion = modpack.manifest.versions.minecraft; mcVersion = modpack.manifest.versions.minecraft;
fabricVersion = modpack.manifest.versions.fabric; fabricVersion = modpack.manifest.versions.fabric;
@ -16,12 +16,19 @@ in {
default = false; default = false;
description = "enables minecraft create astral server"; description = "enables minecraft create astral server";
}; };
memory = lib.mkOption {
default = "2G";
description = "server detitated wam";
};
}; };
config = lib.mkIf config.mods.server.astral.enable { config = lib.mkIf config.mods.server.astral.enable {
services.minecraft-servers.servers.astral = { services.minecraft-servers.servers.astral = {
enable = true; enable = true;
jvmOpts = (import ./aikar-flags.nix) "4G"; serverProperties = {
online-mode = false;
};
jvmOpts = (import ./aikar-flags.nix) config.mods.server.astral.memory;
package = pkgs.fabricServers.${serverVersion}.override { package = pkgs.fabricServers.${serverVersion}.override {
loaderVersion = fabricVersion; loaderVersion = fabricVersion;
}; };

8
modules/nixos/unfree/minecraft.nix
View file

@ -21,9 +21,11 @@
inputs.nix-minecraft.overlay inputs.nix-minecraft.overlay
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs;
prismlauncher if config.mods.xorg.enable then
]; [ prismlauncher ]
else
[];
services.minecraft-servers = { services.minecraft-servers = {
enable = true; enable = true;