Tweak minecraft and git config
This commit is contained in:
parent
3a8b7612fb
commit
3086550f06
|
@ -31,6 +31,7 @@ let
|
||||||
white-list = true;
|
white-list = true;
|
||||||
spawn-protection = 0;
|
spawn-protection = 0;
|
||||||
allow-flight = true;
|
allow-flight = true;
|
||||||
|
max-tick-time = 2 * 60 * 1000;
|
||||||
};
|
};
|
||||||
in {
|
in {
|
||||||
services.modded-minecraft-servers = {
|
services.modded-minecraft-servers = {
|
||||||
|
@ -42,6 +43,7 @@ in {
|
||||||
enable = true;
|
enable = true;
|
||||||
inherit rsyncSSHKeys jvmOpts;
|
inherit rsyncSSHKeys jvmOpts;
|
||||||
|
|
||||||
|
jvmInitialAllocation = "2G";
|
||||||
jvmMaxAllocation = "8G";
|
jvmMaxAllocation = "8G";
|
||||||
jvmPackage = jre8;
|
jvmPackage = jre8;
|
||||||
|
|
||||||
|
|
|
@ -38,6 +38,8 @@
|
||||||
extraConfig = {
|
extraConfig = {
|
||||||
init = { defaultBranch = "mistress"; };
|
init = { defaultBranch = "mistress"; };
|
||||||
core = { editor = "hx"; };
|
core = { editor = "hx"; };
|
||||||
|
rebase.autosquash = true;
|
||||||
|
pull.rebase = true;
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|
Loading…
Reference in New Issue