profiles/workstation: consolidate sound related configurations

5 files changed, 25 insertions, 40 deletions

diff --git a/hosts/aptos/default.nix b/hosts/aptos/default.nix
index d6f68fa..5b0e40e 100644
--- a/hosts/aptos/default.nix
+++ b/hosts/aptos/default.nix
@@ -3,7 +3,6 @@
 {
   imports = [
     ./hardware.nix
-    ./sound.nix
     ./networking.nix
     ./services.nix
     "${self}/profiles/workstation.nix"
diff --git a/hosts/aptos/sound.nix b/hosts/aptos/sound.nix
deleted file mode 100644
index 947f9cd..0000000
--- a/hosts/aptos/sound.nix
+++ /dev/null
@@ -1 +0,0 @@
-{ ... }: { my.hardware.sound = { pipewire = { enable = true; }; }; }
diff --git a/modules/hardware/default.nix b/modules/hardware/default.nix
index 21e4713..6d1441f 100644
--- a/modules/hardware/default.nix
+++ b/modules/hardware/default.nix
@@ -1,5 +1,5 @@
 { ... }:
 
 {
-  imports = [ ./amd ./bluetooth ./intel ./ssd ./sound ./networking ];
+  imports = [ ./amd ./bluetooth ./intel ./ssd ./networking ];
 }
diff --git a/modules/hardware/sound/default.nix b/modules/hardware/sound/default.nix
deleted file mode 100644
index edb937e..0000000
--- a/modules/hardware/sound/default.nix
+++ /dev/null
@@ -1,37 +0,0 @@
-{ config, lib, pkgs, ... }:
-let cfg = config.my.hardware.sound;
-in
-{
-  options.my.hardware.sound = with lib; {
-    pipewire = { enable = mkEnableOption "pipewire configuration"; };
-  };
-
-  config = lib.mkIf cfg.pipewire.enable {
-    sound.enable = true;
-
-    # RealtimeKit is recommended
-    security.rtkit.enable = true;
-
-    environment.systemPackages = with pkgs; [
-      # We install it to get access to pactl. It isn't enabled or run as a service.
-      pulseaudio
-      pavucontrol
-      easyeffects
-    ];
-
-    services.pipewire = {
-      enable = true;
-
-      alsa = {
-        enable = true;
-        support32Bit = true;
-      };
-
-      pulse = { enable = true; };
-
-      jack = { enable = true; };
-    };
-
-    hardware.pulseaudio.enable = false;
-  };
-}
diff --git a/profiles/workstation.nix b/profiles/workstation.nix
index e860389..ae9423b 100644
--- a/profiles/workstation.nix
+++ b/profiles/workstation.nix
@@ -21,4 +21,28 @@
 
   # Install tools related to the scanner (scanimage etc)
   hardware.sane.enable = true;
+
+  # RealtimeKit is recommended
+  security.rtkit.enable = true;
+
+  # Sound configuration
+  sound.enable = false;
+
+  services.pipewire = {
+    enable = true;
+    alsa.enable = true;
+    alsa.support32Bit = true;
+    pulse.enable = true;
+    jack.enable = true;
+  };
+
+  hardware.pulseaudio.enable = false;
+
+  # Misc packages useful on a workstation
+  environment.systemPackages = with pkgs; [
+    # sound related
+    pulseaudio
+    pavucontrol
+    easyeffects
+  ];
 }