diff --git a/nixos/features/sound/aarch64-linux.nix b/nixos/features/sound/asahi.nix similarity index 100% rename from nixos/features/sound/aarch64-linux.nix rename to nixos/features/sound/asahi.nix diff --git a/nixos/features/sound/default.nix b/nixos/features/sound/default.nix index fc83f71..eff6dc2 100644 --- a/nixos/features/sound/default.nix +++ b/nixos/features/sound/default.nix @@ -1,5 +1,12 @@ -{ config, ... }: { - imports = [ - ./${config.nixpkgs.hostPlatform}.nix - ]; +{ ... }: { + sound.enable = true; + hardware.pulseaudio.enable = false; + security.rtkit.enable = true; + + services.pipewire = { + enable = true; + alsa.enable = true; + alsa.support32Bit = true; + pulse.enable = true; + }; } diff --git a/nixos/features/sound/x86_64-linux.nix b/nixos/features/sound/x86_64-linux.nix deleted file mode 100644 index eff6dc2..0000000 --- a/nixos/features/sound/x86_64-linux.nix +++ /dev/null @@ -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; - }; -} diff --git a/nixos/features/xfce.nix b/nixos/features/xfce.nix index 70ff8dc..7274ef4 100644 --- a/nixos/features/xfce.nix +++ b/nixos/features/xfce.nix @@ -1,7 +1,4 @@ { pkgs, ... }: { - imports = [ - ./sound - ]; services.xserver = { enable = true; diff --git a/nixos/hosts/cider/default.nix b/nixos/hosts/cider/default.nix index c2c1642..f223802 100644 --- a/nixos/hosts/cider/default.nix +++ b/nixos/hosts/cider/default.nix @@ -5,7 +5,8 @@ ./hardware-configuration.nix ../../client.nix - ../../features/xfce.nix #TODO: sound may be wrong + ../../features/xfce.nix + ../../features/sound/asahi.nix ../../features/wifi.nix ];