better audio setup

This commit is contained in:
Grigory Shipunov 2023-03-16 14:44:45 +01:00
parent 57c44b6ae2
commit b5adc159f0
Signed by: 0xa
GPG key ID: 91FA5E5BF9AA901C

View file

@ -1,14 +1,22 @@
# General Desktop-related config # General Desktop-related config
{ config, pkgs, ... }: { config, pkgs, lib, ... }:
{ {
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
firefox-wayland firefox-wayland
wl-clipboard wl-clipboard
pulseaudioFull
screen-message screen-message
qbittorrent qbittorrent
dino dino
tdesktop tdesktop
# (tdesktop.overrideAttrs (old: rec {
# version = "4.6.7";
# src = fetchFromGitHub {
# owner = "forkgram";
# repo = "tdesktop";
# rev = "v${version}";
# sha256 = "sha256-KMV/t3AC/kZQVz31UPYEKU/An6ycdsabZazUVCA9yIU=";
# };
# }))
signal-desktop signal-desktop
gajim gajim
imv imv
@ -30,6 +38,9 @@
yt-dlp yt-dlp
tor-browser-bundle-bin tor-browser-bundle-bin
ffmpeg-full ffmpeg-full
gimp
inkscape
blender
]; ];
#on the desktop, we need nice fonts ^^ #on the desktop, we need nice fonts ^^
@ -74,19 +85,28 @@
# Enable sound. # Enable sound.
security.rtkit.enable = true; security.rtkit.enable = true;
hardware.pulseaudio = {
enable = false; services.avahi = {
zeroconf.discovery.enable = true; enable = true;
extraClientConf = '' nssmdns = true;
autospawn=yes
'';
}; };
services.pipewire = { services.pipewire = {
enable = true; enable = true;
alsa.enable = true; alsa.enable = true;
pulse.enable = true; pulse.enable = true;
config.pipewire-pulse =
let default-pipewire-pulse = lib.importJSON (pkgs.path + "/nixos/modules/services/desktops/pipewire/daemon/pipewire-pulse.conf.json");
in
default-pipewire-pulse // {
"context.modules" = default-pipewire-pulse."context.modules" ++ [
{
"name" = "libpipewire-module-zeroconf-discover";
}
];
};
}; };
hardware.pulseaudio.zeroconf.discovery.enable = true;
hardware.bluetooth = { hardware.bluetooth = {
enable = true; enable = true;