From 4fe1c50ec900cd1141b82d286c97c476e327fd17 Mon Sep 17 00:00:00 2001 From: Artemis Tosini Date: Fri, 1 Jan 2021 02:37:11 +0000 Subject: [PATCH] Okay, never mind, jack sucks --- sets/jack.nix | 12 ------------ sets/pipewire.nix | 14 ++++++++++++++ system/starlight/default.nix | 2 +- 3 files changed, 15 insertions(+), 13 deletions(-) delete mode 100644 sets/jack.nix create mode 100644 sets/pipewire.nix diff --git a/sets/jack.nix b/sets/jack.nix deleted file mode 100644 index 5bed7dd..0000000 --- a/sets/jack.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ pkgs, ... }: - -{ - services.jack.jackd = { - enable = true; - extraOptions = [ "-dalsa" "--device" "hw:USB" ]; - }; - users.users.artemis.extraGroups = [ "jackaudio" ]; - environment.systemPackages = with pkgs; [ - qjackctl - ]; -} diff --git a/sets/pipewire.nix b/sets/pipewire.nix new file mode 100644 index 0000000..b59d66a --- /dev/null +++ b/sets/pipewire.nix @@ -0,0 +1,14 @@ +{ pkgs, lib, ... }: + +{ + services.pipewire = { + enable = true; + alsa = { + enable = true; + support32Bit = pkgs.targetPlatform.system == "x86_64-linux"; + }; + pulse.enable = true; + jack.enable = true; + }; + hardware.pulseaudio.enable = lib.mkForce false; +} diff --git a/system/starlight/default.nix b/system/starlight/default.nix index 979dd5b..cf062cf 100644 --- a/system/starlight/default.nix +++ b/system/starlight/default.nix @@ -11,8 +11,8 @@ ../../sets/gpu/amd.nix ../../sets/hacking.nix ../../sets/hardware.nix - ../../sets/jack.nix ../../sets/neovim + ../../sets/pipewire.nix ../../sets/printing.nix ../../sets/ssh.nix ../../sets/sway.nix