From b928bae6a6ef6738f16c8b03dcc257081d8e2b2f Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Sat, 19 Jul 2025 14:22:33 +0530
Subject: [PATCH] feat: stuff

---
 home/apps/default.nix              |  1 +
 home/apps/jellyflix.nix            |  9 +++++
 nixos/ryu/services/minecraft.nix   | 56 ++++++++++++++++++++++++++++++
 nixos/tsuba/services/default.nix   |  1 -
 nixos/tsuba/services/minecraft.nix | 47 -------------------------
 5 files changed, 66 insertions(+), 48 deletions(-)
 create mode 100644 home/apps/jellyflix.nix
 create mode 100644 nixos/ryu/services/minecraft.nix
 delete mode 100644 nixos/tsuba/services/minecraft.nix

diff --git a/home/apps/default.nix b/home/apps/default.nix
index 95aca1ec..e03595e9 100644
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -35,5 +35,6 @@ lib.optionalAttrs device.hasGui {
     ./nextcloud.nix
     ./blueman.nix
     ./zen.nix
+    ./jellyflix.nix
   ];
 }
diff --git a/home/apps/jellyflix.nix b/home/apps/jellyflix.nix
new file mode 100644
index 00000000..f34ad378
--- /dev/null
+++ b/home/apps/jellyflix.nix
@@ -0,0 +1,9 @@
+{
+  pkgs,
+  lib,
+  ...
+}: {
+  home.packages = lib.optionals pkgs.stdenv.isLinux [
+    pkgs.jellyflix
+  ];
+}
diff --git a/nixos/ryu/services/minecraft.nix b/nixos/ryu/services/minecraft.nix
new file mode 100644
index 00000000..25c2c6f7
--- /dev/null
+++ b/nixos/ryu/services/minecraft.nix
@@ -0,0 +1,56 @@
+{
+  pkgs,
+  inputs,
+  ...
+}: {
+  # imports = [inputs.nix-minecraft.nixosModules.minecraft-servers];
+  services = let
+    whitelist = {
+      "AbhinavSE" = "8b6c052e-69b3-4bee-b9dc-12eb94653c9e";
+      "Serveus" = "79882fb6-d594-4073-a3d0-70a01d0abb67";
+      "__Shun__" = "1c7a300f-98e4-402c-8741-432f3494bb25";
+      "shashikant" = "20891e82-203c-4d04-9868-79a5879ecfc3";
+    };
+  in {
+    minecraft-server = {
+      inherit whitelist;
+      enable = true;
+      openFirewall = true;
+      eula = true;
+      declarative = true;
+      serverProperties = {
+        motd = "Servius's Minecraft Server";
+        level-seed = "4504535438041489910";
+        view-distance = 24;
+        white-list = true;
+      };
+      package = let
+        getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
+      in
+        pkgs.minecraft-server.override {
+          url = "https://piston-data.mojang.com/v1/objects/6e64dcabba3c01a7271b4fa6bd898483b794c59b/server.jar";
+          sha1 = "sha1-bmTcq7o8AacnG0+mvYmEg7eUxZs=";
+          version = "1.21.6";
+          jre_headless = getJavaVersion 21;
+        };
+    };
+    # minecraft-servers = {
+    #   enable = true;
+    #   eula = true;
+    #   openFirewall = true;
+    #   servers.fabric = {
+    #     inherit whitelist;
+    #     enable = true;
+    #     jvmOpts = "-Xmx4G -Xms4G";
+    #     package = pkgs.fabricServers.fabric-1_21_7;
+    #     serverProperties = {
+    #       motd = "Servius's Fabric Minecraft Server";
+    #       server-port = 25567;
+    #       level-seed = "4504535438041489910";
+    #       view-distance = 24;
+    #       white-list = true;
+    #     };
+    #   };
+    # };
+  };
+}
diff --git a/nixos/tsuba/services/default.nix b/nixos/tsuba/services/default.nix
index 6ae24e1a..ae8af9ce 100644
--- a/nixos/tsuba/services/default.nix
+++ b/nixos/tsuba/services/default.nix
@@ -10,6 +10,5 @@
     # ./dnscrypt.nix
     ./resolved.nix
     ./flaresolverr.nix
-    ./minecraft.nix
   ];
 }
diff --git a/nixos/tsuba/services/minecraft.nix b/nixos/tsuba/services/minecraft.nix
deleted file mode 100644
index a6528f1a..00000000
--- a/nixos/tsuba/services/minecraft.nix
+++ /dev/null
@@ -1,47 +0,0 @@
-{
-  pkgs,
-  inputs,
-  ...
-}: {
-  # imports = [inputs.nix-minecraft.nixosModules.minecraft-servers];
-  services = let
-    whitelist = {
-      "AbhinavSE" = "8b6c052e-69b3-4bee-b9dc-12eb94653c9e";
-      "Serveus" = "79882fb6-d594-4073-a3d0-70a01d0abb67";
-      "__Shun__" = "1c7a300f-98e4-402c-8741-432f3494bb25";
-      "shashikant" = "20891e82-203c-4d04-9868-79a5879ecfc3";
-    };
-  in {
-    # minecraft-server = {
-    #   inherit whitelist;
-    #   enable = true;
-    #   openFirewall = true;
-    #   eula = true;
-    #   declarative = true;
-    #   serverProperties = {
-    #     motd = "Servius's Minecraft Server";
-    #     level-seed = "4504535438041489910";
-    #     view-distance = 24;
-    #     white-list = true;
-    #   };
-    # };
-    minecraft-servers = {
-      enable = true;
-      eula = true;
-      openFirewall = true;
-      servers.fabric = {
-        inherit whitelist;
-        enable = true;
-        jvmOpts = "-Xmx4G -Xms4G";
-        package = pkgs.fabricServers.fabric-1_21_8;
-        serverProperties = {
-          motd = "Servius's Fabric Minecraft Server";
-          server-port = 25567;
-          level-seed = "4504535438041489910";
-          view-distance = 24;
-          white-list = true;
-        };
-      };
-    };
-  };
-}