ma gui: pulseaudio -> pipewire

This commit is contained in:
makefu 2022-09-25 14:46:39 +02:00
parent 5b9d7e47c3
commit 65e1ab6bff
No known key found for this signature in database
GPG Key ID: 36F7711F3FC0F225
2 changed files with 25 additions and 26 deletions

View File

@ -17,8 +17,10 @@ in
{ {
imports = [ imports = [
./urxvtd.nix ./urxvtd.nix
./pipewire.nix
]; ];
services.xserver = { services.xserver = {
enable = true; enable = true;
layout = "us"; layout = "us";
@ -49,7 +51,7 @@ in
}; };
users.users.${mainUser} = { users.users.${mainUser} = {
extraGroups = [ "audio" ]; extraGroups = [ "pipewire" "audio" ];
packages = with pkgs;[ packages = with pkgs;[
pavucontrol pavucontrol
xlockmore xlockmore
@ -57,10 +59,6 @@ in
]; ];
}; };
hardware.pulseaudio = {
enable = true;
# systemWide = true;
};
services.xserver.displayManager.sessionCommands = let services.xserver.displayManager.sessionCommands = let
xdefaultsfile = pkgs.writeText "Xdefaults" '' xdefaultsfile = pkgs.writeText "Xdefaults" ''
cat |derp <<EOF cat |derp <<EOF
@ -79,6 +77,7 @@ in
URxvt.urgentOnBell: true URxvt.urgentOnBell: true
URxvt.visualBell: false URxvt.visualBell: false
URxvt.font : xft:Terminus:size=12 URxvt.font : xft:Terminus:size=12
URxvt.perl-ext-common: default,-confirm-paste
! blue ! blue

View File

@ -2,27 +2,27 @@
{ # bluetooth+pulse config { # bluetooth+pulse config
# for blueman-applet # for blueman-applet
users.users.makefu.packages = [ pkgs.blueman ]; users.users.makefu.packages = [ pkgs.blueman ];
hardware.pulseaudio = { #hardware.pulseaudio = {
enable = true; # enable = true;
package = pkgs.pulseaudioFull; # package = pkgs.pulseaudioFull;
# systemWide = true; # #systemWide = true;
support32Bit = true; # support32Bit = true;
configFile = pkgs.writeText "default.pa" '' # configFile = pkgs.writeText "default.pa" ''
load-module module-udev-detect # load-module module-udev-detect
load-module module-bluetooth-policy # load-module module-bluetooth-policy
load-module module-bluetooth-discover # load-module module-bluetooth-discover
load-module module-native-protocol-unix # load-module module-native-protocol-unix
load-module module-always-sink # load-module module-always-sink
load-module module-console-kit # load-module module-console-kit
load-module module-systemd-login # load-module module-systemd-login
load-module module-intended-roles # load-module module-intended-roles
load-module module-position-event-sounds # load-module module-position-event-sounds
load-module module-filter-heuristics # load-module module-filter-heuristics
load-module module-filter-apply # load-module module-filter-apply
load-module module-switch-on-connect # load-module module-switch-on-connect
load-module module-switch-on-port-available # load-module module-switch-on-port-available
''; # '';
}; #};
services.blueman.enable = true; services.blueman.enable = true;
# presumably a2dp Sink # presumably a2dp Sink
# Enable profile: # Enable profile: