diff --git a/hm/desktop/audio/default.nix b/hm/desktop/audio/default.nix index 8a27adb..08cbcb6 100644 --- a/hm/desktop/audio/default.nix +++ b/hm/desktop/audio/default.nix @@ -7,7 +7,10 @@ in config = lib.mkIf config.frogeye.desktop.xorg { home = { packages = with pkgs; [ - pavucontrol # Because can't use Win+F1X on Pinebook 🙃 + pwvucontrol # Because can't use Win+F1X on Pinebook 🙃 + pavucontrol # Just in case + helvum + qpwgraph sox ]; sessionVariables = { @@ -30,8 +33,7 @@ in "XF86AudioLowerVolume" = "${pactl} set-sink-mute @DEFAULT_SINK@ false; ${pactl} set-sink-volume @DEFAULT_SINK@ -5%"; "XF86AudioMute" = "${pactl} set-sink-mute @DEFAULT_SINK@ true"; "${mod}+F8" = "${pactl} suspend-sink @DEFAULT_SINK@ 1; ${pactl} suspend-sink @DEFAULT_SINK@ 0"; # Re-synchronize bluetooth headset - "${mod}+F11" = "exec ${pkgs.pavucontrol}/bin/pavucontrol"; - "${mod}+F12" = "exec ${pkgs.pavucontrol}/bin/pavucontrol"; + "${mod}+F11" = "exec ${pkgs.pavucontrol}/bin/pwvucontrol"; # TODO Find pacmixer? }; }; diff --git a/os/desktop/default.nix b/os/desktop/default.nix index 799edcc..fe79de6 100644 --- a/os/desktop/default.nix +++ b/os/desktop/default.nix @@ -2,10 +2,21 @@ { config = lib.mkIf config.frogeye.desktop.xorg { boot.kernelModules = [ "i2c-dev" ]; # Allows using ddcutil + security.rtkit.enable = true; # Recommended for pipewire services = { blueman.enable = true; displayManager.defaultSession = "none+i3"; udev.packages = with pkgs; [ ddcutil ]; # TODO Doesn't seem to help + # Audio + pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = true; + }; + pulse.enable = true; # Required for a lot of apps, probably + }; + # Video xserver = { enable = true; windowManager.i3.enable = true; @@ -34,15 +45,11 @@ layout = "qwerty-fr"; }; }; + # Disco }; # Enable sound & bluetooth - sound.enable = true; - hardware = { - bluetooth.enable = true; - pulseaudio.enable = true; - # TODO Try pipewire - }; + hardware.bluetooth.enable = true; # So we can use gnome3 pinentry flavour services.dbus.packages = [ pkgs.gcr ];