diff options
| author | rnhmjoj <rnhmjoj@inventati.org> | 2019-09-14 19:51:29 +0200 |
|---|---|---|
| committer | worldofpeace <worldofpeace@protonmail.ch> | 2020-01-06 10:39:18 -0500 |
| commit | 1d61efb7f177f7b70c467ab4940fde0a3481d4dc (patch) | |
| tree | 860cce85acd87bc07aa2d11f4feac5d0df48a5c0 /nixos/modules/config/pulseaudio.nix | |
| parent | 6bd13ccd8e7fd1f241eb655f7112df1ed2889a3a (diff) | |
| download | nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.gz nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.bz2 nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.lz nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.xz nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.tar.zst nixpkgs-1d61efb7f177f7b70c467ab4940fde0a3481d4dc.zip | |
treewide: use attrs instead of list for types.loaOf options
Diffstat (limited to 'nixos/modules/config/pulseaudio.nix')
| -rw-r--r-- | nixos/modules/config/pulseaudio.nix | 27 |
1 files changed, 11 insertions, 16 deletions
diff --git a/nixos/modules/config/pulseaudio.nix b/nixos/modules/config/pulseaudio.nix index 9baad9b5854..048bbb30c73 100644 --- a/nixos/modules/config/pulseaudio.nix +++ b/nixos/modules/config/pulseaudio.nix @@ -215,9 +215,8 @@ in { config = mkMerge [ { - environment.etc = singleton { - target = "pulse/client.conf"; - source = clientConf; + environment.etc = { + "pulse/client.conf".source = clientConf; }; hardware.pulseaudio.configFile = mkDefault "${getBin overriddenPackage}/etc/pulse/default.pa"; @@ -228,19 +227,16 @@ in { sound.enable = true; - environment.etc = [ - { target = "asound.conf"; - source = alsaConf; } + environment.etc = { + "asound.conf".source = alsaConf; - { target = "pulse/daemon.conf"; - source = writeText "daemon.conf" (lib.generators.toKeyValue {} cfg.daemon.config); } + "pulse/daemon.conf".source = writeText "daemon.conf" + (lib.generators.toKeyValue {} cfg.daemon.config); - { target = "openal/alsoft.conf"; - source = writeText "alsoft.conf" "drivers=pulse"; } + "openal/alsoft.conf".source = writeText "alsoft.conf" "drivers=pulse"; - { target = "libao.conf"; - source = writeText "libao.conf" "default_driver=pulse"; } - ]; + "libao.conf".source = writeText "libao.conf" "default_driver=pulse"; + }; # Disable flat volumes to enable relative ones hardware.pulseaudio.daemon.config.flat-volumes = mkDefault "no"; @@ -275,9 +271,8 @@ in { }) (mkIf nonSystemWide { - environment.etc = singleton { - target = "pulse/default.pa"; - source = myConfigFile; + environment.etc = { + "pulse/default.pa".source = myConfigFile; }; systemd.user = { services.pulseaudio = { |