From 4bd11e1047f7e7a44e707297679878e1476b18ad Mon Sep 17 00:00:00 2001
From: John Lancaster <32917998+jsl12@users.noreply.github.com>
Date: Sun, 14 Jun 2026 20:47:22 -0500
Subject: [PATCH] audio stuff in nixos-base

---
 modules/features/nixos-base.nix           | 12 ++++++++++++
 modules/hosts/john-p14s/configuration.nix | 16 ----------------
 2 files changed, 12 insertions(+), 16 deletions(-)

diff --git a/modules/features/nixos-base.nix b/modules/features/nixos-base.nix
index e515951..fe6f474 100644
--- a/modules/features/nixos-base.nix
+++ b/modules/features/nixos-base.nix
@@ -42,5 +42,17 @@
     security.polkit.enable = true; # polkit
     services.gnome.gnome-keyring.enable = true; # secret service
     security.pam.services.swaylock = {};
+
+    # Enable sound with pipewire.
+    services.pulseaudio.enable = false;
+    security.rtkit.enable = true; # PulseAudio server uses this to acquire realtime priority.
+    services.pipewire = {
+      enable = true;
+      alsa.enable = true;
+      alsa.support32Bit = true;
+      pulse.enable = true;
+      # If you want to use JACK applications, uncomment this
+      #jack.enable = true;
+    };
   };
 }
\ No newline at end of file
diff --git a/modules/hosts/john-p14s/configuration.nix b/modules/hosts/john-p14s/configuration.nix
index e842908..b3b8a0d 100644
--- a/modules/hosts/john-p14s/configuration.nix
+++ b/modules/hosts/john-p14s/configuration.nix
@@ -44,22 +44,6 @@
       services.libinput.enable = true; # Enable touchpad support (enabled default in most desktopManager).
       services.fprintd.enable = true; # Enables fingerprint sensor
 
-      # Enable sound with pipewire.
-      services.pulseaudio.enable = false;
-      security.rtkit.enable = true; # PulseAudio server uses this to acquire realtime priority.
-      services.pipewire = {
-        enable = true;
-        alsa.enable = true;
-        alsa.support32Bit = true;
-        pulse.enable = true;
-        # If you want to use JACK applications, uncomment this
-        #jack.enable = true;
-
-        # use the example session manager (no others are packaged yet so this is enabled by default,
-        # no need to redefine it in your config for now)
-        # media-session.enable = true;
-      };
-
       home-manager.users.root = {
         imports = with inputs.self.modules.homeManager; [
           rebuild