From 70db3cc58e0a0a244d10e873c6344ecef5f13fa7 Mon Sep 17 00:00:00 2001
From: satr14 <admin@satr14.my.id>
Date: Thu, 11 Jun 2026 18:45:52 +0700
Subject: [PATCH 1/2] use built in systray

---
 modules/home/desktop.nix         | 2 +-
 modules/home/rice/compositor.nix | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix
index 9e34895..bad0b65 100644
--- a/modules/home/desktop.nix
+++ b/modules/home/desktop.nix
@@ -24,7 +24,7 @@
   home = {
     packages = with pkgs; [
       playerctl brightnessctl
-      networkmanagerapplet tailscale-systray
+      networkmanagerapplet
       qt6Packages.qt6ct kdePackages.qtstyleplugin-kvantum
       nwg-displays
       lxqt.pcmanfm-qt
diff --git a/modules/home/rice/compositor.nix b/modules/home/rice/compositor.nix
index 00f19e0..17c16c0 100644
--- a/modules/home/rice/compositor.nix
+++ b/modules/home/rice/compositor.nix
@@ -36,7 +36,7 @@
 
         "uwsm app -s b -- blueman-applet &"
         "uwsm app -s b -- nm-applet &"
-        "uwsm app -s b -- tailscale-systray &"
+        "uwsm app -s b -- tailscale systray &"
         #"keepassxc &"
       ];
 

From c573a72350001dff53ea5e625be0db3be8f40471 Mon Sep 17 00:00:00 2001
From: satr14 <admin@satr14.my.id>
Date: Fri, 12 Jun 2026 19:12:19 +0700
Subject: [PATCH 2/2] packsquash binary

---
 modules/system/homelab/mc.nix | 16 ++++++++++++++--
 1 file changed, 14 insertions(+), 2 deletions(-)

diff --git a/modules/system/homelab/mc.nix b/modules/system/homelab/mc.nix
index 0bbb83d..13e3ada 100644
--- a/modules/system/homelab/mc.nix
+++ b/modules/system/homelab/mc.nix
@@ -9,7 +9,18 @@
     packHash = "sha256-xB9Oc/aneogSQ9r7L42vyVM6xwq+QkoTaXYNuUzeo6M=";
     url = "https://git.satr14.my.id/satr14/server-modpack/raw/${path}/pack.toml";
   };
-  
+
+  packsquash-binary = pkgs.runCommand "packsquash" {
+    src = pkgs.fetchurl {
+      url = "https://github.com/ComunidadAylas/PackSquash/releases/download/v0.4.1/packsquash-x86_64-unknown-linux-gnu.zip";
+      sha256 = "sha256-VsGZewoiO5MjhIhwjlLO5d5uHynlAK5Jh16jH2k2rPs=";
+    };
+    nativeBuildInputs = [ pkgs.unzip ];
+  } ''
+    mkdir -p $out/bin
+    unzip $src -d $out/bin
+    chmod +x $out/bin/packsquash
+  '';
 in {
   imports = [ inputs.mc.nixosModules.minecraft-servers ];
   nixpkgs.overlays = [ inputs.mc.overlay ];
@@ -86,7 +97,8 @@ in {
       
       symlinks = lib.mapAttrs'
         (name: _: lib.nameValuePair "mods/${name}" "${modpack}/mods/${name}")
-        (builtins.readDir "${modpack}/mods");
+        (builtins.readDir "${modpack}/mods")
+        // { "polymer/packsquash" = "${packsquash-binary}/bin/packsquash"; };
       
       package = pkgs.fabricServers.fabric-1_21_11.override {
         jre_headless = pkgs.javaPackages.compiler.temurin-bin.jdk-25;