diff options
author | Profpatsch <mail@profpatsch.de> | 2021-11-22 13:04:00 +0100 |
---|---|---|
committer | Profpatsch <mail@profpatsch.de> | 2021-11-22 13:04:36 +0100 |
commit | b0a8edd7c11ea96015966e12fb2a59a8c10eed31 (patch) | |
tree | b6e435d7131666603bf24110f22f50627ed337ad /machines/profpatsch | |
parent | 3cecebef43fe778f1b8a5e824f34cf396bda91c2 (diff) |
pkgs/profpatsch/shiki: pulseaudio -> pipewire
Let’s see how it goes
Diffstat (limited to 'machines/profpatsch')
-rw-r--r-- | machines/profpatsch/shiki.nix | 29 |
1 files changed, 21 insertions, 8 deletions
diff --git a/machines/profpatsch/shiki.nix b/machines/profpatsch/shiki.nix index a5dba1da..c840e063 100644 --- a/machines/profpatsch/shiki.nix +++ b/machines/profpatsch/shiki.nix @@ -52,15 +52,26 @@ in { cpuFreqGovernor = "powersave"; }; - hardware.pulseaudio = { + # hardware.pulseaudio = { + # enable = true; + # zeroconf.discovery.enable = true; + # # for Pillars of Eternity + # support32Bit = true; + # package = pkgs.pulseaudio.override { + # bluetoothSupport = true; + # jackaudioSupport = true; + # }; + # extraModules = [ pkgs.pulseaudio-modules-bt ]; + # }; + # services.jack = { + # jackd.enable = true; + # alsa.enable = false; + # loopback.enable = true; + # }; + services.pipewire = { enable = true; - zeroconf.discovery.enable = true; - # for Pillars of Eternity - support32Bit = true; - package = pkgs.pulseaudio.override { - bluetoothSupport = true; - }; - extraModules = [ pkgs.pulseaudio-modules-bt ]; + jack.enable = true; + pulse.enable = true; }; # steam # needed by some games (TODO: general module for games) @@ -175,7 +186,9 @@ in { gnome.adwaita-icon-theme # TODO: get themes to work. See notes.org. gnome.gnome_themes_standard + # can go away once I migrate to pw-ctl and such pavucontrol + pulseaudioLight ]; programmingTools = [ cabal2nix # convert cabal files to nixexprs |