From b691294b088fe7090a8f99e6ca07f72821b7fd97 Mon Sep 17 00:00:00 2001
From: notohh <github@notohh.dev>
Date: Mon, 17 Mar 2025 05:38:01 -0400
Subject: [PATCH] sora: remove glances, enable minecraft

---
 hosts/sora/services/default.nix   |  3 +--
 hosts/sora/services/glances.nix   | 10 ----------
 hosts/sora/services/minecraft.nix |  8 +++-----
 3 files changed, 4 insertions(+), 17 deletions(-)
 delete mode 100644 hosts/sora/services/glances.nix

diff --git a/hosts/sora/services/default.nix b/hosts/sora/services/default.nix
index 2816151..81792c6 100644
--- a/hosts/sora/services/default.nix
+++ b/hosts/sora/services/default.nix
@@ -7,12 +7,11 @@
     ./attic.nix
     ./tailscale.nix
     ./croc.nix
-    ./glances.nix
 
     ### game servers
     # ./terraria.nix
     # ./factorio.nix
-    # ./minecraft.nix
+    ./minecraft.nix
     # ./foundryvtt.nix
   ];
 }
diff --git a/hosts/sora/services/glances.nix b/hosts/sora/services/glances.nix
deleted file mode 100644
index 7380c64..0000000
--- a/hosts/sora/services/glances.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-_: {
-  virtualisation.oci-containers.containers.glances = {
-    image = "nicolargo/glances@sha256:b6908ea9d3dcb99d82114bc5fb6fc3b4ae515025427f96cc9125609c11f46651"; #v3.4.0.5
-    ports = ["61208-61209:61208-61209"];
-    volumes = ["/var/run/docker.sock:/var/run/docker.sock"];
-    environment = {
-      GLANCES_OPT = "-w";
-    };
-  };
-}
diff --git a/hosts/sora/services/minecraft.nix b/hosts/sora/services/minecraft.nix
index 565b54f..e42f301 100644
--- a/hosts/sora/services/minecraft.nix
+++ b/hosts/sora/services/minecraft.nix
@@ -6,11 +6,9 @@ _: {
     ports = ["25565:25565" "24454:24454/udp"];
     environment = {
       EULA = "TRUE";
-      VERSION = "1.20.1";
-      MEMORY = "6G";
-      TYPE = "FABRIC";
-      # FABRIC_LOADER_VERSION = "0.15.11";
-      # FABRIC_LAUNCHER_VERSION = "0.11.2";
+      VERSION = "1.21.1";
+      MEMORY = "12G";
+      TYPE = "NEOFORGE";
     };
     volumes = ["/home/notoh/docker/modded-mc:/data:rw"];
   };