diff options
| -rw-r--r-- | machines/sternenseemann/base-laptop.nix | 6 | ||||
| -rw-r--r-- | machines/sternenseemann/wolfgang.nix | 5 | ||||
| -rw-r--r-- | modules/user/sternenseemann/services/sway.nix | 2 |
3 files changed, 5 insertions, 8 deletions
diff --git a/machines/sternenseemann/base-laptop.nix b/machines/sternenseemann/base-laptop.nix index a1529fb2..55f9341d 100644 --- a/machines/sternenseemann/base-laptop.nix +++ b/machines/sternenseemann/base-laptop.nix @@ -14,9 +14,11 @@ hardware.bluetooth.enable = lib.mkDefault true; services.blueman.enable = true; - hardware.pulseaudio = { - daemon.config.flat-volumes = "yes"; + services.pipewire = { enable = true; + pulse.enable = true; + alsa.enable = true; + socketActivation = true; }; hardware.cpu.intel.updateMicrocode = true; diff --git a/machines/sternenseemann/wolfgang.nix b/machines/sternenseemann/wolfgang.nix index 5b241125..6eb683a8 100644 --- a/machines/sternenseemann/wolfgang.nix +++ b/machines/sternenseemann/wolfgang.nix @@ -30,11 +30,6 @@ in { ]; hardware.opengl.driSupport32Bit = i686Games; - hardware.pulseaudio = { - enable = true; - support32Bit = i686Games; - zeroconf.discovery.enable = avahi; - }; # 100% CPU in university services.avahi.enable = avahi; diff --git a/modules/user/sternenseemann/services/sway.nix b/modules/user/sternenseemann/services/sway.nix index e575e9d7..f34cf194 100644 --- a/modules/user/sternenseemann/services/sway.nix +++ b/modules/user/sternenseemann/services/sway.nix @@ -8,7 +8,7 @@ let getBins ; - bins = (getBins config.hardware.pulseaudio.package [ "pactl" ]) + bins = (getBins pkgs.pulseaudioLight [ "pactl" ]) // (getBins pkgs.dbus [ "dbus-run-session" ]) // (getBins cfg.package [ "sway" ]) // (getBins pkgs.i3status [ "i3status" ]) |