Update packages

6 files changed, 87 insertions, 18 deletions

diff --git a/.gitignore b/.gitignore
index 99e2bd4..fddba6b 100755
--- a/.gitignore
+++ b/.gitignore
@@ -3,3 +3,4 @@ hardware-configuration.nix
 matrix-user-tokens.txt
 nixpkgs/
 result
+wg/
\ No newline at end of file
diff --git a/flake.lock b/flake.lock
index 23f1df6..9993fab 100644
--- a/flake.lock
+++ b/flake.lock
@@ -164,11 +164,11 @@
         "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1698795315,
-        "narHash": "sha256-fF5ScAWLMHXOuqsbLSG137kS1D+gr9JPtm4H2c4yBbU=",
+        "lastModified": 1699783872,
+        "narHash": "sha256-4zTwLT2LL45Nmo6iwKB3ls3hWodVP9DiSWxki/oewWE=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9bc7d84b8213255ecd5eb6299afdb77c36ece71d",
+        "rev": "280721186ab75a76537713ec310306f0eba3e407",
         "type": "github"
       },
       "original": {
@@ -198,11 +198,11 @@
     "nhekoSrc": {
       "flake": false,
       "locked": {
-        "lastModified": 1698816044,
-        "narHash": "sha256-bfJ1SNyQZtBUxOWj+gm4mG0U4hrV+JFdbrjEc1pC8Dg=",
+        "lastModified": 1699703204,
+        "narHash": "sha256-AP3RuFM+WSeA0E+wfB7yFGJJVpXhrht2OWYvuBDYbPU=",
         "owner": "Nheko-reborn",
         "repo": "nheko",
-        "rev": "7823aceb58b5927c3674d08f475ef37fe0a43ec7",
+        "rev": "02ebee87c2fbfcd2f2a85a94829c0f7d0518a0b6",
         "type": "github"
       },
       "original": {
@@ -219,11 +219,11 @@
         "nixpkgs": "nixpkgs_3"
       },
       "locked": {
-        "lastModified": 1698222534,
-        "narHash": "sha256-iF9C7C7eT8LVVWx5IOZ/8KKJT8AIw9A5aBA6vqS18l8=",
+        "lastModified": 1699549513,
+        "narHash": "sha256-cfsghOs6Cr61wFsxkWonK8AwPwHaRGZ6QkbasUgygh4=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "a058cff4b09b3a398d8caa379b4dc96cfedd98c9",
+        "rev": "0e4c17efebff955471f169fffbb7e8cd62ada498",
         "type": "github"
       },
       "original": {
@@ -250,11 +250,11 @@
     },
     "nixpkgs-RoryNix": {
       "locked": {
-        "lastModified": 1698696950,
-        "narHash": "sha256-FHFL58t6lMumvWqwundC8fDDDLOIvc+JJBNIAlPjrDY=",
+        "lastModified": 1699596684,
+        "narHash": "sha256-XSXP8zjBZJBVvpNb2WmY0eW8O2ce+sVyj1T0/iBRIvg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "017ef2132a5bda50bd713aeabce8f918502d4ec1",
+        "rev": "da4024d0ead5d7820f6bd15147d3fe2a0c0cec73",
         "type": "github"
       },
       "original": {
@@ -266,11 +266,11 @@
     },
     "nixpkgs-rory": {
       "locked": {
-        "lastModified": 1698837096,
-        "narHash": "sha256-XrvsL5+9JngJQv0gjomdmS5qUwvEhCWp32cdn2/ZfVA=",
+        "lastModified": 1699723557,
+        "narHash": "sha256-Rif0s4cWSnioycTL4g+FRtxXoQHHaik5fd7cwM8eh54=",
         "owner": "TheArcaneBrony",
         "repo": "nixpkgs",
-        "rev": "78b673f2c7be85ac7d54b19c85fb5daf61c654d8",
+        "rev": "a0eb08339b8baaf268a689d4a7d15083ae03df08",
         "type": "github"
       },
       "original": {
@@ -314,11 +314,11 @@
     },
     "nixpkgs_4": {
       "locked": {
-        "lastModified": 1698611440,
-        "narHash": "sha256-jPjHjrerhYDy3q9+s5EAsuhyhuknNfowY6yt6pjn9pc=",
+        "lastModified": 1699099776,
+        "narHash": "sha256-X09iKJ27mGsGambGfkKzqvw5esP1L/Rf8H3u3fCqIiU=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0cbe9f69c234a7700596e943bfae7ef27a31b735",
+        "rev": "85f1ba3e51676fa8cc604a3d863d729026a6b8eb",
         "type": "github"
       },
       "original": {
diff --git a/host/Rory-desktop/configuration.nix b/host/Rory-desktop/configuration.nix
index fd63037..be7f4b2 100644
--- a/host/Rory-desktop/configuration.nix
+++ b/host/Rory-desktop/configuration.nix
@@ -173,6 +173,7 @@
 
     (schildichat-desktop.override { electron = electron; })
     (callPackage ../../modules/packages/nheko-git.nix { inherit nhekoSrc; inherit mtxclientSrc; voipSupport = false; })
+    #(callPackage ../../modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix { })
   ];
   programs.steam.enable = true;
   programs.steam.gamescopeSession.enable = true;
diff --git a/modules/packages/mc/modloaders/forge/1.19.2/43.2.11.nix b/modules/packages/mc/modloaders/forge/1.19.2/43.2.11.nix
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/modules/packages/mc/modloaders/forge/1.19.2/43.2.11.nix
diff --git a/modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix b/modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix
new file mode 100644
index 0000000..e150b7f
--- /dev/null
+++ b/modules/packages/mc/server/modpack/curseforge/techopolis-2/5.4.nix
@@ -0,0 +1,36 @@
+{ lib, stdenv, pkgs, jdk17, makeWrapper }:
+
+let 
+  url = "https://mediafilez.forgecdn.net/files/4824/587/Techopolis_2_server_pack.zip";
+  hash = "sha256-4Ig4v8c14kxzJFeHPYv/w44c0/KkayoFc3rOuxxB+9s=";
+  name = "techopolis-2";
+  version = "5.4";
+  
+in stdenv.mkDerivation {
+  name = name;
+  
+  #sources
+  src = pkgs.fetchzip {
+    url = url;
+    stripRoot = false;
+    hash = hash;
+    name = "server";
+  };
+  forgeJar = import ../../../../modloaders/forge/1.19.2/43.2.11.nix;
+
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+  buildInputs = [ jdk17 makeWrapper ];
+  installPhase = ''
+  ls -lah
+    # Create the wrapper script
+    mkdir -p $out/bin
+    mkdir -p $out/lib
+    cp -r * $out/lib
+    makeWrapper ${jdk17}/bin/java $out/bin/mc-${name}-${version}-server \
+      --set JAVA_HOME ${jdk17} \
+      --add-args "-Dlog4j2.formatMsgNoLookups=true"
+  '';
+}
diff --git a/modules/packages/mc/server/vanilla/1.19.2.nix b/modules/packages/mc/server/vanilla/1.19.2.nix
new file mode 100644
index 0000000..3ad79e8
--- /dev/null
+++ b/modules/packages/mc/server/vanilla/1.19.2.nix
@@ -0,0 +1,31 @@
+{ lib, stdenv, pkgs, jdk17, makeWrapper }:
+
+let 
+  url = "https://piston-data.mojang.com/v1/objects/f69c284232d7c7580bd89a5a4931c3581eae1378/server.jar";
+  hash = "sha256-4Ig4v8c14kxzJFeHPYv/w44c0/KkayoFc3rOuxxB+9s=";
+  name = "vanilla";
+  version = "1.19.2";
+in stdenv.mkDerivation {
+  name = name;
+  src = pkgs.fetchzip {
+    url = url;
+    stripRoot = false;
+    hash = hash;
+    name = "server";
+  };
+  phases = [
+    "unpackPhase"
+    "installPhase"
+  ];
+  buildInputs = [ jdk17 makeWrapper ];
+  installPhase = ''
+  ls -lah
+    # Create the wrapper script
+    mkdir -p $out/bin
+    mkdir -p $out/lib
+    cp -r * $out/lib
+    makeWrapper ${jdk17}/bin/java $out/bin/mc-${name}-${version}-server \
+      --set JAVA_HOME ${jdk17} \
+      --add-args "-Dlog4j2.formatMsgNoLookups=true"
+  '';
+}