From 916720d070d7dfa03a5f68fde423747140bd2379 Mon Sep 17 00:00:00 2001 From: Jade Date: Sun, 29 Jan 2023 14:00:29 +0100 Subject: [PATCH] updates people, updates (removed mc server) --- flake.nix | 4 ++-- potatobook-g/configuration.nix | 42 +++++++++++++++++----------------- 2 files changed, 23 insertions(+), 23 deletions(-) diff --git a/flake.nix b/flake.nix index c2d4dc2..9328f7e 100644 --- a/flake.nix +++ b/flake.nix @@ -2,7 +2,7 @@ description = "system"; inputs = { - nixpkgs.url = "github:NixOS/nixpkgs"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable"; home-manager = { url = "github:nix-community/home-manager"; inputs.nixpkgs.follows = "nixpkgs"; @@ -12,7 +12,7 @@ url = "path:./mac-brcm-fw"; flake = false; }; - mms.url = "github:mkaito/nixos-modded-minecraft-servers"; + #mms.url = "github:mkaito/nixos-modded-minecraft-servers"; easymacros.url = "git+https://gitlab.com/obsidianical/easymacros.git"; }; diff --git a/potatobook-g/configuration.nix b/potatobook-g/configuration.nix index f852472..95f5bfe 100644 --- a/potatobook-g/configuration.nix +++ b/potatobook-g/configuration.nix @@ -13,7 +13,7 @@ # "${builtins.fetchGit { url = "https://github.com/kekrby/nixos-hardware.git"; }}/apple/t2" ./hardware-configuration.nix ../common.nix - inputs.mms.module + #inputs.mms.module ]; # boot.supportedFilesystems = pkgs.lib.mkForce [ "ext4" "btrfs" "squashfs" ]; @@ -104,31 +104,31 @@ # networking.firewall.allowedTCPPorts = [ 4713 ]; systemd.services."NetworkManager-wait-online".enable = false; - services.modded-minecraft-servers = { + #services.modded-minecraft-servers = { # This is mandatory, sorry. - eula = true; + #eula = true; # The name will be used for the state folder and system user. # In this case, the folder is `/var/lib/mc-e2es` # and the user `mc-e2es`. - instances = { - e2es = { - enable = true; - jvmMaxAllocation = "7G"; - jvmInitialAllocation = "2G"; - rsyncSSHKeys = [ "" ]; - serverConfig = { - # Port must be unique - white-list = true; - spawn-protection = 0; - max-tick-time = 5 * 60 * 1000; - allow-flight = true; - server-port = 8080; - motd = "Hello world"; - }; - }; - }; - }; + #instances = { + #e2es = { + #enable = true; + #jvmMaxAllocation = "7G"; + #jvmInitialAllocation = "2G"; + #rsyncSSHKeys = [ "" ]; + #serverConfig = { + ## Port must be unique + #white-list = true; + #spawn-protection = 0; + #max-tick-time = 5 * 60 * 1000; + #allow-flight = true; + #server-port = 8080; + #motd = "Hello world"; + #}; + #}; + #}; + #}; # i rly should put that important big comment back here system.stateVersion = "22.11"; # Did you read the comment?