From 126d0e34f3f9a8bcaf5e0f58f52273a5140277b7 Mon Sep 17 00:00:00 2001
From: Kate Temkin <kate@deprekated.net>
Date: Sun, 29 Jun 2025 17:43:16 +0200
Subject: [PATCH] upgrades; upgrades people! (and minor trailblazer fixes)

---
 flake.nix                           |  2 --
 nixos/hosts/trailblazer/default.nix |  2 ++
 packages/binary-ninja.nix           | 12 +++++++++---
 wezterm/wezterm.lua                 |  2 +-
 4 files changed, 12 insertions(+), 6 deletions(-)

diff --git a/flake.nix b/flake.nix
index 4e8aa67..f5386fb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -196,8 +196,6 @@
       # Modules for offline linux machines.
       linuxOfflineModuleSet = [
         ./nixos/packages/offline.nix
-
-        ./nixos/configs/waydroid.nix
       ];
 
       # Helper functions for creating modules in the defintions below.
diff --git a/nixos/hosts/trailblazer/default.nix b/nixos/hosts/trailblazer/default.nix
index 2c1ed53..d33412a 100644
--- a/nixos/hosts/trailblazer/default.nix
+++ b/nixos/hosts/trailblazer/default.nix
@@ -270,6 +270,7 @@ in
     after = [ "network-online.target" ];
 
     script = "${commandScript}/bin/trailblazer-command-daemon";
+    serviceConfig.Restart = "always";
   };
   systemd.services.trailblazer-status = {
     description = "trailblazer status service";
@@ -280,6 +281,7 @@ in
     after = [ "network-online.target" ];
 
     script = "${statusScript}/bin/trailblazer-status-daemon";
+    serviceConfig.Restart = "always";
   };
 
   systemd.services.suspend_notify = {
diff --git a/packages/binary-ninja.nix b/packages/binary-ninja.nix
index 9a58ba7..cc9d656 100644
--- a/packages/binary-ninja.nix
+++ b/packages/binary-ninja.nix
@@ -20,7 +20,8 @@
   wayland,
   python3,
   svd2py,
-  qt6
+  qt6,
+  libxml2
 }:
 let
   desktopFile = writeText "binary-ninja.desktop" ''
@@ -47,11 +48,14 @@ let
     pname = "binary-ninja";
     version = "4.0.5902";
 
-    buildInputs = [
+    nativeBuildInputs = [
       autoPatchelfHook
       qt6.wrapQtAppsHook
       makeWrapper
       unzip
+    ];
+
+    buildInputs = [
       libGL
       stdenv.cc.cc.lib
       glib
@@ -68,13 +72,15 @@ let
       qt6.qtdeclarative
       wayland
       binja-python
+      libxml2
       dbus
     ];
 
+    autoPatchelfIgnoreMissingDeps = [ "libxml2.so.2" ];
+
     propogatedBuildInputs = (additional-python-packages python3.pkgs);
 
     # Use our local zip directly.
-    dontBuild = true;
     src = if stdenv.isAarch64 then
     	../proprietary/binja/binaryninja_personal_linux_aarch64.zip
     else
diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua
index 98695f3..bcc6d72 100644
--- a/wezterm/wezterm.lua
+++ b/wezterm/wezterm.lua
@@ -117,7 +117,7 @@ end)
 -- Possibly replace with a per-platform equivalent?'
 --if (hostname == "hinata") then
 if wezterm.target_triple == "x86_64-unknown-linux-gnu" then
-    config["default_prog"] = { "/run/current-system/sw/bin/zellij", "-l", "welcome" }
+    config["default_prog"] = { "/run/current-system/sw/bin/zellij" }
 end
 
 return config