n/sound: simplify
This commit is contained in:
parent
83ee698bf0
commit
f7bc60aeb4
5 changed files with 13 additions and 20 deletions
|
@ -1,5 +1,12 @@
|
||||||
{ config, ... }: {
|
{ ... }: {
|
||||||
imports = [
|
sound.enable = true;
|
||||||
./${config.nixpkgs.hostPlatform}.nix
|
hardware.pulseaudio.enable = false;
|
||||||
];
|
security.rtkit.enable = true;
|
||||||
|
|
||||||
|
services.pipewire = {
|
||||||
|
enable = true;
|
||||||
|
alsa.enable = true;
|
||||||
|
alsa.support32Bit = true;
|
||||||
|
pulse.enable = true;
|
||||||
|
};
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,12 +0,0 @@
|
||||||
{ ... }: {
|
|
||||||
sound.enable = true;
|
|
||||||
hardware.pulseaudio.enable = false;
|
|
||||||
security.rtkit.enable = true;
|
|
||||||
|
|
||||||
services.pipewire = {
|
|
||||||
enable = true;
|
|
||||||
alsa.enable = true;
|
|
||||||
alsa.support32Bit = true;
|
|
||||||
pulse.enable = true;
|
|
||||||
};
|
|
||||||
}
|
|
|
@ -1,7 +1,4 @@
|
||||||
{ pkgs, ... }: {
|
{ pkgs, ... }: {
|
||||||
imports = [
|
|
||||||
./sound
|
|
||||||
];
|
|
||||||
|
|
||||||
services.xserver = {
|
services.xserver = {
|
||||||
enable = true;
|
enable = true;
|
||||||
|
|
|
@ -5,7 +5,8 @@
|
||||||
./hardware-configuration.nix
|
./hardware-configuration.nix
|
||||||
../../client.nix
|
../../client.nix
|
||||||
|
|
||||||
../../features/xfce.nix #TODO: sound may be wrong
|
../../features/xfce.nix
|
||||||
|
../../features/sound/asahi.nix
|
||||||
../../features/wifi.nix
|
../../features/wifi.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
|
|
Loading…
Add table
Reference in a new issue