From b9fb31d1d6e5d16c8bd9ecc41334ee1d03492337 Mon Sep 17 00:00:00 2001
From: Gabe Venberg <gabevenberg@gmail.com>
Date: Mon, 20 Oct 2025 15:39:32 +0200
Subject: [PATCH] made sound usable on non-graphical systems.

---
 configs/nixos/i3/default.nix       | 15 +++++++--------
 configs/nixos/i3/i3status-rust.nix |  3 +--
 configs/nixos/sound.nix            | 23 ++++++++++++++++++-----
 flake.nix                          |  1 +
 hosts/altostratus/default.nix      |  1 +
 modules/home-manager/default.nix   |  1 -
 modules/home-manager/voice.nix     | 20 --------------------
 7 files changed, 28 insertions(+), 36 deletions(-)
 delete mode 100644 modules/home-manager/voice.nix

diff --git a/configs/nixos/i3/default.nix b/configs/nixos/i3/default.nix
index 48d0ce7..20d3d7c 100644
--- a/configs/nixos/i3/default.nix
+++ b/configs/nixos/i3/default.nix
@@ -9,16 +9,15 @@
     enable = true;
     windowManager.i3.enable = true;
   };
-  programs.dconf.enable=true;
+  programs.dconf.enable = true;
   home-manager.users.${config.host.details.user} = {config, ...}: {
-    gtk={
-      enable=true;
-      colorScheme="dark";
-
+    gtk = {
+      enable = true;
+      colorScheme = "dark";
     };
-    qt={
-      enable=true;
-      style.name="adwaita-dark";
+    qt = {
+      enable = true;
+      style.name = "adwaita-dark";
     };
     home.packages = with pkgs; [
       maim
diff --git a/configs/nixos/i3/i3status-rust.nix b/configs/nixos/i3/i3status-rust.nix
index f510b30..4d7fdaf 100644
--- a/configs/nixos/i3/i3status-rust.nix
+++ b/configs/nixos/i3/i3status-rust.nix
@@ -51,8 +51,7 @@
               interval = 1;
             }
             (
-              lib.mkIf
-              (!osConfig.host.details.isVm)
+              lib.mkIf (!osConfig.host.details.isVm)
               {
                 block = "backlight";
                 missing_format = "";
diff --git a/configs/nixos/sound.nix b/configs/nixos/sound.nix
index 45b03d8..5ccd6e5 100644
--- a/configs/nixos/sound.nix
+++ b/configs/nixos/sound.nix
@@ -1,6 +1,7 @@
 {
   config,
   pkgs,
+  lib,
   ...
 }: {
   # Enable sound with pipewire.
@@ -13,10 +14,22 @@
     pulse.enable = true;
   };
 
-  home-manager.users.${config.host.details.user} = {config, ...}: {
-    home.packages = with pkgs; [
-      pwvucontrol
-      helvum
-    ];
+  home-manager.users.${config.host.details.user} = {
+    config,
+    osConfig,
+    lib,
+    ...
+  }: {
+    home.packages = with pkgs;
+      lib.mkMerge [
+        (
+          lib.mkIf (osConfig.host.details.gui.enable)
+          [
+            pwvucontrol
+            helvum
+          ]
+        )
+        [wiremix]
+      ];
   };
 }
diff --git a/flake.nix b/flake.nix
index aa37b40..62cb334 100644
--- a/flake.nix
+++ b/flake.nix
@@ -82,6 +82,7 @@
         default = pkgs.mkShell {
           packages = with pkgs; [
             just
+            nixos-rebuild
             deploy-rs.packages.${system}.deploy-rs
           ];
         };
diff --git a/hosts/altostratus/default.nix b/hosts/altostratus/default.nix
index 768e5fd..be3dfb8 100644
--- a/hosts/altostratus/default.nix
+++ b/hosts/altostratus/default.nix
@@ -16,6 +16,7 @@ inputs.nixpkgs.lib.nixosSystem {
     ../../configs/nixos/secrets.nix
     ../../configs/nixos/tailscale.nix
     ../../configs/nixos/interactive-networking.nix
+    ../../configs/nixos/sound.nix
     ../../roles/nixos/embedded-dev.nix
     ({
       config,
diff --git a/modules/home-manager/default.nix b/modules/home-manager/default.nix
index 90eff96..d8438c3 100644
--- a/modules/home-manager/default.nix
+++ b/modules/home-manager/default.nix
@@ -1,6 +1,5 @@
 {
   imports = [
     ./git.nix
-    ./voice.nix
   ];
 }
diff --git a/modules/home-manager/voice.nix b/modules/home-manager/voice.nix
deleted file mode 100644
index e847516..0000000
--- a/modules/home-manager/voice.nix
+++ /dev/null
@@ -1,20 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}: {
-  options.user.enable-speech = lib.mkEnableOption "espeak";
-
-  config = lib.mkIf config.user.enable-speech {
-    home.shellAliases = {
-      say = "espeak -p 10 -s 150 -a 200";
-    };
-    home.packages = with pkgs; [
-      espeak
-    ];
-    programs.nushell.extraConfig = ''
-      alias say = espeak -p 10 -s 150 -a 200
-    '';
-  };
-}