feat: Added stuff

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
   ];
 }

home/linux/ironbar/default.nix

@@ -64,8 +64,8 @@
               "3" = "icon:firefox";
               "4" = "icon:slack";
               "5" = "icon:steam";
-              "6" = "icon:misc";
+              "6" = "icon:foot";
-              "7" = "icon:misc";
+              "7" = "icon:foot";
               "8" = "icon:firefox";
               "9" = "icon:discord";
               "10" = "icon:spotify";

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
+    ./minecraft.nix
-    # ./dnscrypt.nix
   ];
   services = {
     # hardware.openrgb.enable = true;

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 = {
+    minecraft-servers = {
-      inherit whitelist;
+      enable = false;
-      enable = true;
-      openFirewall = true;
       eula = true;
-      declarative = true;
+      openFirewall = true;
-      serverProperties = {
+      servers.fabric = {
-        motd = "Servius's Minecraft Server";
+        inherit whitelist;
-        level-seed = "4504535438041489910";
+        enable = true;
-        view-distance = 24;
+        jvmOpts = "-Xmx4G -Xms4G";
-        white-list = true;
+        package = pkgs.fabricServers.fabric-1_21_1;
-      };
+        serverProperties = {
-      package = let
+          motd = "Servius's Fabric Minecraft Server";
-        getJavaVersion = v: (builtins.getAttr "openjdk${toString v}" pkgs.javaPackages.compiler).headless;
+          server-port = 25567;
-      in
+          level-seed = "4504535438041489910";
-        pkgs.minecraft-server.override {
+          view-distance = 24;
-          url = "https://piston-data.mojang.com/v1/objects/6e64dcabba3c01a7271b4fa6bd898483b794c59b/server.jar";
+          white-list = true;
-          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;
-    #     };
-    #   };
-    # };
   };
 }