diff options
author | devhell <devhell@mailfresser.de> | 2021-09-12 15:53:25 +0100 |
---|---|---|
committer | devhell <devhell@mailfresser.de> | 2021-09-12 17:28:28 +0100 |
commit | e9dd541a4fbc0f82c7510acea9f28c6ac6e558c1 (patch) | |
tree | 6fab2716ee7cbfab4a56e964176b258e607c5fe8 /modules | |
parent | 0af8956db639875bf3c6daf4397661caff125b5c (diff) |
Revert "Revert "profiles/{base,packages,services}: Swith to pipewire""
I've dropped MPD for local playback now, so perhaps this means I can use it now as expected. This also adds `pulseaudio` for `pactl` to work, and enables `rtkit`. This reverts commit 1931d7ead73c9060e0d163073e091e028e7b5dfa.
Diffstat (limited to 'modules')
-rw-r--r-- | modules/user/devhell/profiles/base.nix | 7 | ||||
-rw-r--r-- | modules/user/devhell/profiles/packages.nix | 3 | ||||
-rw-r--r-- | modules/user/devhell/profiles/services.nix | 6 |
3 files changed, 9 insertions, 7 deletions
diff --git a/modules/user/devhell/profiles/base.nix b/modules/user/devhell/profiles/base.nix index 53da8697..29471f82 100644 --- a/modules/user/devhell/profiles/base.nix +++ b/modules/user/devhell/profiles/base.nix @@ -37,11 +37,6 @@ in { opengl = { driSupport32Bit = true; }; - pulseaudio = { - enable = true; - systemWide = false; - extraConfig = "load-module module-native-protocol-tcp auth-ip-acl=127.0.0.1"; - }; }; networking = { @@ -49,6 +44,8 @@ in { useDHCP = false; }; + security.rtkit.enable = true; + users.users.dev = { isNormalUser = true; extraGroups = [ "nitrokey" "plugdev" "docker" "vboxusers" "wheel" "libvirtd" "wireshark" "video" "audio" ]; diff --git a/modules/user/devhell/profiles/packages.nix b/modules/user/devhell/profiles/packages.nix index 21f2fba7..d5426fc0 100644 --- a/modules/user/devhell/profiles/packages.nix +++ b/modules/user/devhell/profiles/packages.nix @@ -28,8 +28,6 @@ in { })); nixpkgs.config = { - pulseaudio = true; - allowUnfree = true; systemd = { @@ -207,6 +205,7 @@ in { powertop procs profanity + pulseaudio pulsemixer pv pxz diff --git a/modules/user/devhell/profiles/services.nix b/modules/user/devhell/profiles/services.nix index e0de2881..761a9d47 100644 --- a/modules/user/devhell/profiles/services.nix +++ b/modules/user/devhell/profiles/services.nix @@ -64,6 +64,12 @@ in { }; }; + services.pipewire = { + enable = true; + alsa.enable = true; + pulse.enable = true; + socketActivation = true; + }; services.xserver = { displayManager.defaultSession = "none+i3"; |