From 7614ac5d73fd065b2db1b76eacaca09ffe6a575a Mon Sep 17 00:00:00 2001
From: Don Harper <duck@duckland.org>
Date: Wed, 19 Mar 2025 22:39:12 -0500
Subject: [PATCH] upstream changes

---
 hosts/pi-server/default.nix   | 2 +-
 hosts/server/default.nix      | 2 +-
 hosts/workstation/default.nix | 4 ++--
 3 files changed, 4 insertions(+), 4 deletions(-)

diff --git a/hosts/pi-server/default.nix b/hosts/pi-server/default.nix
index fc201c4..c2f6ea9 100644
--- a/hosts/pi-server/default.nix
+++ b/hosts/pi-server/default.nix
@@ -166,7 +166,7 @@ in {
     lsb-release
     lsof
     nix-bash-completions
-    nixfmt
+    nixfmt-classic
     pkg-config
     podman
     poppler_utils
diff --git a/hosts/server/default.nix b/hosts/server/default.nix
index 7c90a57..6d58d20 100644
--- a/hosts/server/default.nix
+++ b/hosts/server/default.nix
@@ -165,7 +165,7 @@ in {
     lsb-release
     lsof
     nix-bash-completions
-    nixfmt
+    nixfmt-classic
     pkg-config
     podman
     poppler_utils
diff --git a/hosts/workstation/default.nix b/hosts/workstation/default.nix
index ffe89b8..1d8b3c8 100644
--- a/hosts/workstation/default.nix
+++ b/hosts/workstation/default.nix
@@ -136,6 +136,7 @@ in {
       pulse = { enable = true; };
     };
     printing = { enable = true; };
+    pulseaudio = { enable = false; };
     tailscale = { enable = true; };
     udev = {
       extraRules = ''
@@ -146,7 +147,6 @@ in {
 
   hardware = {
     bluetooth = { enable = true; };
-    pulseaudio = { enable = false; };
     sane = {
       enable = true;
       extraBackends = [ pkgs.sane-airscan ];
@@ -242,7 +242,7 @@ in {
     lsof
     nix-bash-completions
     nixd
-    nixfmt
+    nixfmt-classic
     pkg-config
     playerctl
     poppler_utils