From 7d592d60ca5f46040ad11f03c29a6712a230b5c2 Mon Sep 17 00:00:00 2001 From: 4Lost Date: Sat, 15 Nov 2025 13:35:34 +0100 Subject: [PATCH] fix audio in eww and dolphin applications --- configuration.nix | 8 +++++--- home/programs/dolphin.nix | 3 +++ home/programs/eww/src/scripts/audio.sh | 11 ++++++----- home/programs/river/default.nix | 8 ++++---- 4 files changed, 18 insertions(+), 12 deletions(-) diff --git a/configuration.nix b/configuration.nix index 037bf6c..5cf5bae 100644 --- a/configuration.nix +++ b/configuration.nix @@ -46,7 +46,7 @@ displayManager = { sddm = { enable = true; - theme = "catppuccin-mocha"; + theme = "catppuccin-mocha-mauve"; wayland.enable = true; }; #autoLogin = { @@ -83,10 +83,12 @@ environment.systemPackages = with pkgs; [ (catppuccin-sddm.override { flavor = "mocha"; - font = "Fira Code"; + accent = "mauve"; + font = "Fira Code"; fontSize = "9"; + # background = "${./wallpaper.png}"; + loginBackground = true; }) - exiftool flutter diff --git a/home/programs/dolphin.nix b/home/programs/dolphin.nix index 261a27c..033887f 100644 --- a/home/programs/dolphin.nix +++ b/home/programs/dolphin.nix @@ -4,7 +4,10 @@ home.packages = with pkgs; [ kdePackages.dolphin kdePackages.dolphin-plugins + kdePackages.baloo-widgets + kdePackages.baloo nautilus udisks ]; + xdg.configFile."menus/applications.menu".source = "${pkgs.kdePackages.plasma-workspace}/etc/xdg/menus/plasma-applications.menu"; } diff --git a/home/programs/eww/src/scripts/audio.sh b/home/programs/eww/src/scripts/audio.sh index 20d0949..f56a49e 100755 --- a/home/programs/eww/src/scripts/audio.sh +++ b/home/programs/eww/src/scripts/audio.sh @@ -1,9 +1,10 @@ -mute=$(wpctl get-volume @DEFAULT_SINK@ | grep -o "muted") -volume=$(wpctl get-volume @DEFAULT_SINK@ | awk '{print int($1*100)}') +# /-- Get Information --> +sink_info=$(wpctl get-volume @DEFAULT_AUDIO_SINK@) +volume=$(echo "$sink_info" | awk '{print int($2 * 100)}') +mic_info=$(wpctl get-volume @DEFAULT_AUDIO_SOURCE@) # /-- Mic --> -mic_mute=$(wpctl get-volume @DEFAULT_SOURCE@ | grep -o "muted") -if [[ "$mic_mute" == "muted" ]]; then +if echo "$mic_info" | grep -q "\[MUTED\]"; then eww update micClass="micOff" eww update micIcon="󰍭" else @@ -13,7 +14,7 @@ fi # /-- Speaker --> -if [[ "$mute" == "yes" ]]; then +if echo "$sink_info" | grep -q "\[MUTED\]"; then eww update speakerClass="speakerOff" eww update speakerIcon="" elif [[ "$volume" -le 100 ]]; then diff --git a/home/programs/river/default.nix b/home/programs/river/default.nix index a3552db..00b5cb0 100644 --- a/home/programs/river/default.nix +++ b/home/programs/river/default.nix @@ -107,10 +107,10 @@ "Super Down" = ''send-layout-cmd rivertile "main-location bottom"''; "Super Left" = ''send-layout-cmd rivertile "main-location left"''; # Audio - "None XF86AudioRaiseVolume" = "spawn 'pactl set-sink-volume @DEFAULT_SINK@ +10%'"; - "None XF86AudioLowerVolume" = "spawn 'pactl set-sink-volume @DEFAULT_SINK@ -10%'"; - "None XF86AudioMute" = "spawn 'pactl set-sink-mute @DEFAULT_SINK@ toggle'"; - "None XF86AudioMicMute" = "spawn 'pactl set-source-mute @DEFAULT_SOURCE@ toggle'"; + "None XF86AudioRaiseVolume" = "spawn 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1+'"; + "None XF86AudioLowerVolume" = "spawn 'wpctl set-volume @DEFAULT_AUDIO_SINK@ 0.1-'"; + "None XF86AudioMute" = "spawn 'wpctl set-mute @DEFAULT_AUDIO_SINK@ toggle'"; + "None XF86AudioMicMute" = "spawn 'wpctl set-mute @DEFAULT_AUDIO_SOURCE@ toggle'"; # Brightness "None XF86MonBrightnessUp" = "spawn 'xbacklight -inc 10'"; "None XF86MonBrightnessDown" = "spawn 'xbacklight -dec 10'";