From 974439fb8491c94c4373a4e67753291669052ff2 Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Sun, 20 Jul 2025 15:54:48 +0530
Subject: [PATCH] feat: Added stuff

---
 home/apps/default.nix            | 16 +++++-----
 home/linux/ironbar/default.nix   |  4 +--
 nixos/ryu/services/default.nix   |  4 +--
 nixos/ryu/services/minecraft.nix | 53 +++++++++-----------------------
 4 files changed, 27 insertions(+), 50 deletions(-)

diff --git a/home/apps/default.nix b/home/apps/default.nix
index e03595e9..825eea42 100644
--- a/home/apps/default.nix
+++ b/home/apps/default.nix
@@ -6,35 +6,35 @@
 lib.optionalAttrs device.hasGui {
   imports = [
     ./audacity.nix
+    ./blueman.nix
     ./bottles.nix
     ./chromium.nix
     ./cursor.nix
+    ./discord.nix
     ./firefox.nix
     ./ghostty.nix
     # ./gimp.nix
     ./guitarix.nix
     ./hyprpicker.nix
+    ./jellyflix.nix
     ./kicad.nix
     ./kitty.nix
     ./mpv.nix
     ./neovide.nix
+    ./nextcloud.nix
     ./obs-studio.nix
     ./openscad.nix
     ./orcaslicer.nix
+    ./pcsx2.nix
+    # ./rpcs3.nix
+    # ./shadps4.nix
+    ./slack.nix
     ./thunderbird.nix
     ./vlc.nix
     ./vscode.nix
     ./wezterm.nix
     ./zathura.nix
     ./zed.nix
-    ./discord.nix
-    ./slack.nix
-    # ./rpcs3.nix
-    ./pcsx2.nix
-    # ./shadps4.nix
-    ./nextcloud.nix
-    ./blueman.nix
     ./zen.nix
-    ./jellyflix.nix
   ];
 }
diff --git a/home/linux/ironbar/default.nix b/home/linux/ironbar/default.nix
index c4604a86..2dd6e1db 100644
--- a/home/linux/ironbar/default.nix
+++ b/home/linux/ironbar/default.nix
@@ -64,8 +64,8 @@
               "3" = "icon:firefox";
               "4" = "icon:slack";
               "5" = "icon:steam";
-              "6" = "icon:misc";
-              "7" = "icon:misc";
+              "6" = "icon:foot";
+              "7" = "icon:foot";
               "8" = "icon:firefox";
               "9" = "icon:discord";
               "10" = "icon:spotify";
diff --git a/nixos/ryu/services/default.nix b/nixos/ryu/services/default.nix
index 5abeaf36..a2163ed5 100644
--- a/nixos/ryu/services/default.nix
+++ b/nixos/ryu/services/default.nix
@@ -4,14 +4,14 @@
     # ./rsyncd.nix
     # ./sunshine.nix
     # ./zerotier.nix
+    # ./dnscrypt.nix
     ./tailscale.nix
     ./samba.nix
     ./mullvad.nix
     ./openrgb.nix
     ./command-runner.nix
     ./resolved.nix
-    ./weylus.nix
-    # ./dnscrypt.nix
+    ./minecraft.nix
   ];
   services = {
     # hardware.openrgb.enable = true;
diff --git a/nixos/ryu/services/minecraft.nix b/nixos/ryu/services/minecraft.nix
index 25c2c6f7..ff395345 100644
--- a/nixos/ryu/services/minecraft.nix
+++ b/nixos/ryu/services/minecraft.nix
@@ -3,7 +3,6 @@
   inputs,
   ...
 }: {
-  # imports = [inputs.nix-minecraft.nixosModules.minecraft-servers];
   services = let
     whitelist = {
       "AbhinavSE" = "8b6c052e-69b3-4bee-b9dc-12eb94653c9e";
@@ -12,45 +11,23 @@
       "shashikant" = "20891e82-203c-4d04-9868-79a5879ecfc3";
     };
   in {
-    minecraft-server = {
-      inherit whitelist;
-      enable = true;
-      openFirewall = true;
+    minecraft-servers = {
+      enable = false;
       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;
+      openFirewall = true;
+      servers.fabric = {
+        inherit whitelist;
+        enable = true;
+        jvmOpts = "-Xmx4G -Xms4G";
+        package = pkgs.fabricServers.fabric-1_21_1;
+        serverProperties = {
+          motd = "Servius's Fabric Minecraft Server";
+          server-port = 25567;
+          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_7;
-    #     serverProperties = {
-    #       motd = "Servius's Fabric Minecraft Server";
-    #       server-port = 25567;
-    #       level-seed = "4504535438041489910";
-    #       view-distance = 24;
-    #       white-list = true;
-    #     };
-    #   };
-    # };
   };
 }