diff --git a/flake.nix b/flake.nix index 592abda..97cf6b7 100644 --- a/flake.nix +++ b/flake.nix @@ -17,10 +17,7 @@ # sin inputs nix-minecraft.url = "github:Infinidoge/nix-minecraft"; testing-grounds.url = "gitlab:shobu13/testing-grounds"; - reclamation.url = "git+https://git.shobu.fr/sin_serhao/reclamation"; shoblog-front.url = "gitlab:shobu13/shoblog"; - # striped-front.url = "git+ssh://git@gitlab.com/striped1/striped-front"; - # striped-back.url = "git+ssh://git@gitlab.com/striped1/striped-back"; copyparty.url = "github:9001/copyparty"; @@ -67,22 +64,22 @@ { nixosConfigurations = { sin = nixpkgs.lib.nixosSystem { - system = "x86_64-linux"; - - modules = [ - disko.nixosModules.disko - agenix.nixosModules.default - ./hosts/sin/configuration.nix - ./hosts/sin/hardware-configuration.nix - ] - ++ [ - # modules - ./modules/gitea/sin - ]; - - specialArgs = { - inherit inputs; - }; + system = "x86_64-linux"; + + modules = [ + disko.nixosModules.disko + agenix.nixosModules.default + ./hosts/sin/configuration.nix + ./hosts/sin/hardware-configuration.nix + ] + ++ [ + # modules + ./modules/gitea/sin + ]; + + specialArgs = { + inherit inputs; + }; }; }; colmenaHive = colmena.lib.makeHive { diff --git a/hosts/sin/homepage.nix b/hosts/sin/homepage.nix index aed66a9..2414d76 100644 --- a/hosts/sin/homepage.nix +++ b/hosts/sin/homepage.nix @@ -122,7 +122,7 @@ description = "bring back your world to life"; widget = { type = "minecraft"; - url = "udp://minecraft.shobu.fr:43001"; + url = "udp://minecraft.shobu.fr:25665"; }; }; } diff --git a/hosts/thea/configuration.nix b/hosts/thea/configuration.nix index d3171d5..13719f9 100644 --- a/hosts/thea/configuration.nix +++ b/hosts/thea/configuration.nix @@ -36,7 +36,14 @@ in # dhcpcd.extraConfig = "nohook resolv.conf"; firewall = { - allowedTCPPorts = [ nodes.sin.config.services.gitea.settings.server.SSH_PORT ]; + allowedTCPPorts = [ + nodes.sin.config.services.gitea.settings.server.SSH_PORT + ] + ++ [ + # minecraft ad hoc server ports + 25665 + 25675 + ]; }; nat = { enable = true; diff --git a/hosts/thea/minecraft.nix b/hosts/thea/minecraft.nix index 71ebfdd..0e0f4cf 100644 --- a/hosts/thea/minecraft.nix +++ b/hosts/thea/minecraft.nix @@ -9,7 +9,6 @@ let url = "file:///${inputs.testing-grounds.modpack}/pack.toml"; packHash = "sha256-+taYj4uroLNxM4Nia3n+5P1Y/g6dzE6Iq13TsZgk4mU="; }; - reclamation = inputs.reclamation.packages.${pkgs.stdenv.system}; in { imports = [ inputs.nix-minecraft.nixosModules.minecraft-servers ]; @@ -20,28 +19,6 @@ in eula = true; openFirewall = true; - servers.reclamation = { - enable = false; - package = pkgs.fabricServers.fabric; - - symlinks = { - "mods" = "${reclamation.modpack}/mods"; - "FTBLang" = "${reclamation.modpack}/FTBLang"; - "defaultconfigs" = "${reclamation.modpack}/defaultconfigs"; - "ressourcepacks" = "${reclamation.modpack}/ressourcepacks"; - "config" = "${reclamation.modpack}/config"; - "kubejs" = "${reclamation.modpack}/kubejs"; - "patchouli_books" = "${reclamation.modpack}/patchouli_books"; - "server.dat" = "${reclamation.modpack}/server.dat"; - }; - - serverProperties = { - server-port = 43001; - motd = "all hail the gorgon v3.14"; - allow-flight = true; - }; - }; - servers.testing-grounds = { enable = true;