From ab87bb325fa12e58e79cd71f5ae6810a8faf68b8 Mon Sep 17 00:00:00 2001
From: Ivan Malison <IvanMalison@gmail.com>
Date: Thu, 6 Feb 2025 19:49:14 -0700
Subject: [PATCH] [NixOS] Tweak wyoming service names

---
 nixos/justfile                  |  2 +-
 nixos/machines/strixi-minaj.nix |  3 ++-
 nixos/nvidia.nix                |  1 +
 nixos/overlay.nix               |  9 ++++++++-
 nixos/wyoming.nix               | 15 ++++++++-------
 5 files changed, 20 insertions(+), 10 deletions(-)

diff --git a/nixos/justfile b/nixos/justfile
index 0093f940..80763127 100644
--- a/nixos/justfile
+++ b/nixos/justfile
@@ -2,7 +2,7 @@ switch *args:
 	sudo nixos-rebuild switch --flake '.#' --impure {{args}}
 
 fix-local-path-issue:
-	nix flake lock --update-input imalison-taffybar
+	nix flake update imalison-taffybar
 
 
 expire-home-manager-generations:
diff --git a/nixos/machines/strixi-minaj.nix b/nixos/machines/strixi-minaj.nix
index a438bcda..f528105f 100644
--- a/nixos/machines/strixi-minaj.nix
+++ b/nixos/machines/strixi-minaj.nix
@@ -22,6 +22,7 @@
   myModules.wyoming.enable = true;
 
   hardware.enableRedistributableFirmware = true;
+  # nixpkgs.config.cudaSupport = true;
 
   environment.systemPackages = with pkgs; [
     android-studio
@@ -72,7 +73,7 @@
   networking.hostName = "strixi-minaj";
 
   powerManagement.cpuFreqGovernor = lib.mkDefault "performance";
-  hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
+  hardware.cpu.intel.updateMicrocode = lib.mkDefault true;
 
   home-manager.users = forEachUser {
     home.stateVersion = "23.05";
diff --git a/nixos/nvidia.nix b/nixos/nvidia.nix
index 387d831a..05d7b8e9 100644
--- a/nixos/nvidia.nix
+++ b/nixos/nvidia.nix
@@ -21,4 +21,5 @@ makeEnable config "myModules.nvidia" false {
   services.xserver = {
     videoDrivers = [ "nvidia" ];
   };
+  nixpkgs.config.cudaSupport = true;
 }
diff --git a/nixos/overlay.nix b/nixos/overlay.nix
index b761c400..982e6e1c 100644
--- a/nixos/overlay.nix
+++ b/nixos/overlay.nix
@@ -151,11 +151,18 @@ final: prev:
   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
     (
       python-final: python-prev: {
+        pysilero-vad = python-prev.pysilero-vad.overridePythonAttrs (_: {
+          src = final.fetchFromGitHub {
+            owner = "colonelpanic8";
+            repo = "pysilero-vad";
+            rev = "846caf4aa6c5f5319b87d3127dfe0aa9e88b338e";
+            hash = "sha256-SjoyiHm2RiLDFbwduKsoPK4/AvQiwZ39ZsPj2etXRV0=";
+          };
+        });
         home-assistant-chip-wheels = python-prev.home-assistant-chip-wheels.overrideAttrs
         (oldAttrs: rec {
           bypassAttestationVerificationPatch = final.fetchpatch {
             url = "https://raw.githubusercontent.com/tronikos/chip-wheels/8a5ec21d114010723cf428ffe79e244da7562390/8766-Bypass-attestation-verification.patch";
-            # You will need to compute or look up the correct sha256:
             sha256 = "sha256-RgmlPRSfw1PPMdHBzpoK2Drrb8nEagATY8Y5ngi7x0k=";
           };
           postPatch = ''
diff --git a/nixos/wyoming.nix b/nixos/wyoming.nix
index d9ea9727..7cb2d336 100644
--- a/nixos/wyoming.nix
+++ b/nixos/wyoming.nix
@@ -3,7 +3,7 @@ makeEnable config "myModules.wyoming" false {
   environment.systemPackages = with pkgs; [
     alsa-utils
   ];
-  systemd.services."wyoming-satellite".path = with pkgs; [pipewire];
+  systemd.services."wyoming-satellite".path = with pkgs; [pipewire pulseaudio];
   services.wyoming = {
     satellite = {
       enable = true;
@@ -16,21 +16,22 @@ makeEnable config "myModules.wyoming" false {
         "--wake-word-name=ok_nabu"
       ];
     };
-    faster-whisper.servers.strixi = {
+    openwakeword = {
+      enable = true;
+      preloadModels = ["alexa" "ok_nabu" "hey_rhasspy"];
+      uri = "tcp://0.0.0.0:10400";
+    };
+    faster-whisper.servers."${config.networking.hostName}-whisper" = {
       enable = true;
       uri = "tcp://0.0.0.0:10300";
       device = "auto";
       language = "en";
       model = "turbo";
     };
-    piper.servers.strixi = {
+    piper.servers."${config.networking.hostName}-piper" = {
       enable = true;
       uri = "tcp://0.0.0.0:10200";
       voice = "en-us-ryan-medium";
     };
-    openwakeword = {
-      enable = true;
-      preloadModels = ["alexa" "ok_nabu" "hey_rhasspy"];
-    };
   };
 }