diff --git a/modules/home/desktop.nix b/modules/home/desktop.nix index bad0b65..9e34895 100644 --- a/modules/home/desktop.nix +++ b/modules/home/desktop.nix @@ -24,7 +24,7 @@ home = { packages = with pkgs; [ playerctl brightnessctl - networkmanagerapplet + networkmanagerapplet tailscale-systray 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 17c16c0..00f19e0 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 &" ]; diff --git a/modules/system/homelab/mc.nix b/modules/system/homelab/mc.nix index 13e3ada..0bbb83d 100644 --- a/modules/system/homelab/mc.nix +++ b/modules/system/homelab/mc.nix @@ -9,18 +9,7 @@ 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 ]; @@ -97,8 +86,7 @@ in { symlinks = lib.mapAttrs' (name: _: lib.nameValuePair "mods/${name}" "${modpack}/mods/${name}") - (builtins.readDir "${modpack}/mods") - // { "polymer/packsquash" = "${packsquash-binary}/bin/packsquash"; }; + (builtins.readDir "${modpack}/mods"); package = pkgs.fabricServers.fabric-1_21_11.override { jre_headless = pkgs.javaPackages.compiler.temurin-bin.jdk-25;