upgrades; upgrades people! (and minor trailblazer fixes)

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.

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 = {

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

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