diff --git a/hosts/hitsugibune/configuration.nix b/hosts/hitsugibune/configuration.nix index a3fc05d..b074d9a 100644 --- a/hosts/hitsugibune/configuration.nix +++ b/hosts/hitsugibune/configuration.nix @@ -6,6 +6,27 @@ ... }: let inherit (lib) concatStringsSep; + jvmOpts = concatStringsSep " " [ + "-XX:+UseG1GC" + "-XX:+ParallelRefProcEnabled" + "-XX:MaxGCPauseMillis=200" + "-XX:+UnlockExperimentalVMOptions" + "-XX:+DisableExplicitGC" + "-XX:+AlwaysPreTouch" + "-XX:G1NewSizePercent=40" + "-XX:G1MaxNewSizePercent=50" + "-XX:G1HeapRegionSize=16M" + "-XX:G1ReservePercent=15" + "-XX:G1HeapWastePercent=5" + "-XX:G1MixedGCCountTarget=4" + "-XX:InitiatingHeapOccupancyPercent=20" + "-XX:G1MixedGCLiveThresholdPercent=90" + "-XX:G1RSetUpdatingPauseTimePercent=5" + "-XX:SurvivorRatio=32" + "-XX:+PerfDisableSharedMem" + "-XX:MaxTenuringThreshold=1" + ]; + key = ["ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDBQtMQF6NpN/tPS01LRAI1yIzfTj+tNQi+TsG7+dRSsTxxv4eXJ1EQ1HV5vSAYlCwt0FjlK2ejXUqXzGzZBdd2usPBYPHiE3n2ZfQ3bCPJVa17M/ZIgX2PB/CcewQSVMZmlNu2SoocGaOBSQ9CaGQYe8Cj2nrZxF6ArPEm7FcFTvV+nJa//nEXccM2gexEyuuPm/ESMbCB/sffz8xgeDpCgG97Hb8JDcEtw5n17ZzR0eSJlSGQ2Sv8rM0ymO9GwHIJgnvPBxLV1TTotAy8E2kQF84Z9/tPkrI2T30EPvOxCtbIHR/8ZCbasTWfyoM2+Gum63soxAdcvjbRbiQEwpO2KiEYl4Zu3n0FJqqJGnC3yVpK7zZfEw7djeX8PJOjt5xzyhTGyjkLREuO/1IwLN0vCdC9irjCWrdoPTDnYLPN4aYEbH19Ff1UiVFB/jAsIwKsMFJ66/EawrJ1MLcdhSbZv0wZgG4DByeBz148Ev7uidT7orpaqf/dCCYpHc8Kfys= sprechtl@sprechtl-Laptop"]; in { imports = [ ./hardware-configuration.nix @@ -59,34 +80,12 @@ in { # In this case, the folder is `/var/lib/mc-aged` # and the user `mc-aged`. aged = { - enable = true; + enable = false; jvmMaxAllocation = "42G"; jvmInitialAllocation = "2G"; jvmPackage = pkgs.temurin-bin-17; - jvmOpts = concatStringsSep " " [ - "-XX:+UseG1GC" - "-XX:+ParallelRefProcEnabled" - "-XX:MaxGCPauseMillis=200" - "-XX:+UnlockExperimentalVMOptions" - "-XX:+DisableExplicitGC" - "-XX:+AlwaysPreTouch" - "-XX:G1NewSizePercent=40" - "-XX:G1MaxNewSizePercent=50" - "-XX:G1HeapRegionSize=16M" - "-XX:G1ReservePercent=15" - "-XX:G1HeapWastePercent=5" - "-XX:G1MixedGCCountTarget=4" - "-XX:InitiatingHeapOccupancyPercent=20" - "-XX:G1MixedGCLiveThresholdPercent=90" - "-XX:G1RSetUpdatingPauseTimePercent=5" - "-XX:SurvivorRatio=32" - "-XX:+PerfDisableSharedMem" - "-XX:MaxTenuringThreshold=1" - ]; - rsyncSSHKeys = [ - "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDBQtMQF6NpN/tPS01LRAI1yIzfTj+tNQi+TsG7+dRSsTxxv4eXJ1EQ1HV5vSAYlCwt0FjlK2ejXUqXzGzZBdd2usPBYPHiE3n2ZfQ3bCPJVa17M/ZIgX2PB/CcewQSVMZmlNu2SoocGaOBSQ9CaGQYe8Cj2nrZxF6ArPEm7FcFTvV+nJa//nEXccM2gexEyuuPm/ESMbCB/sffz8xgeDpCgG97Hb8JDcEtw5n17ZzR0eSJlSGQ2Sv8rM0ymO9GwHIJgnvPBxLV1TTotAy8E2kQF84Z9/tPkrI2T30EPvOxCtbIHR/8ZCbasTWfyoM2+Gum63soxAdcvjbRbiQEwpO2KiEYl4Zu3n0FJqqJGnC3yVpK7zZfEw7djeX8PJOjt5xzyhTGyjkLREuO/1IwLN0vCdC9irjCWrdoPTDnYLPN4aYEbH19Ff1UiVFB/jAsIwKsMFJ66/EawrJ1MLcdhSbZv0wZgG4DByeBz148Ev7uidT7orpaqf/dCCYpHc8Kfys= sprechtl@sprechtl-Laptop" - ]; + rsyncSSHKeys = key; serverConfig = { server-port = 25565; @@ -99,6 +98,26 @@ in { allow-flight = true; }; }; + + sf3 = { + enable = true; + jvmMaxAllocation = "42G"; + jvmInitialAllocation = "2G"; + jvmPackage = pkgs.openjdk8-bootstrap; + + rsyncSSHKeys = key; + + serverConfig = { + server-port = 25565; + rcon-port = 25566; + motd = "ouhh baby"; + white-list = true; + spawn-protection = 0; + # max-tick-time = 5 * 60 * 1000; + max-tick-time = -1; + allow-flight = true; + }; + }; }; }; @@ -112,9 +131,10 @@ in { systemd.timers.mc-announcement = { description = "Run Minecraft Announcement every hour"; - enable = true; + enable = false; wantedBy = ["timers.target"]; after = ["mc-aged.service"]; + jvmOpts = jvmOpts; timerConfig = { #OnCalendar = "hourly"; # Change this as needed OnCalendar = "*:0/15"; # Every 15 minutes diff --git a/modules/home-manager/hyprland.nix b/modules/home-manager/hyprland.nix index b0f7685..43f749f 100644 --- a/modules/home-manager/hyprland.nix +++ b/modules/home-manager/hyprland.nix @@ -88,9 +88,9 @@ monitor = [ "eDP-1,2560x1600@165.0,0x0,1.6" - "DP-1,preferred,auto-right,2" - "DP-2,preferred,auto-right,2" - "DP-3,preferred,auto-right,2" + "DP-1,preferred,auto-right,1" + "DP-2,preferred,auto-right,1" + "DP-3,preferred,auto-right,1" ", preferred, auto,1" ];