Fix conflicting audio role config: remove pulseaudio, keep pipewire

Remove services.pulseaudio configuration that conflicted with
services.pipewire. PipeWire replaces PulseAudio and provides
compatibility through pulse.enable.

Also added alsa.enable and alsa.support32Bit for better ALSA support.

roles/audio/default.nix

@@ -21,6 +21,8 @@ in
 
       services.pipewire = {
         enable = true;
+        alsa.enable = true;
+        alsa.support32Bit = true;
         pulse.enable = true;
       };
 

roles/nfs-mounts/default.nix

@@ -8,21 +8,6 @@ in
 {
   options.roles.nfs-mounts = {
     enable = mkEnableOption "Enable default NFS mounts";
-    server = mkOption {
-      type = types.str;
-      default = "10.0.0.43";
-      description = "IP address or hostname of the NFS server";
-    };
-    remotePath = mkOption {
-      type = types.str;
-      default = "/media";
-      description = "Remote path to mount from the NFS server";
-    };
-    mountPoint = mkOption {
-      type = types.str;
-      default = "/media";
-      description = "Local mount point for the NFS share";
-    };
     # TODO: implement requireMount
     requireMount = mkOption {
       type = types.bool;
@@ -33,8 +18,8 @@ in
 
   config = mkIf cfg.enable
     {
-      fileSystems.${cfg.mountPoint} = {
-        device = "${cfg.server}:${cfg.remotePath}";
+      fileSystems."/media" = {
+        device = "10.0.0.43:/media";
         fsType = "nfs";
         options = [
           "defaults"

roles/printing/default.nix

@@ -8,21 +8,6 @@ in
 {
   options.roles.printing = {
     enable = mkEnableOption "Enable default printing setup";
-    printerName = mkOption {
-      type = types.str;
-      default = "MFC-L8900CDW_series";
-      description = "Name for the default printer";
-    };
-    printerUri = mkOption {
-      type = types.str;
-      default = "ipp://brother.oglehome/ipp/print";
-      description = "Device URI for the default printer (e.g., ipp://hostname/ipp/print)";
-    };
-    printerModel = mkOption {
-      type = types.str;
-      default = "everywhere";
-      description = "PPD model for the printer (use 'everywhere' for driverless IPP)";
-    };
   };
 
   config = mkIf cfg.enable
@@ -36,11 +21,11 @@ in
       };
 
       hardware.printers.ensurePrinters = [{
-        name = cfg.printerName;
-        deviceUri = cfg.printerUri;
-        model = cfg.printerModel;
+        name = "MFC-L8900CDW_series";
+        deviceUri = "ipp://brother.oglehome/ipp/print";
+        model = "everywhere";
       }];
-      hardware.printers.ensureDefaultPrinter = cfg.printerName;
+      hardware.printers.ensureDefaultPrinter = "MFC-L8900CDW_series";
 
       # Fix ensure-printers service to wait for network availability
       systemd.services.ensure-printers = {

roles/virtualisation/default.nix

@@ -8,11 +8,6 @@ in
 {
   options.roles.virtualisation = {
     enable = mkEnableOption "Enable virtualisation";
-    dockerUsers = mkOption {
-      type = types.listOf types.str;
-      default = [ "johno" ];
-      description = "List of users to add to the docker group";
-    };
   };
 
   config = mkIf cfg.enable
@@ -20,6 +15,6 @@ in
       virtualisation.libvirtd.enable = true;
       programs.virt-manager.enable = true;
       virtualisation.docker.enable = true;
-      users.extraGroups.docker.members = cfg.dockerUsers;
+      users.extraGroups.docker.members = [ "johno" ];
     };
 }