Compare commits

..

No commits in common. "69b821eecdcdde201f500f34fe0c69fbe00bd593" and "d3cf3f7813824f81d11186dd8f27c98cb245da11" have entirely different histories.

2 changed files with 77 additions and 30 deletions

View File

@ -369,7 +369,7 @@ in
height = null; height = null;
modules-left = [ "sway/workspaces" "custom/spacer" "custom/weather-temp" "custom/weather-precip" "custom/weather-wind" ]; 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-right = [ "pulseaudio" "custom/spacer" "memory" "custom/spacer" "cpu" ] ++ lib.optionals cfg.battery [ "custom/spacer" "battery" ] ++ [ "custom/spacer" "tray" ];
modules = { modules = {
@ -425,11 +425,6 @@ in
tooltip = false; tooltip = false;
format = "{:%I:%M %p}"; format = "{:%I:%M %p}";
}; };
"clock#4" = {
tooltip = false;
timezone = "Etc/UTC";
format = "{:%H:%M} UTC";
};
pulseaudio = { pulseaudio = {
format = "{icon} {volume}%"; format = "{icon} {volume}%";
@ -479,7 +474,7 @@ in
} }
#custom-spacer { #custom-spacer {
font-size: 12px; font-size: 15px;
color: #${config.colors.base16.base00}; color: #${config.colors.base16.base00};
font-weight: bold; font-weight: bold;
margin: 0; margin: 0;
@ -490,7 +485,6 @@ in
#clock.1, #clock.1,
#clock.2, #clock.2,
#clock.3, #clock.3,
#clock.4,
#pulseaudio, #pulseaudio,
#memory, #memory,
#cpu, #cpu,

View File

@ -21,32 +21,86 @@ in
alsa.support32Bit = lib.mkDefault true; alsa.support32Bit = lib.mkDefault true;
pulse.enable = 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" = [ "context.modules" = [
{ {
"args" = { }; name = "libpipewire-module-rtkit";
"flags" = [ "ifexists" "nofail" ]; args = {
"name" = "libpipewire-module-rtkit"; "nice.level" = -15;
} "rt.prio" = 88;
{ "name" = "libpipewire-module-protocol-native"; } "rt.time.soft" = 200000;
{ "name" = "libpipewire-module-client-node"; } "rt.time.hard" = 200000;
{ "name" = "libpipewire-module-adapter"; } };
{ "name" = "libpipewire-module-metadata"; } flags = [ "ifexists" "nofail" ];
{ }
"args" = { { name = "libpipewire-module-protocol-native"; }
"server.address" = [ "unix:native" "tcp:4713" ]; { name = "libpipewire-module-profiler"; }
"vm.overrides" = { "pulse.min.quantum" = "1024/48000"; }; { 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" = { }; "stream.properties" = {
"context.spa-libs" = { "node.latency" = "32/48000";
"audio.convert.*" = "audioconvert/libspa-audioconvert"; "resample.quality" = 1;
"support.*" = "support/libspa-support";
}; };
"stream.properties" = { };
}; };
media-session.config.bluez-monitor = { media-session.config.bluez-monitor = {
properties = { properties = {
"bluez5.codecs" = [ "sbc" "aac" "ldac" "aptx" "aptx_hd" ]; "bluez5.codecs" = [ "sbc" "aac" "ldac" "aptx" "aptx_hd" ];
@ -56,10 +110,9 @@ in
{ {
actions = { actions = {
update-props = { update-props = {
"bluez5.auto-connect" = [ "hsp_hs" "hfp_hf" "a2dp_sink" ]; "bluez5.auto-connect" = [ "hfp_hf" "hsp_hs" "a2dp_sink" ];
"bluez5.hw-volume" = "bluez5.hw-volume" =
[ "hsp_ag" "hfp_ag" "a2dp_source" "a2dp_sink" ]; [ "hfp_ag" "hsp_ag" "a2dp_source" "a2dp_sink" ];
"bluez5.autoswitch-profile" = true;
}; };
}; };
matches = [{ "device.name" = "~bluez_card.*"; }]; matches = [{ "device.name" = "~bluez_card.*"; }];