OOKNET                             [ /  search the index  ]  
──────────────────────────────────────────────────────────────────────────────────────
[ KB ]    [ GIT ]    [ PROJECTS ]    [ ABOUT ]                                      EN
══════════════════════════════════════════════════════════════════════════════════════
OOKNET   [ /  search  ]  
────────────────────────────────────────────────
[ KB ] [ GIT ] [ PROJECTS ] [ ABOUT ]
════════════════════════════════════════════════
 
HASH      add8027ad66e
DATE      2025-02-25
SUBJECT   minecraft: move to dedicated minecraft flake: ookscraft
FILES     5 CHANGED
HASH      add8027ad66e
DATE      2025-02-25
SUBJECT   minecraft: move to dedicated minecraft
          flake: ookscraft
FILES     5 CHANGED
 

diff --git a/flake.lock b/flake.lock
index 5de64bf..8cdef08 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,7 +8,7 @@
           "secrets",
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1736955230,
@@ -27,7 +27,7 @@
     "agenix-rekey": {
       "inputs": {
         "devshell": "devshell",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "secrets",
           "nixpkgs"
@@ -184,11 +184,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQQeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c928ceb64ddbde9",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -232,6 +232,24 @@
       }
     },
     "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1CgRh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "32ea77a06711b758da0ad9bd6a844c5740a87abd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "secrets",
@@ -290,7 +308,25 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -1032,19 +1068,15 @@
     "nix-minecraft": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1738806350,
-        "narHash": "sha256-NaCd65SqWMROgbJzio9HW5WGNb5sOBfyuGVtccU4YmM=",
+        "lastModified": 1740188624,
+        "narHash": "sha256-z5G/JoTGICMdhxkN+sztsrcCD7vRFHIJiw/fchHX580=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "e35b9bfe00b0602f57de8f19745c3d91cb45efec",
+        "rev": "8c0d05c3ce359b0d08226298ff7e4200486cbed3",
         "type": "github"
       },
       "original": {
@@ -1081,6 +1113,18 @@
         "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9e
ccd0ab75d5b2da11.tar.gz"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1738452942,
+        "narHash": "sha256-vJzFZGaCpnmo7I6i416HaBLpC+hvcURh/BQwROcGIp8=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9e
ccd0ab75d5b2da11.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/nixpkgs/archive/072a6db25e947df2f31aab9e
ccd0ab75d5b2da11.tar.gz"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1738680400,
@@ -1097,6 +1141,38 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avfcwHkKGMsmipUk1Uc0TbrEZpkn64=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "73cf49b8ad837ade2de76f87eb53fc85ed5d4680",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nmd": {
       "flake": false,
       "locked": {
@@ -1311,6 +1387,27 @@
         "type": "github"
       }
     },
+    "ookscraft": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nix-minecraft": "nix-minecraft",
+        "nixpkgs": "nixpkgs_4",
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1740393420,
+        "narHash": "sha256-Bt/UKwUmr7vBlX88DQxXtd84r/Jv3k5ENAm2DZ+ak98=",
+        "ref": "refs/heads/master",
+        "rev": "831636ddac7b58e1c3b6ca19b4c8060adcaec227",
+        "revCount": 26,
+        "type": "git",
+        "url": "file:/home/ooks/Summit/gaming/minecraft/ookscraft"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:/home/ooks/Summit/gaming/minecraft/ookscraft"
+      }
+    },
     "plugin-aerial-nvim": {
       "flake": false,
       "locked": {
@@ -4029,11 +4126,11 @@
         "hyprlock": "hyprlock",
         "hyprpaper": "hyprpaper",
         "nix-index-db": "nix-index-db",
-        "nix-minecraft": "nix-minecraft",
         "nixpkgs": "nixpkgs_2",
         "nvf": "nvf",
+        "ookscraft": "ookscraft",
         "secrets": "secrets",
-        "systems": "systems_2",
+        "systems": "systems_4",
         "zjstatus": "zjstatus"
       }
     },
