From 7b9ef8fde400063b8b144161a0abe06b13e3968e Mon Sep 17 00:00:00 2001
From: Kate Temkin <kate@deprekated.net>
Date: Mon, 31 Mar 2025 12:33:06 +0200
Subject: [PATCH] misc updates

---
 flake.nix                           |  3 ---
 nixos/configs/gui/default.nix       |  3 +++
 nixos/configs/vmware.nix            |  1 +
 nixos/hosts/trailblazer/default.nix |  5 ++++-
 nixos/overlays/fixup-vmware.nix     | 25 +++++++++++++++++++++++++
 5 files changed, 33 insertions(+), 4 deletions(-)
 create mode 100644 nixos/overlays/fixup-vmware.nix

diff --git a/flake.nix b/flake.nix
index 69a2db5..0d47d6b 100644
--- a/flake.nix
+++ b/flake.nix
@@ -273,7 +273,6 @@
         specialArgs = mkSpecialArgs system;
         modules = linuxOfflineGuiModules [
           ./nixos/hosts/trailblazer
-          ./nixos/configs/vmware.nix
         ];
       };
 
@@ -285,7 +284,6 @@
         modules = linuxOfflineGuiModules [
           ./nixos/hosts/kanbaru.nix
           ./nixos/configs/steam.nix
-          ./nixos/configs/vmware.nix
           ./nixos/configs/power-saving.nix
         ];
       };
@@ -313,7 +311,6 @@
 
         modules = linuxOfflineGuiModules [
           ./nixos/hosts/hinata.nix
-          ./nixos/configs/vmware.nix
           ./nixos/configs/cellular.nix
           ./nixos/configs/power-saving.nix
         ];
diff --git a/nixos/configs/gui/default.nix b/nixos/configs/gui/default.nix
index 9fc648b..6c260db 100644
--- a/nixos/configs/gui/default.nix
+++ b/nixos/configs/gui/default.nix
@@ -47,6 +47,9 @@
     brightnessctl
     nirilock-fancy
 
+    # required by xdg-desktop-portal-gnome
+    nautilus
+
     xdg-desktop-portal-gtk
     xdg-desktop-portal-gnome
     kdePackages.kwallet
diff --git a/nixos/configs/vmware.nix b/nixos/configs/vmware.nix
index 75f6d7a..a18f970 100644
--- a/nixos/configs/vmware.nix
+++ b/nixos/configs/vmware.nix
@@ -7,6 +7,7 @@
   ...
 }:
 {
+  imports = [ ../overlays/fixup-vmware.nix ];
 
   # Use VMWare, and not KVM.
   virtualisation.vmware.host.enable = true;
diff --git a/nixos/hosts/trailblazer/default.nix b/nixos/hosts/trailblazer/default.nix
index 2bcc2cc..b6d4ec7 100644
--- a/nixos/hosts/trailblazer/default.nix
+++ b/nixos/hosts/trailblazer/default.nix
@@ -33,13 +33,16 @@ let
         openrgb -d "Corsair Lighting Node Pro" -m direct -z 1 -s 100 -b 100 -c $1
   '';
 
+  #mqttServer = "fuuka"
+  mqttServer = "mitsuru";
+
   commandScript = pkgs.writeScriptBin "trailblazer-command-daemon" ''
     #!${pkgs.xonsh}/bin/xonsh
 
     print("[I] Trailblazer command service started. Waiting for command.")
     print("----------------------------")
 
-    for verb in !(${pkgs.mosquitto}/bin/mosquitto_sub -h fuuka -t trailblazer/command):
+    for verb in !(${pkgs.mosquitto}/bin/mosquitto_sub -h ${mqttServer} -t trailblazer/command):
       verb = verb.strip()
 
       if verb == "lights/off":
diff --git a/nixos/overlays/fixup-vmware.nix b/nixos/overlays/fixup-vmware.nix
new file mode 100644
index 0000000..45ad2a1
--- /dev/null
+++ b/nixos/overlays/fixup-vmware.nix
@@ -0,0 +1,25 @@
+{ ... }:
+let
+  overlay=
+    (
+      final: prev:
+      let
+        finalAttrs = final.vmware-workstation;
+        baseUrl = "https://softwareupdate.vmware.com/cds/vmw-desktop/ws/${finalAttrs.version}/${finalAttrs.build}/linux";
+      in
+      {
+        vmware-workstation = prev.vmware-workstation.overrideAttrs {
+          src =
+            prev.requireFile rec {
+              name = "VMware-Workstation-${finalAttrs.version}-${finalAttrs.build}.x86_64.bundle.tar";
+              url = "${baseUrl}/core/${name}";
+              hash = "sha256-FzcS/koLJTXiUWH5H1Au0Eiz8VAH8mboidkQeDLRPmQ=";
+            }
+            + "/VMware-Workstation-${finalAttrs.version}-${finalAttrs.build}.x86_64.bundle";
+        };
+      }
+    );
+in
+{
+  nixpkgs.overlays = [ overlay ];
+}