From 98f1c4e4132f056c5f14eb83604c59ac783abede Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <eu@misterio.me>
Date: Mon, 22 Aug 2022 11:30:36 -0300
Subject: [PATCH] maia: move minecraft-modpack to maia

---
 flake.nix                                     |  2 +-
 hosts/atlas/services/minecraft.nix            |  4 ----
 hosts/common/users/misterio.nix               |  2 --
 hosts/electra/services/default.nix            |  1 -
 hosts/maia/default.nix                        | 22 +++++++++++++++++++
 hosts/maia/services/default.nix               |  3 +++
 .../services/minecraft-modpack.nix            |  2 +-
 7 files changed, 27 insertions(+), 9 deletions(-)
 delete mode 100644 hosts/atlas/services/minecraft.nix
 create mode 100644 hosts/maia/services/default.nix
 rename hosts/{electra => maia}/services/minecraft-modpack.nix (98%)

diff --git a/flake.nix b/flake.nix
index 0afba827..64adc89c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -143,7 +143,7 @@
             "games"
           ];
           wallpaper = "aurora-borealis-water-mountain";
-          colorscheme = "nebula";
+          colorscheme = "spaceduck";
         };
         # Laptop
         "misterio@pleione" = mkHome {
diff --git a/hosts/atlas/services/minecraft.nix b/hosts/atlas/services/minecraft.nix
deleted file mode 100644
index a82009eb..00000000
--- a/hosts/atlas/services/minecraft.nix
+++ /dev/null
@@ -1,4 +0,0 @@
-{
-  networking.firewall.allowedUDPPorts = [ 25565 24454 ];
-  networking.firewall.allowedTCPPorts = [ 25565 ];
-}
diff --git a/hosts/common/users/misterio.nix b/hosts/common/users/misterio.nix
index 7d3c728b..a16d7ac7 100644
--- a/hosts/common/users/misterio.nix
+++ b/hosts/common/users/misterio.nix
@@ -15,8 +15,6 @@ in
     ++ (lib.optional config.networking.wireless.userControlled.enable config.networking.wireless.userControlled.group)
     ++ (lib.optional config.programs.wireshark.enable "wireshark")
     ++ (lib.optional config.hardware.i2c.enable "i2c")
-    ++ (lib.optional config.services.minecraft-server.enable "minecraft")
-    ++ (lib.optional (config.systemd.services.minecraft-modpack or { enable = false; }).enable "minecraft-modpack")
     ++ (lib.optional config.services.mysql.enable "mysql")
     ++ (lib.optional config.virtualisation.docker.enable "docker")
     ++ (lib.optional config.virtualisation.podman.enable "podman")
diff --git a/hosts/electra/services/default.nix b/hosts/electra/services/default.nix
index 680fc6d0..abf6a7ea 100644
--- a/hosts/electra/services/default.nix
+++ b/hosts/electra/services/default.nix
@@ -6,6 +6,5 @@
     ./mail.nix
     ./nginx.nix
     ./website.nix
-    ./minecraft-modpack.nix
   ];
 }
diff --git a/hosts/maia/default.nix b/hosts/maia/default.nix
index 303b21db..29153d82 100644
--- a/hosts/maia/default.nix
+++ b/hosts/maia/default.nix
@@ -10,6 +10,7 @@
     ../common/users/misterio.nix
     ../common/users/layla.nix
 
+    ./services
     ../common/optional/quietboot.nix
     ../common/optional/tailscale.nix
   ];
@@ -18,6 +19,27 @@
     kernelPackages = pkgs.linuxKernel.packages.linux_zen;
   };
 
+  networking = {
+    useDHCP = false;
+    interfaces.enp2s0 = {
+      useDHCP = true;
+      wakeOnLan.enable = true;
+
+      ipv4 = {
+        addresses = [{
+          address = "192.168.0.13";
+          prefixLength = 24;
+        }];
+      };
+      ipv6 = {
+        addresses = [{
+          address = "2804:14d:8084:a484::3";
+          prefixLength = 64;
+        }];
+      };
+    };
+  };
+
   hardware.nvidia.prime.offload.enable = false;
   system.stateVersion = "22.05";
   # TODO: Add graphical stuff
diff --git a/hosts/maia/services/default.nix b/hosts/maia/services/default.nix
new file mode 100644
index 00000000..b27a73bf
--- /dev/null
+++ b/hosts/maia/services/default.nix
@@ -0,0 +1,3 @@
+{
+  imports = [ ./minecraft-modpack.nix ];
+}
diff --git a/hosts/electra/services/minecraft-modpack.nix b/hosts/maia/services/minecraft-modpack.nix
similarity index 98%
rename from hosts/electra/services/minecraft-modpack.nix
rename to hosts/maia/services/minecraft-modpack.nix
index c20bf830..227861f2 100644
--- a/hosts/electra/services/minecraft-modpack.nix
+++ b/hosts/maia/services/minecraft-modpack.nix
@@ -48,7 +48,7 @@ in
   # Open ports
   networking.firewall = {
     # Minecraft
-    allowedTCPPorts = [ 25565 ];
+    allowedTCPPorts = [ 25565 24454 ];
     # Query and Voice chat
     allowedUDPPorts = [ 25565 24454 ];
   };