diff --git a/home-manager/modules/ezpcusr.nix b/home-manager/modules/ezpcusr.nix index 2a4a821..3a36bd9 100644 --- a/home-manager/modules/ezpcusr.nix +++ b/home-manager/modules/ezpcusr.nix @@ -369,7 +369,7 @@ in height = null; modules-left = [ "sway/workspaces" "custom/spacer" "custom/weather-temp" "custom/weather-precip" "custom/weather-wind" ]; - modules-center = [ "clock#1" "clock#2" "custom/spacer" "mpd" "custom/spacer" "clock#3" "custom/spacer" "clock#4" ]; + modules-center = [ "clock#1" "clock#2" "custom/spacer" "mpd" "custom/spacer" "clock#3" ]; modules-right = [ "pulseaudio" "custom/spacer" "memory" "custom/spacer" "cpu" ] ++ lib.optionals cfg.battery [ "custom/spacer" "battery" ] ++ [ "custom/spacer" "tray" ]; modules = { @@ -425,11 +425,6 @@ in tooltip = false; format = "{:%I:%M %p}"; }; - "clock#4" = { - tooltip = false; - timezone = "Etc/UTC"; - format = "{:%H:%M} UTC"; - }; pulseaudio = { format = "{icon} {volume}%"; @@ -479,7 +474,7 @@ in } #custom-spacer { - font-size: 12px; + font-size: 15px; color: #${config.colors.base16.base00}; font-weight: bold; margin: 0; @@ -490,7 +485,6 @@ in #clock.1, #clock.2, #clock.3, - #clock.4, #pulseaudio, #memory, #cpu, diff --git a/modules/ezpw.nix b/modules/ezpw.nix index 7d5944a..0eebd4e 100644 --- a/modules/ezpw.nix +++ b/modules/ezpw.nix @@ -21,32 +21,86 @@ in alsa.support32Bit = lib.mkDefault true; pulse.enable = lib.mkDefault true; - config.pipewire-pulse = { + config.pipewire = { + "context.properties" = { + "link.max-buffers" = 16; + "log.level" = 2; + "default.clock.rate" = 48000; + "default.clock.quantum" = 32; + "default.clock.min-quantum" = 32; + "default.clock.max-quantum" = 32; + "core.daemon" = true; + "core.name" = "pipewire-0"; + }; "context.modules" = [ { - "args" = { }; - "flags" = [ "ifexists" "nofail" ]; - "name" = "libpipewire-module-rtkit"; - } - { "name" = "libpipewire-module-protocol-native"; } - { "name" = "libpipewire-module-client-node"; } - { "name" = "libpipewire-module-adapter"; } - { "name" = "libpipewire-module-metadata"; } - { - "args" = { - "server.address" = [ "unix:native" "tcp:4713" ]; - "vm.overrides" = { "pulse.min.quantum" = "1024/48000"; }; + name = "libpipewire-module-rtkit"; + args = { + "nice.level" = -15; + "rt.prio" = 88; + "rt.time.soft" = 200000; + "rt.time.hard" = 200000; + }; + flags = [ "ifexists" "nofail" ]; + } + { name = "libpipewire-module-protocol-native"; } + { name = "libpipewire-module-profiler"; } + { name = "libpipewire-module-metadata"; } + { name = "libpipewire-module-spa-device-factory"; } + { name = "libpipewire-module-spa-node-factory"; } + { name = "libpipewire-module-client-node"; } + { name = "libpipewire-module-client-device"; } + { + name = "libpipewire-module-portal"; + flags = [ "ifexists" "nofail" ]; + } + { + name = "libpipewire-module-access"; + args = { }; + } + { name = "libpipewire-module-adapter"; } + { name = "libpipewire-module-link-factory"; } + { name = "libpipewire-module-session-manager"; } + ]; + }; + + config.pipewire-pulse = { + "context.properties" = { + "log.level" = 2; + }; + "context.modules" = [ + { + name = "libpipewire-module-rtkit"; + args = { + "nice.level" = -15; + "rt.prio" = 88; + "rt.time.soft" = 200000; + "rt.time.hard" = 200000; + }; + flags = [ "ifexists" "nofail" ]; + } + { name = "libpipewire-module-protocol-native"; } + { name = "libpipewire-module-client-node"; } + { name = "libpipewire-module-adapter"; } + { name = "libpipewire-module-metadata"; } + { + name = "libpipewire-module-protocol-pulse"; + args = { + "pulse.min.req" = "32/48000"; + "pulse.default.req" = "32/48000"; + "pulse.max.req" = "32/48000"; + "pulse.min.quantum" = "32/48000"; + "pulse.max.quantum" = "32/48000"; + "server.address" = [ "unix:native" ]; }; - "name" = "libpipewire-module-protocol-pulse"; } ]; - "context.properties" = { }; - "context.spa-libs" = { - "audio.convert.*" = "audioconvert/libspa-audioconvert"; - "support.*" = "support/libspa-support"; + "stream.properties" = { + "node.latency" = "32/48000"; + "resample.quality" = 1; }; - "stream.properties" = { }; }; + media-session.config.bluez-monitor = { properties = { "bluez5.codecs" = [ "sbc" "aac" "ldac" "aptx" "aptx_hd" ]; @@ -56,10 +110,9 @@ in { actions = { update-props = { - "bluez5.auto-connect" = [ "hsp_hs" "hfp_hf" "a2dp_sink" ]; + "bluez5.auto-connect" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ]; "bluez5.hw-volume" = - [ "hsp_ag" "hfp_ag" "a2dp_source" "a2dp_sink" ]; - "bluez5.autoswitch-profile" = true; + [ "hfp_ag" "hsp_ag" "a2dp_source" "a2dp_sink" ]; }; }; matches = [{ "device.name" = "~bluez_card.*"; }];