@@ -4153,6 +4250,36 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdoB6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad31a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -4219,7 +4346,7 @@
     "zjstatus": {
       "inputs": {
         "crane": "crane",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ],


diff --git a/flake.lock b/flake.lock
index 5de64bf..8cdef08 100644
--- a/flake.lock
+++ b/flake.lock
@@ -8,7 +8,7 @@
           "secrets",
           "nixpkgs"
         ],
-        "systems": "systems"
+        "systems": "systems_3"
       },
       "locked": {
         "lastModified": 1736955230,
@@ -27,7 +27,7 @@
     "agenix-rekey": {
       "inputs": {
         "devshell": "devshell",
-        "flake-parts": "flake-parts_2",
+        "flake-parts": "flake-parts_3",
         "nixpkgs": [
           "secrets",
           "nixpkgs"
@@ -184,11 +184,11 @@
     "flake-compat_2": {
       "flake": false,
       "locked": {
-        "lastModified": 1673956053,
-        "narHash": "sha256-4gtG9iQuiKITOjNQ
QeQIpoIB6b16fm+504Ch3sNKLd8=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/
+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "35bb57c0c8d8b62bbfd284272c9
28ceb64ddbde9",
+        "rev": "ff81ac966bb2cae68946d5ed5fc
4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -232,6 +232,24 @@
       }
     },
     "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": "nixpkgs-lib_2"
+      },
+      "locked": {
+        "lastModified": 1738453229,
+        "narHash": "sha256-7H9XgNiGLKN1G1Cg
Rh0vUL4AheZSYzPm+zmZ7vxbJdo=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "32ea77a06711b758da0ad9bd6a8
44c5740a87abd",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
+    "flake-parts_3": {
       "inputs": {
         "nixpkgs-lib": [
           "secrets",
@@ -290,7 +308,25 @@
     },
     "flake-utils_3": {
       "inputs": {
-        "systems": "systems_3"
+        "systems": "systems"
+      },
+      "locked": {
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/Jp
G+r7fRrqm12kzFHyUHqHCVpMMbI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "11707dc2f618dd54ca8739b309e
c4fc024de578b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_4": {
+      "inputs": {
+        "systems": "systems_5"
       },
       "locked": {
         "lastModified": 1731533236,
@@ -1032,19 +1068,15 @@
     "nix-minecraft": {
       "inputs": {
         "flake-compat": "flake-compat_2",
-        "flake-utils": [
-          "flake-utils"
-        ],
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "flake-utils": "flake-utils_3",
+        "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1738806350,
-        "narHash": "sha256-NaCd65SqWMROgbJz
io9HW5WGNb5sOBfyuGVtccU4YmM=",
+        "lastModified": 1740188624,
+        "narHash": "sha256-z5G/JoTGICMdhxkN
+sztsrcCD7vRFHIJiw/fchHX580=",
         "owner": "Infinidoge",
         "repo": "nix-minecraft",
-        "rev": "e35b9bfe00b0602f57de8f19745
c3d91cb45efec",
+        "rev": "8c0d05c3ce359b0d08226298ff7
e4200486cbed3",
         "type": "github"
       },
       "original": {
@@ -1081,6 +1113,18 @@
         "url": "https://github.com/NixOS/ni
xpkgs/archive/072a6db25e947df2f31aab9eccd0ab
75d5b2da11.tar.gz"
       }
     },
+    "nixpkgs-lib_2": {
+      "locked": {
+        "lastModified": 1738452942,
+        "narHash": "sha256-vJzFZGaCpnmo7I6i
416HaBLpC+hvcURh/BQwROcGIp8=",
+        "type": "tarball",
+        "url": "https://github.com/NixOS/ni
xpkgs/archive/072a6db25e947df2f31aab9eccd0ab
75d5b2da11.tar.gz"
+      },
+      "original": {
+        "type": "tarball",
+        "url": "https://github.com/NixOS/ni
xpkgs/archive/072a6db25e947df2f31aab9eccd0ab
75d5b2da11.tar.gz"
+      }
+    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1738680400,
@@ -1097,6 +1141,38 @@
         "type": "github"
       }
     },
+    "nixpkgs_3": {
+      "locked": {
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avf
cwHkKGMsmipUk1Uc0TbrEZpkn64=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "73cf49b8ad837ade2de76f87eb5
3fc85ed5d4680",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_4": {
+      "locked": {
+        "lastModified": 1739866667,
+        "narHash": "sha256-EO1ygNKZlsAC9avf
cwHkKGMsmipUk1Uc0TbrEZpkn64=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "73cf49b8ad837ade2de76f87eb5
3fc85ed5d4680",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nmd": {
       "flake": false,
       "locked": {
@@ -1311,6 +1387,27 @@
         "type": "github"
       }
     },
+    "ookscraft": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nix-minecraft": "nix-minecraft",
+        "nixpkgs": "nixpkgs_4",
+        "systems": "systems_2"
+      },
+      "locked": {
+        "lastModified": 1740393420,
+        "narHash": "sha256-Bt/UKwUmr7vBlX88
DQxXtd84r/Jv3k5ENAm2DZ+ak98=",
+        "ref": "refs/heads/master",
+        "rev": "831636ddac7b58e1c3b6ca19b4c
8060adcaec227",
+        "revCount": 26,
+        "type": "git",
+        "url": "file:/home/ooks/Summit/gami
ng/minecraft/ookscraft"
+      },
+      "original": {
+        "type": "git",
+        "url": "file:/home/ooks/Summit/gami
ng/minecraft/ookscraft"
+      }
+    },
     "plugin-aerial-nvim": {
       "flake": false,
       "locked": {
@@ -4029,11 +4126,11 @@
         "hyprlock": "hyprlock",
         "hyprpaper": "hyprpaper",
         "nix-index-db": "nix-index-db",
-        "nix-minecraft": "nix-minecraft",
         "nixpkgs": "nixpkgs_2",
         "nvf": "nvf",
+        "ookscraft": "ookscraft",
         "secrets": "secrets",
-        "systems": "systems_2",
+        "systems": "systems_4",
         "zjstatus": "zjstatus"
       }
     },
@@ -4153,6 +4250,36 @@
         "type": "github"
       }
     },
+    "systems_4": {
+      "locked": {
+        "lastModified": 1689347949,
+        "narHash": "sha256-12tWmuL2zgBgZkdo
B6qXZsgJEH9LR3oUgpaQq2RbI80=",
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "rev": "31732fcf5e8fea42e59c2488ad3
1a0e651500f68",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default-linux",
+        "type": "github"
+      }
+    },
+    "systems_5": {
+      "locked": {
+        "lastModified": 1681028828,
+        "narHash": "sha256-Vy1rq5AaRuLzOxct
8nz4T6wlgyUR7zLU309k9mBC768=",
+        "owner": "nix-systems",
+        "repo": "default",
+        "rev": "da67096a3b9bf56a91d16901293
e51ba5b49a27e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-systems",
+        "repo": "default",
+        "type": "github"
+      }
+    },
     "treefmt-nix": {
       "inputs": {
         "nixpkgs": [
@@ -4219,7 +4346,7 @@
     "zjstatus": {
       "inputs": {
         "crane": "crane",
-        "flake-utils": "flake-utils_3",
+        "flake-utils": "flake-utils_4",
         "nixpkgs": [
           "nixpkgs"
         ],

 

diff --git a/flake.nix b/flake.nix
index 3a39dca..1c987c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,10 @@
       };
     };
 
+    ookscraft = {
+      url = "git+file:/home/ooks/Summit/gaming/minecraft/ookscraft";
+    };
+
     nvf = {
       url = "github:notashelf/nvf";
       inputs = {
@@ -106,13 +110,5 @@
         systems.follows = "hyprland/systems";
       };
     };
-    nix-minecraft = {
-      url = "github:Infinidoge/nix-minecraft";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-
-        flake-utils.follows = "flake-utils";
-      };
-    };
   };
 }


diff --git a/flake.nix b/flake.nix
index 3a39dca..1c987c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -50,6 +50,10 @@
       };
     };
 
+    ookscraft = {
+      url = "git+file:/home/ooks/Summit/gam
ing/minecraft/ookscraft";
+    };
+
     nvf = {
       url = "github:notashelf/nvf";
       inputs = {
@@ -106,13 +110,5 @@
         systems.follows = "hyprland/systems
";
       };
     };
-    nix-minecraft = {
-      url = "github:Infinidoge/nix-minecraf
t";
-      inputs = {
-        nixpkgs.follows = "nixpkgs";
-
-        flake-utils.follows = "flake-utils"
;
-      };
-    };
   };
 }

 

diff --git a/modules/home/workstation/gaming/minecraft.nix b/modules/home/workstat
ion/gaming/minecraft.nix
index 505023c..0c24e61 100644
--- a/modules/home/workstation/gaming/minecraft.nix
+++ b/modules/home/workstation/gaming/minecraft.nix
@@ -9,11 +9,8 @@
   inherit (osConfig.ooknet.workstation) profiles;
 in {
   config = mkIf (elem "gaming" profiles) {
-    home.packages = attrValues {
-      inherit
-        (pkgs)
-        prismlauncher
-        ;
-    };
+    home.packages = [
+      pkgs.prismlauncher
+    ];
   };
 }


diff --git a/modules/home/workstation/gaming
/minecraft.nix b/modules/home/workstation/ga
ming/minecraft.nix
index 505023c..0c24e61 100644
--- a/modules/home/workstation/gaming/minecr
aft.nix
+++ b/modules/home/workstation/gaming/minecr
aft.nix
@@ -9,11 +9,8 @@
   inherit (osConfig.ooknet.workstation) pro
files;
 in {
   config = mkIf (elem "gaming" profiles) {
-    home.packages = attrValues {
-      inherit
-        (pkgs)
-        prismlauncher
-        ;
-    };
+    home.packages = [
+      pkgs.prismlauncher
+    ];
   };
 }

 

diff --git a/modules/nixos/server/services/minecraft/default.nix b/modules/nixos/s
erver/services/minecraft/default.nix
index 2a5833a..943450d 100644
--- a/modules/nixos/server/services/minecraft/default.nix
+++ b/modules/nixos/server/services/minecraft/default.nix
@@ -8,32 +8,10 @@
   inherit (config.ooknet.server) services;
 in {
   imports = [
-    inputs.nix-minecraft.nixosModules.minecraft-servers
+    inputs.ookscraft.nixosModules.ookscraft-server
     ./reverse-proxy.nix
   ];
   config = mkIf (elem "minecraft" services) {
-    services.minecraft-servers = {
-      enable = true;
-      eula = true;
-      servers.ookscraft = {
-        enable = true;
-        openFirewall = true;
-        autoStart = true;
-
-        serverProperties = {
-          openFirewall = true;
-          motd = "ook ook";
-          server-port = 25565;
-          difficulty = "hard";
-          gamemode = "survival";
-          online-mode = true;
-          enable-rcon = true;
-          "rcon.password" = "ooksmoneymoves";
-          view-distance = 8;
-          simulation-distance = 8;
-          allow-flight = true;
-        };
-      };
-    };
+    services.ookscraft-server.enable = true;
   };
 }


diff --git a/modules/nixos/server/services/m
inecraft/default.nix b/modules/nixos/server/
services/minecraft/default.nix
index 2a5833a..943450d 100644
--- a/modules/nixos/server/services/minecraf
t/default.nix
+++ b/modules/nixos/server/services/minecraf
t/default.nix
@@ -8,32 +8,10 @@
   inherit (config.ooknet.server) services;
 in {
   imports = [
-    inputs.nix-minecraft.nixosModules.minec
raft-servers
+    inputs.ookscraft.nixosModules.ookscraft
-server
     ./reverse-proxy.nix
   ];
   config = mkIf (elem "minecraft" services)
 {
-    services.minecraft-servers = {
-      enable = true;
-      eula = true;
-      servers.ookscraft = {
-        enable = true;
-        openFirewall = true;
-        autoStart = true;
-
-        serverProperties = {
-          openFirewall = true;
-          motd = "ook ook";
-          server-port = 25565;
-          difficulty = "hard";
-          gamemode = "survival";
-          online-mode = true;
-          enable-rcon = true;
-          "rcon.password" = "ooksmoneymoves
";
-          view-distance = 8;
-          simulation-distance = 8;
-          allow-flight = true;
-        };
-      };
-    };
+    services.ookscraft-server.enable = true
;
   };
 }

 

diff --git a/modules/nixos/server/services/minecraft/reverse-proxy.nix b/modules/n
ixos/server/services/minecraft/reverse-proxy.nix
index 06e59f9..98670ce 100644
--- a/modules/nixos/server/services/minecraft/reverse-proxy.nix
+++ b/modules/nixos/server/services/minecraft/reverse-proxy.nix
@@ -1,40 +1,20 @@
 {
   lib,
   config,
+  inputs,
   ...
 }: let
   inherit (lib) mkIf elem;
   inherit (config.ooknet.server) services;
 in {
+  imports = [inputs.ookscraft.nixosModules.ookscraft-proxy];
   config = mkIf (elem "minecraft-proxy" services) {
-    services.haproxy = {
-      enable = true;
-      config = ''
-        global
-          maxconn 32768
-          log stdout format raw local0 info
-
-        defaults
-          mode tcp
-          log global
-          option tcplog
-          option dontlognull
-          timeout connect 5s
-          timeout client 30s
-          timeout server 30s
-
-        frontend minecraft_frontend
-          bind :25565
-          default_backend minecraft_backend
-
-        backend minecraft_backend
-          server minecraft ooksmedia.taila3ca6.ts.net:25565 check
-      '';
-    };
-
-    networking.firewall = {
-      allowedTCPPorts = [25565];
-      allowedUDPPorts = [25565];
+    services.ookscraft-proxy = {
+      minecraft = {
+        enable = true;
+        port = 25565;
+        endpoint = "ooksmedia.taila3ca6.ts.net";
+      };
     };
   };
 }


diff --git a/modules/nixos/server/services/m
inecraft/reverse-proxy.nix b/modules/nixos/s
erver/services/minecraft/reverse-proxy.nix
index 06e59f9..98670ce 100644
--- a/modules/nixos/server/services/minecraf
t/reverse-proxy.nix
+++ b/modules/nixos/server/services/minecraf
t/reverse-proxy.nix
@@ -1,40 +1,20 @@
 {
   lib,
   config,
+  inputs,
   ...
 }: let
   inherit (lib) mkIf elem;
   inherit (config.ooknet.server) services;
 in {
+  imports = [inputs.ookscraft.nixosModules.
ookscraft-proxy];
   config = mkIf (elem "minecraft-proxy" ser
vices) {
-    services.haproxy = {
-      enable = true;
-      config = ''
-        global
-          maxconn 32768
-          log stdout format raw local0 info
-
-        defaults
-          mode tcp
-          log global
-          option tcplog
-          option dontlognull
-          timeout connect 5s
-          timeout client 30s
-          timeout server 30s
-
-        frontend minecraft_frontend
-          bind :25565
-          default_backend minecraft_backend
-
-        backend minecraft_backend
-          server minecraft ooksmedia.taila3
ca6.ts.net:25565 check
-      '';
-    };
-
-    networking.firewall = {
-      allowedTCPPorts = [25565];
-      allowedUDPPorts = [25565];
+    services.ookscraft-proxy = {
+      minecraft = {
+        enable = true;
+        port = 25565;
+        endpoint = "ooksmedia.taila3ca6.ts.
net";
+      };
     };
   };
 }

 
[ BACK TO LOG ]
──────────────────────────────────────────────────────────────────────────────────────
OOKNET
────────────────────────────────────────────────
OOKNET