diff --git a/flake.lock b/flake.lock index 80cf211..8e24776 100644 --- a/flake.lock +++ b/flake.lock @@ -295,11 +295,11 @@ ] }, "locked": { - "lastModified": 1769956843, - "narHash": "sha256-168Ph9HgUlsqj/gj8xTfTK57/NX71M39D3jirfscknI=", + "lastModified": 1769957575, + "narHash": "sha256-bj8OvmGN9Rlu8vfaFT9CE0FEaI5cM7SqG/rsMxUhKBU=", "owner": "nix-community", "repo": "NUR", - "rev": "3d1ab660049a2e95726ff75849124e981b6c271d", + "rev": "e4ff240351102c0c7066031a5a73d5efe1f6c318", "type": "github" }, "original": { @@ -316,11 +316,11 @@ ] }, "locked": { - "lastModified": 1769956843, - "narHash": "sha256-168Ph9HgUlsqj/gj8xTfTK57/NX71M39D3jirfscknI=", + "lastModified": 1769957575, + "narHash": "sha256-bj8OvmGN9Rlu8vfaFT9CE0FEaI5cM7SqG/rsMxUhKBU=", "owner": "nix-community", "repo": "NUR", - "rev": "3d1ab660049a2e95726ff75849124e981b6c271d", + "rev": "e4ff240351102c0c7066031a5a73d5efe1f6c318", "type": "github" }, "original": { diff --git a/home/wm/sway.nix b/home/wm/sway.nix index 26a9216..860cf2c 100644 --- a/home/wm/sway.nix +++ b/home/wm/sway.nix @@ -411,7 +411,7 @@ format-connected = "| ᛒ"; format-on = "| ᚧ"; format-disabled = ""; - format-no-controllers = ""; + format-no-controller = ""; interval = 15; on-click = "${uwsm} ${term} -e bluetui"; }; diff --git a/hosts/tesla-nixos/configuration.nix b/hosts/tesla-nixos/configuration.nix index 670c4a4..209c7d3 100644 --- a/hosts/tesla-nixos/configuration.nix +++ b/hosts/tesla-nixos/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ inputs, config, pkgs, lib, ... }: let modpack = pkgs.fetchPackwizModpack { @@ -7,6 +7,8 @@ let }; in { + nixpkgs.overlays = [ inputs.nix-minecraft.overlay ]; + security.sudo.wheelNeedsPassword = false; imports = [ ./hardware-configuration.nix ]; @@ -41,21 +43,35 @@ in }; }; - nixpkgs.overlays = [ inputs.nix-minecraft.overlay ]; services.minecraft-servers = { enable = true; eula = true; openFirewall = true; - servers.fabric = { + servers.tfcpack = { enable = true; - package = pkgs.neoforgeServers.neoforge-1_21_1.override { - loaderVersion = "21.1.219"; - }; - symlinks = { - "mods" = "${modpack}/mods"; + autoStart = true; + serverProperties = { + "motd" = "TFC Pack - Tesla Nixos"; + "max-players" = "20"; + "view-distance" = "32"; + "level-type" = "tfc\:overworld"; + "spawn-protection" = "0"; }; + jvmOpts = [ + "-Xmx30G" + "-Xms24G" + "-XX:G1NewSizePercent=40" + "-XX:G1MaxNewSizePercent=50" + "-XX:G1HeapRegionSize=16M" + "-XX:G1ReservePercent=15" + "-XX:InitiatingHeapOccupancyPercent=20" + ]; + package = pkgs.neoforgeServers.neoforge-1_21_1-21_1_219; }; - }; + symlinks = { + "mods" = "${modpack}/mods"; + }; # end servers.minecraft-servers.neoforge + }; # end services.minecraft-servers users.users.gitlab-runner = { isNormalUser = true;