diff options
| author | OPNA2608 <opna2608@protonmail.com> | 2024-05-21 16:15:23 +0200 |
|---|---|---|
| committer | OPNA2608 <opna2608@protonmail.com> | 2024-05-21 16:15:23 +0200 |
| commit | af545969b68d0140ea6f68fb89d76e2e550d5e60 (patch) | |
| tree | 9c1191adcbf1a083401ee456920406191aac73a9 | |
| parent | a7440c78739f6d379c580e61b02fed4fa7f3586c (diff) | |
nixos/lomiri: Add sound indicator
| -rw-r--r-- | nixos/modules/services/desktop-managers/lomiri.nix | 3 | ||||
| -rw-r--r-- | nixos/tests/lomiri.nix | 8 |
2 files changed, 10 insertions, 1 deletions
diff --git a/nixos/modules/services/desktop-managers/lomiri.nix b/nixos/modules/services/desktop-managers/lomiri.nix index 0a1b86096e765..d16c3c750da63 100644 --- a/nixos/modules/services/desktop-managers/lomiri.nix +++ b/nixos/modules/services/desktop-managers/lomiri.nix @@ -38,6 +38,7 @@ in { ]); }; + hardware.pulseaudio.enable = lib.mkDefault true; networking.networkmanager.enable = lib.mkDefault true; systemd.packages = with pkgs.lomiri; [ @@ -74,6 +75,8 @@ in { ayatana-indicator-messages ayatana-indicator-power ayatana-indicator-session + ] ++ lib.optionals (config.hardware.pulseaudio.enable || config.services.pipewire.pulse.enable) [ + ayatana-indicator-sound ]) ++ (with pkgs.lomiri; [ telephony-service ] ++ lib.optionals config.networking.networkmanager.enable [ diff --git a/nixos/tests/lomiri.nix b/nixos/tests/lomiri.nix index 3f20aae441351..b0be3baa20fbc 100644 --- a/nixos/tests/lomiri.nix +++ b/nixos/tests/lomiri.nix @@ -290,7 +290,7 @@ in { # There's a test app we could use that also displays their contents, but it's abit inconsistent. with subtest("ayatana indicators work"): mouse_click(735, 0) # the cog in the top-right, for the session indicator - machine.wait_for_text(r"(Notifications|Battery|Time|Date|System)") + machine.wait_for_text(r"(Notifications|Battery|Sound|Time|Date|System)") machine.screenshot("indicators_open") # Indicator order within the menus *should* be fixed based on per-indicator order setting @@ -298,6 +298,7 @@ in { machine.send_key("left") machine.send_key("left") machine.send_key("left") + machine.send_key("left") # Notifications are usually empty, nothing to check there with subtest("lomiri indicator network works"): @@ -305,6 +306,11 @@ in { machine.wait_for_text(r"(Flight|Wi-Fi)") machine.screenshot("indicators_network") + with subtest("lomiri indicator sound works"): + machine.send_key("right") + machine.wait_for_text(r"(Silent|Volume)") + machine.screenshot("indicators_sound") + with subtest("ayatana indicator power works"): machine.send_key("right") machine.wait_for_text(r"(Charge|Battery settings)") |