svn path=/nixos/branches/modular-nixos/; revision=16397

modules/services/audio/alsa.nix

@@ -1,92 +1,74 @@
 # ALSA sound support.
 {pkgs, config, ...}:
 
-###### interface
 let
-  inherit (pkgs.lib) mkOption;
+  inherit (pkgs.lib) mkOption singleton mkIf;
 
-  options = {
-    sound = {
-
-      enable = mkOption {
-        default = true;
-        description = "
-          Whether to enable ALSA sound.
-        ";
-        merge = pkgs.lib.mergeEnableOption;
-      };
-
-    };
-  };
-in
-
-###### implementation
-let
-  inherit (pkgs.lib) mkIf;
-
-  # dangerous !
-  modprobe = config.system.sbin.modprobe;
   inherit (pkgs) alsaUtils;
 
   soundState = "/var/lib/alsa/asound.state";
 
-  # Alsalib seems to require the existence of this group, even if it's
-  # not used (e.g., doesn't own any devices).
-  group = {
-    name = "audio";
-    gid = config.ids.gids.audio;
-  };
-
-  job = {
-    name = "alsa";
-
-    job = ''
-      start on udev
-      stop on shutdown
-
-      start script
-
-          mkdir -m 0755 -p $(dirname ${soundState})
-
-          # Load some additional modules.
-          for mod in snd_pcm_oss; do
-              ${modprobe}/sbin/modprobe $mod || true
-          done
-
-          # Restore the sound state.
-          ${alsaUtils}/sbin/alsactl -f ${soundState} restore
-
-      end script
-
-      respawn sleep 1000000 # !!! hack
-
-      stop script
-
-          # Save the sound state.
-          ${alsaUtils}/sbin/alsactl -f ${soundState} store
-
-      end script
-    '';
-  };
 in
 
-mkIf config.sound.enable {
-  require = [
-    # ../upstart-jobs/default.nix # config.services.extraJobs
-    # ../system/user.nix # users.*
-    # ? # config.environment.extraPackages
-    options
-  ];
+{
+
+  ###### interface
+  
+  options = {
+  
+    sound = {
+
+      enable = mkOption {
+        default = true;
+        description = ''
+          Whether to enable ALSA sound.
+        '';
+        merge = pkgs.lib.mergeEnableOption;
+      };
+
+    };
     
-  environment = {
-    extraPackages = [alsaUtils];
   };
 
-  users = {
-    extraGroups = [group];
+
+  ###### implementation
+  
+  config = mkIf config.sound.enable {
+  
+    environment.systemPackages = [alsaUtils];
+
+    users.extraGroups = singleton
+      { # Alsalib seems to require the existence of this group, even
+        # if it's not used (e.g., doesn't own any devices).
+        name = "audio";
+        gid = config.ids.gids.audio;
+      };
+
+    jobs = singleton
+      { name = "alsa";
+
+        startOn = "udev";
+
+        preStart =
+          ''
+            mkdir -m 0755 -p $(dirname ${soundState})
+
+            # Load some additional modules.
+            for mod in snd_pcm_oss; do
+                ${config.system.sbin.modprobe}/sbin/modprobe $mod || true
+            done
+
+            # Restore the sound state.
+            ${alsaUtils}/sbin/alsactl -f ${soundState} restore
+          '';
+
+        postStop =
+          ''
+            # Save the sound state.
+            ${alsaUtils}/sbin/alsactl -f ${soundState} store
+          '';
+      };
+      
   };
 
-  services = {
-    extraJobs = [job];
-  };
 }