meow lucy should commit more often xd
This commit is contained in:
parent
e865cd7c8f
commit
e986986e79
9 changed files with 124 additions and 212 deletions
|
|
@ -173,9 +173,11 @@ in
|
|||
default = { };
|
||||
};
|
||||
config = mkIf cfg.enable {
|
||||
# https://github.com/jaakkopasanen/AutoEq/blob/master/results/oratory1990/in-ear/Shure%20SE215/Shure%20SE215%20ParametricEQ.txt
|
||||
xyno.desktop.audio.eq.se215 = {
|
||||
displayName = "Shure SE215";
|
||||
hwAddr = "alsa_output.usb-Synaptics_CX31993_384Khz_HIFI_AUDIO-00.analog-stereo";
|
||||
# hideParent = false;
|
||||
extraConfig."capture.props"."device.icon-name" = "audio-headphones";
|
||||
filterText = ''
|
||||
Preamp: -5.7 dB
|
||||
|
|
|
|||
22
modules/desktop/waybar-wireplumber-db.patch
Normal file
22
modules/desktop/waybar-wireplumber-db.patch
Normal file
|
|
@ -0,0 +1,22 @@
|
|||
diff --git a/src/modules/wireplumber.cpp b/src/modules/wireplumber.cpp
|
||||
index a43ad29b..d04edd18 100644
|
||||
--- a/src/modules/wireplumber.cpp
|
||||
+++ b/src/modules/wireplumber.cpp
|
||||
@@ -436,7 +437,7 @@ auto waybar::modules::Wireplumber::update() -> void {
|
||||
label_.get_style_context()->remove_class("source-muted");
|
||||
}
|
||||
|
||||
- int vol = round(volume_ * 100.0);
|
||||
+ double vol = 20 * std::log10(volume_); // % to dB
|
||||
int source_vol = round(source_volume_ * 100.0);
|
||||
|
||||
// Get the state and apply state-specific format if available
|
||||
@@ -450,7 +451,7 @@ auto waybar::modules::Wireplumber::update() -> void {
|
||||
}
|
||||
|
||||
// Prepare source format string (similar to PulseAudio)
|
||||
- std::string format_source = "{volume}%";
|
||||
+ std::string format_source = "{volume}dB";
|
||||
if (source_muted_) {
|
||||
if (config_["format-source-muted"].isString()) {
|
||||
format_source = config_["format-source-muted"].asString();
|
||||
|
|
@ -28,8 +28,8 @@ let
|
|||
"battery"
|
||||
"power-profiles-daemon"
|
||||
"backlight"
|
||||
"cpu"
|
||||
"temperature"
|
||||
"cpu"
|
||||
"memory"
|
||||
"disk"
|
||||
"network"
|
||||
|
|
@ -53,11 +53,13 @@ let
|
|||
max-length = 80;
|
||||
};
|
||||
wireplumber = {
|
||||
"format" = "{icon} {volume}%";
|
||||
"format-muted" = " MUTE";
|
||||
"format" = "{icon} {volume:.2f} dB";
|
||||
"format-muted" = " -inf dB";
|
||||
# "on-click" = "${pkgs.pwvucontrol}/bin/pwvucontrol";
|
||||
"on-click" = "${pkgs.pavucontrol}/bin/pavucontrol";
|
||||
"on-click-right" = "${pkgs.wireplumber}/bin/wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle";
|
||||
"on-scroll-up" = "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ -l 1 1%+";
|
||||
"on-scroll-down" = "${pkgs.wireplumber}/bin/wpctl set-volume @DEFAULT_AUDIO_SINK@ -l 1 1%-";
|
||||
"format-icons" = [
|
||||
""
|
||||
""
|
||||
|
|
@ -76,8 +78,8 @@ let
|
|||
""
|
||||
""
|
||||
];
|
||||
"on-scroll-up" = "${pkgs.brightnessctl}/bin/brightnessctl s +10";
|
||||
"on-scroll-down" = "${pkgs.brightnessctl}/bin/brightnessctl s 10-";
|
||||
"on-scroll-up" = "${pkgs.light}/bin/light -A 5";
|
||||
"on-scroll-down" = "${pkgs.light}/bin/light -U 5";
|
||||
};
|
||||
"idle_inhibitor" = {
|
||||
format = "{icon} ";
|
||||
|
|
@ -104,7 +106,7 @@ let
|
|||
};
|
||||
"cpu" = {
|
||||
"interval" = 10;
|
||||
"format" = " {:0.0f}%";
|
||||
"format" = " {:0.0f}%";
|
||||
"max-length" = 10;
|
||||
};
|
||||
"temperature" = {
|
||||
|
|
@ -138,9 +140,9 @@ let
|
|||
};
|
||||
};
|
||||
disk = {
|
||||
format = " {specific_used:0.0f}/{specific_total:0.0f}GB";
|
||||
unit = "GB";
|
||||
path = "/persistent";
|
||||
format = " {specific_used:0.1f}/{specific_total:0.1f}TB";
|
||||
unit = "TB";
|
||||
path = "/";
|
||||
};
|
||||
"network" = {
|
||||
"on-click" =
|
||||
|
|
@ -429,7 +431,12 @@ in
|
|||
};
|
||||
config = lib.mkIf cfg.enable {
|
||||
programs.waybar.enable = true;
|
||||
programs.waybar.package = cfg.package;
|
||||
programs.waybar.package = cfg.package.overrideAttrs (super: {
|
||||
# version = super.version + "-patched";
|
||||
patches = [
|
||||
./waybar-wireplumber-db.patch
|
||||
];
|
||||
});
|
||||
programs.light.enable = true;
|
||||
|
||||
systemd.user.services.waybar.wantedBy = lib.mkForce [ cfg.wantedBy ];
|
||||
|
|
|
|||
|
|
@ -114,6 +114,7 @@ in
|
|||
w3m
|
||||
yt-dlp
|
||||
p7zip
|
||||
ncdu
|
||||
];
|
||||
programs.mosh.enable = true;
|
||||
environment.variables.EDITOR = "hx";
|
||||
|
|
|
|||
|
|
@ -26,7 +26,7 @@ in
|
|||
|
||||
environment.systemPackages = with pkgs; [
|
||||
unstable.jetbrains.rider
|
||||
android-studio
|
||||
# android-studio
|
||||
nixpkgs-manual
|
||||
nixpkgs-manual.lib-docs
|
||||
podman-compose
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue