diff --git a/flake.lock b/flake.lock index b9fb7ca..91f770e 100644 --- a/flake.lock +++ b/flake.lock @@ -227,22 +227,6 @@ } }, "flake-compat": { - "flake": false, - "locked": { - "lastModified": 1668681692, - "narHash": "sha256-Ht91NGdewz8IQLtWZ9LCeNXMSXHUss+9COoqu6JLmXU=", - "owner": "edolstra", - "repo": "flake-compat", - "rev": "009399224d5e398d03b22badca40a37ac85412a1", - "type": "github" - }, - "original": { - "owner": "edolstra", - "repo": "flake-compat", - "type": "github" - } - }, - "flake-compat_2": { "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", @@ -256,7 +240,7 @@ "url": "https://flakehub.com/f/edolstra/flake-compat/1.tar.gz" } }, - "flake-compat_3": { + "flake-compat_2": { "flake": false, "locked": { "lastModified": 1761588595, @@ -349,21 +333,6 @@ } }, "flake-utils_2": { - "locked": { - "lastModified": 1667395993, - "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=", - "owner": "numtide", - "repo": "flake-utils", - "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f", - "type": "github" - }, - "original": { - "owner": "numtide", - "repo": "flake-utils", - "type": "github" - } - }, - "flake-utils_3": { "inputs": { "systems": "systems_2" }, @@ -381,7 +350,7 @@ "type": "github" } }, - "flake-utils_4": { + "flake-utils_3": { "inputs": { "systems": "systems_3" }, @@ -399,7 +368,7 @@ "type": "github" } }, - "flake-utils_5": { + "flake-utils_4": { "inputs": { "systems": "systems_4" }, @@ -417,7 +386,7 @@ "type": "github" } }, - "flake-utils_6": { + "flake-utils_5": { "inputs": { "systems": [ "starship-jj", @@ -570,63 +539,6 @@ "type": "github" } }, - "lowdown-src": { - "flake": false, - "locked": { - "lastModified": 1633514407, - "narHash": "sha256-Dw32tiMjdK9t3ETl5fzGrutQTzh2rufgZV4A/BbxuD4=", - "owner": "kristapsdz", - "repo": "lowdown", - "rev": "d2c2b44ff6c27b936ec27358a2653caaef8f73b8", - "type": "github" - }, - "original": { - "owner": "kristapsdz", - "repo": "lowdown", - "type": "github" - } - }, - "mms": { - "inputs": { - "flake-compat": "flake-compat", - "flake-utils": "flake-utils_2", - "nix": "nix", - "nixpkgs": "nixpkgs_3" - }, - "locked": { - "lastModified": 1669478601, - "narHash": "sha256-IQcS8IPeXvSoIrQRPgtnLxAs0Pkh8wmglDAtqE4ivNo=", - "owner": "mkaito", - "repo": "nixos-modded-minecraft-servers", - "rev": "68f2066499c035fd81c9dacfea2f512d6b0b62e5", - "type": "github" - }, - "original": { - "owner": "mkaito", - "repo": "nixos-modded-minecraft-servers", - "type": "github" - } - }, - "nix": { - "inputs": { - "lowdown-src": "lowdown-src", - "nixpkgs": "nixpkgs_2", - "nixpkgs-regression": "nixpkgs-regression" - }, - "locked": { - "lastModified": 1669449054, - "narHash": "sha256-aCpXrNpyFH6b1NFYGj2i/HecUvz2vZ88aEyDs1Xj8yM=", - "owner": "NixOS", - "repo": "nix", - "rev": "534332c8a03b64161ec795d1deb2ba3d48f27be1", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nix", - "type": "github" - } - }, "nix-darwin": { "inputs": { "nixpkgs": [ @@ -674,8 +586,8 @@ }, "nix-options-doc": { "inputs": { - "flake-utils": "flake-utils_4", - "nixpkgs": "nixpkgs_6", + "flake-utils": "flake-utils_3", + "nixpkgs": "nixpkgs_4", "rust-overlay": "rust-overlay" }, "locked": { @@ -720,22 +632,6 @@ "url": "https://github.com/NixOS/nixpkgs/archive/5daf0514482af3f97abaefc78a6606365c9108e2.tar.gz" } }, - "nixpkgs-regression": { - "locked": { - "lastModified": 1643052045, - "narHash": "sha256-uGJ0VXIhWKGXxkeNnq4TvV3CIOkUJ3PAoLZ3HMzNVMw=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "215d4d0fd80ca5163643b03a33fde804a29cc1e2", - "type": "github" - } - }, "nixpkgs-unstable": { "locked": { "lastModified": 1761907660, @@ -753,38 +649,6 @@ } }, "nixpkgs_2": { - "locked": { - "lastModified": 1657693803, - "narHash": "sha256-G++2CJ9u0E7NNTAi9n5G8TdDmGJXcIjkJ3NF8cetQB8=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "365e1b3a859281cf11b94f87231adeabbdd878a2", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05-small", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_3": { - "locked": { - "lastModified": 1669378442, - "narHash": "sha256-nm+4PN0A4SnV0SzEchxrMyKPvI3Ld/aoom4PnHeHucs=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "0faaf0a9bb6dedb69bfd43ac06fb27fadc476c51", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-22.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs_4": { "locked": { "lastModified": 1761597516, "narHash": "sha256-wxX7u6D2rpkJLWkZ2E932SIvDJW8+ON/0Yy8+a5vsDU=", @@ -800,7 +664,7 @@ "type": "github" } }, - "nixpkgs_5": { + "nixpkgs_3": { "locked": { "lastModified": 1721924956, "narHash": "sha256-Sb1jlyRO+N8jBXEX9Pg9Z1Qb8Bw9QyOgLDNMEpmjZ2M=", @@ -816,7 +680,7 @@ "type": "github" } }, - "nixpkgs_6": { + "nixpkgs_4": { "locked": { "lastModified": 1740695751, "narHash": "sha256-D+R+kFxy1KsheiIzkkx/6L63wEHBYX21OIwlFV8JvDs=", @@ -832,7 +696,7 @@ "type": "github" } }, - "nixpkgs_7": { + "nixpkgs_5": { "locked": { "lastModified": 1761880412, "narHash": "sha256-QoJjGd4NstnyOG4mm4KXF+weBzA2AH/7gn1Pmpfcb0A=", @@ -848,7 +712,7 @@ "type": "github" } }, - "nixpkgs_8": { + "nixpkgs_6": { "locked": { "lastModified": 1755186698, "narHash": "sha256-wNO3+Ks2jZJ4nTHMuks+cxAiVBGNuEBXsT29Bz6HASo=", @@ -867,7 +731,7 @@ "nixvim": { "inputs": { "flake-parts": "flake-parts", - "nixpkgs": "nixpkgs_5", + "nixpkgs": "nixpkgs_3", "nixvim": "nixvim_2" }, "locked": { @@ -887,7 +751,7 @@ "nixvim_2": { "inputs": { "devshell": "devshell", - "flake-compat": "flake-compat_2", + "flake-compat": "flake-compat", "flake-parts": "flake-parts_2", "git-hooks": "git-hooks", "home-manager": "home-manager_2", @@ -941,7 +805,7 @@ }, "nuschtosSearch": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_2", "nixpkgs": [ "nixvim", "nixvim", @@ -964,9 +828,9 @@ }, "optnix": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_2", "nix-options-doc": "nix-options-doc", - "nixpkgs": "nixpkgs_7" + "nixpkgs": "nixpkgs_5" }, "locked": { "lastModified": 1761981925, @@ -984,7 +848,7 @@ }, "other-transcode": { "inputs": { - "flake-utils": "flake-utils_5", + "flake-utils": "flake-utils_4", "nixpkgs": [ "nixpkgs" ] @@ -1029,9 +893,8 @@ "cassowary": "cassowary", "copyparty": "copyparty", "home-manager": "home-manager", - "mms": "mms", "nix-doom-emacs-unstraightened": "nix-doom-emacs-unstraightened", - "nixpkgs": "nixpkgs_4", + "nixpkgs": "nixpkgs_2", "nixpkgs-unstable": "nixpkgs-unstable", "nixvim": "nixvim", "optnix": "optnix", @@ -1083,8 +946,8 @@ "starship-jj": { "inputs": { "fenix": "fenix", - "flake-utils": "flake-utils_6", - "nixpkgs": "nixpkgs_8", + "flake-utils": "flake-utils_5", + "nixpkgs": "nixpkgs_6", "systems": "systems_5" }, "locked": { diff --git a/flake.nix b/flake.nix index 6312937..c79d162 100644 --- a/flake.nix +++ b/flake.nix @@ -42,8 +42,6 @@ inputs.nixpkgs.follows = "nixpkgs"; }; - mms.url = "github:mkaito/nixos-modded-minecraft-servers"; - copyparty.url = "github:9001/copyparty"; optnix.url = "github:water-sucks/optnix"; diff --git a/void.nix b/void.nix index 9350cb2..967a03a 100644 --- a/void.nix +++ b/void.nix @@ -5,13 +5,11 @@ config, pkgs, lib, - mms, ... }: { imports = [ ./hardware-configuration-void.nix ./common.nix - mms.module ]; networking.hostName = "void"; # Define your hostname. @@ -156,75 +154,6 @@ systemd.timers."postgresqlBackup".unitConfig.Persistent = true; # minecraft TerraFirmaGreg server - services.modded-minecraft-servers = let - # "Borrowed" from AllTheMods Discord - jvmOpts = builtins.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" - ]; - in { - eula = true; - instances.terrafirmagreg = { - enable = true; - rsyncSSHKeys = [""]; - serverConfig = { - server-port = 25565; - motd = "Welcome to logistic-bot's TerraFirmaGreg server (v0.10.7)"; - allow-flight = true; - allow-nether = false; - difficulty = 0; - enable-rcon = false; - level-type = "tfc\:overworld"; - view-distance = 24; - }; - - inherit jvmOpts; - jvmPackage = pkgs.jdk17; - jvmMaxAllocation = "8196M"; - jvmInitialAllocation = "2048M"; - }; - instances.terrafirmagreg-stable = { - enable = false; - rsyncSSHKeys = [""]; - serverConfig = { - server-port = 25566; - motd = "Welcome to logistic-bot's TerraFirmaGreg server (v0.7.19 stable)"; - allow-flight = true; - allow-nether = false; - difficulty = 0; - enable-rcon = false; - level-type = "tfc\:overworld"; - view-distance = 24; - }; - - jvmPackage = pkgs.jdk17; - jvmMaxAllocation = "8196M"; - jvmInitialAllocation = "2048M"; - - # "Borrowed" from AllTheMods Discord - inherit jvmOpts; - }; - }; - systemd.services."mc-terrafirmagreg" = { - requires = ["NetworkManager-wait-online.service"]; - after = ["NetworkManager-wait-online.service"]; - }; services.miniflux = { enable = true;