change version to 1.6.1

use it instead of pkill in the flatpak wrapper

.github/FUNDING.yml

@@ -0,0 +1 @@
+custom: ['https://boosty.to/arabian']

.github/workflows/git-archive.yml

@@ -0,0 +1,84 @@
+name: Git archive
+
+permissions:
+  contents: write
+  packages: write
+
+on:
+  push:
+    branches: [main, master]
+  workflow_dispatch:
+
+jobs:
+  build-and-upload:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install apt deps (jq/zip + dev-libs)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            zip jq \
+            libpipewire-0.3-dev \
+            libclang-dev \
+            libasound2-dev
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Extract all binary names
+        id: cargo-meta
+        run: |
+          set -euo pipefail
+          BIN_NAMES=$(cargo metadata --no-deps --format-version 1 \
+            | jq -r '.packages[0].targets[] | select(.kind[] | contains("bin")) | .name')
+          # сохраним построчно в выход
+          echo "bin_names<<EOF" >> $GITHUB_OUTPUT
+          echo "$BIN_NAMES" >> $GITHUB_OUTPUT
+          echo "EOF" >> $GITHUB_OUTPUT
+
+      - name: Build all release binaries
+        run: cargo build --release --locked
+
+      - name: Package all binaries into one archive
+        shell: bash
+        run: |
+          set -euo pipefail
+          COMMIT_SHA="${{ github.sha }}"
+          ARCHIVE_NAME="pwsp-${COMMIT_SHA}-linux-x64.zip"
+          echo "Creating archive: $ARCHIVE_NAME"
+
+          FILES=()
+          while IFS= read -r BIN; do
+            [ -z "$BIN" ] && continue
+            FILES+=("target/release/$BIN")
+          done <<< "${{ steps.cargo-meta.outputs.bin_names }}"
+
+          if [ "${#FILES[@]}" -eq 0 ]; then
+            echo "Error: no binaries were discovered via cargo metadata." >&2
+            exit 1
+          fi
+
+          for f in "${FILES[@]}"; do
+            if [ ! -f "$f" ]; then
+              echo "Error: expected binary not found: $f" >&2
+              exit 1
+            fi
+            echo "Will add: $f"
+          done
+
+          zip -j "$ARCHIVE_NAME" "${FILES[@]}"
+
+      - name: Upload archive as artifact
+        uses: actions/upload-artifact@v4
+        with:
+          name: archive
+          path: pwsp-*.zip
+          retention-days: 7

.github/workflows/git-deb.yml

@@ -0,0 +1,53 @@
+name: Git deb
+
+permissions:
+  contents: write
+  packages: write
+
+on:
+  push:
+    branches: [main, master]
+  workflow_dispatch:
+
+jobs:
+  build-and-upload:
+    runs-on: ubuntu-latest
+
+    steps:
+      - name: Install apt deps (jq/zip + dev-libs)
+        run: |
+          sudo apt-get update
+          sudo apt-get install -y \
+            zip jq \
+            libpipewire-0.3-dev \
+            libclang-dev \
+            libasound2-dev
+
+      - name: Checkout code
+        uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - name: Setup Rust toolchain
+        uses: actions-rs/toolchain@v1
+        with:
+          toolchain: stable
+
+      - name: Build all release binaries
+        run: cargo build --release --locked
+
+      - name: Install cargo-deb and create .deb
+        shell: bash
+        run: |
+          set -euo pipefail
+          cargo install --locked cargo-deb
+          export PATH="$HOME/.cargo/bin:$PATH"
+
+          cargo-deb
+
+      - name: Upload .deb(s) as artifacts
+        uses: actions/upload-artifact@v4
+        with:
+          name: deb-packages
+          path: target/debian/*.deb
+          retention-days: 7

.github/workflows/git-flatpak.yml

@@ -0,0 +1,27 @@
+name: Git Flatpak
+
+on:
+    push:
+        branches: [main, master]
+    pull_request:
+        branches: [main, master]
+    workflow_dispatch:
+
+jobs:
+    flatpak-build:
+        runs-on: ubuntu-latest
+        container:
+            image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
+            options: --privileged
+
+        steps:
+            - uses: actions/checkout@v4
+
+            - name: Build Flatpak
+              uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+              with:
+                  bundle: ru.arabianq.pwsp.flatpak
+                  manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
+                  cache: true
+                  branch: master
+                  build-bundle: true

.github/workflows/release-archive.yml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Tag to attach assets to (e.g. v1.0.0)'
+        description: "Tag to attach assets to (e.g. v1.0.0)"
         required: false
 
 jobs:
@@ -32,7 +32,6 @@ jobs:
         run: |
           set -euo pipefail
 
-          # приоритет 1: входной параметр workflow_dispatch
           INPUT_TAG="${{ github.event.inputs.tag || '' }}"
           if [ -n "$INPUT_TAG" ]; then
             echo "Using input tag: $INPUT_TAG"
@@ -40,7 +39,6 @@ jobs:
             exit 0
           fi
 
-          # приоритет 2: если запущено событием release
           EVENT_TAG="${{ github.event.release.tag_name || '' }}"
           if [ -n "$EVENT_TAG" ]; then
             echo "Using event tag: $EVENT_TAG"
@@ -48,14 +46,12 @@ jobs:
             exit 0
           fi
 
-          # приоритет 3: если GITHUB_REF — refs/tags/...
           if [[ "${GITHUB_REF:-}" =~ ^refs/tags/(.+)$ ]]; then
             echo "Using GITHUB_REF tag: ${BASH_REMATCH[1]}"
             echo "tag=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
             exit 0
           fi
 
-          # приоритет 4: пробуем получить последний релиз через API
           echo "No tag in input/event/GITHUB_REF — querying latest release via API..."
           LATEST_JSON=$(curl -sSf -H "Authorization: Bearer $GITHUB_TOKEN" -H "Accept: application/vnd.github+json" "https://api.github.com/repos/${{ github.repository }}/releases/latest" || true)
           TAG_NAME=$(echo "$LATEST_JSON" | jq -r '.tag_name // empty')
@@ -91,7 +87,6 @@ jobs:
           set -euo pipefail
           BIN_NAMES=$(cargo metadata --no-deps --format-version 1 \
             | jq -r '.packages[0].targets[] | select(.kind[] | contains("bin")) | .name')
-          # сохраним построчно в выход
           echo "bin_names<<EOF" >> $GITHUB_OUTPUT
           echo "$BIN_NAMES" >> $GITHUB_OUTPUT
           echo "EOF" >> $GITHUB_OUTPUT
@@ -107,7 +102,6 @@ jobs:
           ARCHIVE_NAME="pwsp-${TAG}-linux-x64.zip"
           echo "Creating archive: $ARCHIVE_NAME"
 
-          # читаем построчно список бинарников и формируем массив файлов
           FILES=()
           while IFS= read -r BIN; do
             [ -z "$BIN" ] && continue
@@ -119,7 +113,6 @@ jobs:
             exit 1
           fi
 
-          # проверим, что все бинарники действительно есть
           for f in "${FILES[@]}"; do
             if [ ! -f "$f" ]; then
               echo "Error: expected binary not found: $f" >&2
@@ -128,7 +121,6 @@ jobs:
             echo "Will add: $f"
           done
 
-          # создаём архив с бинарниками внутри как просто pwsp-gui, pwsp-daemon, pwsp-cli
           zip -j "$ARCHIVE_NAME" "${FILES[@]}"
 
       - name: Upload release archive

.github/workflows/release-deb.yml

@@ -10,7 +10,7 @@ on:
   workflow_dispatch:
     inputs:
       tag:
-        description: 'Tag to attach assets to (e.g. v1.0.0)'
+        description: "Tag to attach assets to (e.g. v1.0.0)"
         required: false
 
 jobs:

.github/workflows/release-flatpak.yml

@@ -0,0 +1,72 @@
+name: Release Flatpak
+
+permissions:
+    contents: write
+
+on:
+    release:
+        types: [created]
+    workflow_dispatch:
+        inputs:
+            tag:
+                description: "Tag to attach assets to (e.g. v1.0.0)"
+                required: false
+
+jobs:
+    flatpak-release:
+        runs-on: ubuntu-latest
+        container:
+            image: bilelmoussaoui/flatpak-github-actions:freedesktop-24.08
+            options: --privileged
+
+        steps:
+            - name: Determine tag to use
+              id: tag
+              run: |
+                  set -euo pipefail
+
+                  INPUT_TAG="${{ github.event.inputs.tag || '' }}"
+                  if [ -n "$INPUT_TAG" ]; then
+                    echo "tag=$INPUT_TAG" >> $GITHUB_OUTPUT
+                    exit 0
+                  fi
+
+                  EVENT_TAG="${{ github.event.release.tag_name || '' }}"
+                  if [ -n "$EVENT_TAG" ]; then
+                    echo "tag=$EVENT_TAG" >> $GITHUB_OUTPUT
+                    exit 0
+                  fi
+
+                  if [[ "${GITHUB_REF:-}" =~ ^refs/tags/(.+)$ ]]; then
+                    echo "tag=${BASH_REMATCH[1]}" >> $GITHUB_OUTPUT
+                    exit 0
+                  fi
+
+                  echo "No tag found"
+                  echo "tag=" >> $GITHUB_OUTPUT
+
+            - name: Fail if no tag determined
+              if: ${{ steps.tag.outputs.tag == '' }}
+              run: |
+                  echo "ERROR: No tag determined."
+                  exit 1
+
+            - uses: actions/checkout@v4
+              with:
+                  ref: ${{ steps.tag.outputs.tag }}
+
+            - name: Build Flatpak
+              uses: flatpak/flatpak-github-actions/flatpak-builder@v6
+              with:
+                  bundle: ru.arabianq.pwsp.flatpak
+                  manifest-path: packages/flatpak/ru.arabianq.pwsp.yaml
+                  cache: true
+                  branch: master
+                  build-bundle: true
+
+            - name: Upload Flatpak to release
+              uses: softprops/action-gh-release@v2
+              with:
+                  token: ${{ secrets.GITHUB_TOKEN }}
+                  tag_name: ${{ steps.tag.outputs.tag }}
+                  files: ru.arabianq.pwsp.flatpak

.gitmodules

@@ -0,0 +1,9 @@
+[submodule "packages/aur"]
+	path = packages/aur
+	url = ssh://aur@aur.archlinux.org/pwsp.git
+[submodule "packages/aur/standart"]
+	path = packages/aur/standart
+	url = ssh://aur@aur.archlinux.org/pwsp.git
+[submodule "packages/aur/bin"]
+	path = packages/aur/bin
+	url = ssh://aur@aur.archlinux.org/pwsp-bin.git

Cargo.toml

@@ -1,6 +1,6 @@
 [package]
 name = "pwsp"
-version = "1.5.0"
+version = "1.6.1"
 edition = "2024"
 authors = ["arabian"]
 description = "PWSP lets you play audio files through your microphone. Has both CLI and GUI clients."
@@ -18,16 +18,37 @@ async-trait = "0.1.89"
 serde = { version = "1.0.228", features = ["derive"] }
 serde_json = "1.0.149"
 
-clap = { version = "4.5.55", default-features = false, features = ["std", "suggestions", "help", "usage", "error-context", "derive"] }
+clap = { version = "4.5.60", default-features = false, features = [
+    "std",
+    "suggestions",
+    "help",
+    "usage",
+    "error-context",
+    "derive",
+] }
 dirs = "6.0.0"
 itertools = "0.14.0"
 
-rodio = { version = "0.21.1", default-features = false, features = ["symphonia-all", "playback"] }
+rodio = { version = "0.22.1", default-features = false, features = [
+    "symphonia-all",
+    "playback",
+] }
 pipewire = "0.9.2"
-rfd = { version = "0.17.2", default-features = false, features = ["xdg-portal"]}
+rfd = { version = "0.17.2", default-features = false, features = [
+    "xdg-portal",
+] }
+opener = { version = "0.8.4", features = ["reveal"] }
 
-egui = { version = "0.33.3", default-features = false, features = ["default_fonts", "rayon"] }
-eframe = { version = "0.33.3", default-features = false, features = ["default_fonts", "glow", "x11", "wayland"] }
+egui = { version = "0.33.3", default-features = false, features = [
+    "default_fonts",
+    "rayon",
+] }
+eframe = { version = "0.33.3", default-features = false, features = [
+    "default_fonts",
+    "glow",
+    "x11",
+    "wayland",
+] }
 egui_material_icons = "0.5.0"
 egui_dnd = "0.14.0"
 
@@ -52,10 +73,34 @@ panic = "abort"
 
 [package.metadata.deb]
 assets = [
-    ["target/release/pwsp-daemon", "usr/bin/", "755"],
-    ["target/release/pwsp-cli", "usr/bin/", "755"],
-    ["target/release/pwsp-gui", "usr/bin/", "755"],
-    ["assets/pwsp-gui.desktop", "usr/share/applications/pwsp.desktop", "644"],
-    ["assets/icon.png", "usr/share/icons/hicolor/256x256/apps/pwsp.png", "644"],
-    ["assets/pwsp-daemon.service", "usr/lib/systemd/user/pwsp-daemon.service", "644"],
+    [
+        "target/release/pwsp-daemon",
+        "usr/bin/",
+        "755",
+    ],
+    [
+        "target/release/pwsp-cli",
+        "usr/bin/",
+        "755",
+    ],
+    [
+        "target/release/pwsp-gui",
+        "usr/bin/",
+        "755",
+    ],
+    [
+        "assets/pwsp-gui.desktop",
+        "usr/share/applications/pwsp.desktop",
+        "644",
+    ],
+    [
+        "assets/icon.png",
+        "usr/share/icons/hicolor/256x256/apps/pwsp.png",
+        "644",
+    ],
+    [
+        "assets/pwsp-daemon.service",
+        "usr/lib/systemd/user/pwsp-daemon.service",
+        "644",
+    ],
 ]

README.md

@@ -76,7 +76,7 @@ sudo dnf install pwsp
 There is pwsp package in AUR.
 You can install it using yay, paru or any other AUR helper.
 ```bash
-paru pwsp
+paru pwsp-bin # or paru pwsp to build it locally
 ```
 
 ## **Installing using cargo**
@@ -208,3 +208,6 @@ a [pull request](https://github.com/arabianq/pipewire-soundpad/pulls).
 
 This project is licensed under
 the [MIT License](https://github.com/arabianq/pipewire-soundpad/blob/main/LICENSE).
+
+# **🤖 AI Wiki**
+[![Ask DeepWiki](https://deepwiki.com/badge.svg)](https://deepwiki.com/arabianq/pipewire-soundpad)

packages/flatpak/pwsp-wrapper.py

@@ -0,0 +1,35 @@
+#!/usr/bin/env python3
+
+import argparse
+import subprocess
+
+if __name__ == "__main__":
+    parser = argparse.ArgumentParser(
+        prog="PWSP Flatpak",
+        add_help=True,
+        exit_on_error=True
+    )
+    subparsers = parser.add_subparsers(dest="command")
+
+    cli_parser = subparsers.add_parser("cli", add_help=False, prefix_chars=" ")
+    cli_parser.add_argument("args", nargs=argparse.REMAINDER, help="Arguments for pwsp-cli")
+
+    daemon_parser = subparsers.add_parser("daemon", add_help=True)
+    daemon_group = daemon_parser.add_mutually_exclusive_group(required=True)
+    daemon_group.add_argument("--start", action="store_true", help="Start pwps-daemon")
+    daemon_group.add_argument("--kill", action="store_true", help="Kill pwsp-daemon")
+
+    args = parser.parse_args()
+
+    command = args.command
+    if not command:
+        subprocess.Popen("pwsp-daemon")
+        subprocess.Popen("pwsp-gui")
+    else:
+        if command == "cli":
+            subprocess.Popen(["pwsp-cli"] + args.args)
+        elif command == "daemon":
+            if args.start:
+                subprocess.Popen("pwsp-daemon")
+            elif args.kill:
+                subprocess.Popen(["pwsp-cli", "action", "kill"])

packages/flatpak/ru.arabianq.pwsp.desktop

@@ -0,0 +1,9 @@
+[Desktop Entry]
+Name=PWSP (Soundpad)
+Comment=Let's you play audio files through you microphone
+Exec=pwsp-wrapper.py %u
+Icon=ru.arabianq.pwsp
+Terminal=false
+Type=Application
+Categories=Audio;Utility;
+Keywords=soundpad;pipewire;audio;

packages/flatpak/ru.arabianq.pwsp.metainfo.xml

@@ -0,0 +1,25 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<component type="desktop-application">
+    <id>ru.arabianq.pwsp</id>
+    <metadata_license>CC0-1.0</metadata_license>
+    <project_license>MIT</project_license>
+    <name>PWSP</name>
+    <summary>Play audio files through your microphone using PipeWire</summary>
+    <description>
+        <p>
+            PWSP (PipeWire Soundpad) is a tool that allows you to play audio files through your
+            microphone.
+            It features both a graphical user interface and a command-line interface.
+        </p>
+    </description>
+    <launchable type="desktop-id">ru.arabianq.pwsp.desktop</launchable>
+    <screenshots>
+        <screenshot type="default">
+            <image>
+                https://raw.githubusercontent.com/arabianq/pipewire-soundpad/master/assets/screenshot.png</image>
+        </screenshot>
+    </screenshots>
+    <url type="homepage">https://pwsp.arabianq.ru</url>
+    <developer_name>arabian</developer_name>
+    <content_rating type="oars-1.1" />
+</component>

packages/flatpak/ru.arabianq.pwsp.yaml

@@ -0,0 +1,47 @@
+app-id: ru.arabianq.pwsp
+runtime: org.freedesktop.Platform
+runtime-version: "24.08"
+sdk: org.freedesktop.Sdk
+sdk-extensions:
+  - org.freedesktop.Sdk.Extension.rust-stable
+  - org.freedesktop.Sdk.Extension.llvm20
+command: pwsp-wrapper.py
+finish-args:
+  - --share=ipc
+  - --socket=fallback-x11
+  - --socket=wayland
+  - --socket=pulseaudio
+  - --filesystem=xdg-run/pipewire-0
+  - --filesystem=xdg-run/pwsp:create
+  - --filesystem=xdg-run/app/ru.arabianq.pwsp:create
+  - --filesystem=host
+  - --device=all
+  - --device=dri
+  - --share=network
+  - --talk-name=org.freedesktop.portal.Desktop
+  - --talk-name=org.freedesktop.portal.Documents
+
+build-options:
+  append-path: /usr/lib/sdk/rust-stable/bin:/usr/lib/sdk/llvm20/bin
+  env:
+    CARGO_HOME: /run/build/pwsp/cargo
+    LIBCLANG_PATH: /usr/lib/sdk/llvm20/lib
+
+modules:
+  - name: pwsp
+    buildsystem: simple
+    build-options:
+      build-args:
+        - --share=network
+    build-commands:
+      - cargo build --release
+      - install -Dm755 target/release/pwsp-daemon /app/bin/pwsp-daemon
+      - install -Dm755 target/release/pwsp-cli /app/bin/pwsp-cli
+      - install -Dm755 target/release/pwsp-gui /app/bin/pwsp-gui
+      - install -Dm755 packages/flatpak/pwsp-wrapper.py /app/bin/pwsp-wrapper.py
+      - install -Dm644 assets/icon.png /app/share/icons/hicolor/256x256/apps/ru.arabianq.pwsp.png
+      - install -Dm644 packages/flatpak/ru.arabianq.pwsp.desktop /app/share/applications/ru.arabianq.pwsp.desktop
+      - install -Dm644 packages/flatpak/ru.arabianq.pwsp.metainfo.xml /app/share/metainfo/ru.arabianq.pwsp.metainfo.xml
+    sources:
+      - type: dir
+        path: ../../

packages/rpm/pwsp.spec

@@ -4,7 +4,7 @@
 %global cargo_install_lib 0
 
 Name:            pwsp
-Version:         1.5.0
+Version:         1.6.1
 Release:         %autorelease
 Summary:         Lets you play audio files through your microphone
 

src/bin/cli.rs

@@ -35,6 +35,8 @@ enum Commands {
 enum Actions {
     /// Ping the daemon
     Ping,
+    /// Kill the daemon
+    Kill,
     /// Pause audio playback
     Pause {
         #[clap(short, long)]
@@ -92,6 +94,8 @@ enum GetCommands {
     Input,
     /// All audio inputs
     Inputs,
+    /// Version of the daemon
+    DaemonVersion,
     /// Full player state
     FullState,
 }
@@ -129,6 +133,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
     let request = match cli.command {
         Commands::Action { action } => match action {
             Actions::Ping => Request::ping(),
+            Actions::Kill => Request::kill(),
             Actions::Pause { id } => Request::pause(id),
             Actions::Resume { id } => Request::resume(id),
             Actions::TogglePause { id } => Request::toggle_pause(id),
@@ -148,6 +153,7 @@ async fn main() -> Result<(), Box<dyn Error>> {
             GetCommands::Tracks => Request::get_tracks(),
             GetCommands::Input => Request::get_input(),
             GetCommands::Inputs => Request::get_inputs(),
+            GetCommands::DaemonVersion => Request::get_daemon_version(),
             GetCommands::FullState => Request::get_full_state(),
         },
         Commands::Set { parameter } => match parameter {

src/bin/daemon.rs

@@ -111,6 +111,10 @@ async fn commands_loop(listener: UnixListener) -> Result<(), Box<dyn Error>> {
                 return;
             }
             // ---------- Send response (end) ----------
+
+            if response.status && response.message.eq("killed") {
+                std::process::exit(0);
+            }
         });
     }
 }

src/gui/draw.rs

@@ -4,13 +4,11 @@ use egui::{
     Layout, RichText, ScrollArea, Sense, Slider, TextEdit, Ui, Vec2,
 };
 use egui_dnd::dnd;
-use egui_material_icons::icons;
-use pwsp::types::audio_player::TrackInfo;
+use egui_material_icons::icons::*;
+use pwsp::types::{audio_player::TrackInfo, gui::AppState};
 use pwsp::utils::gui::format_time_pair;
 use std::{error::Error, time::Instant};
 
-use pwsp::types::gui::AppState;
-
 enum TrackAction {
     Pause(u32),
     Resume(u32),
@@ -21,13 +19,13 @@ enum TrackAction {
 impl SoundpadGui {
     fn get_volume_icon(volume: f32) -> &'static str {
         if volume > 0.7 {
-            icons::ICON_VOLUME_UP
+            ICON_VOLUME_UP
         } else if volume <= 0.0 {
-            icons::ICON_VOLUME_OFF
+            ICON_VOLUME_OFF
         } else if volume < 0.3 {
-            icons::ICON_VOLUME_MUTE
+            ICON_VOLUME_MUTE
         } else {
-            icons::ICON_VOLUME_DOWN
+            ICON_VOLUME_DOWN
         }
     }
 
@@ -46,7 +44,7 @@ impl SoundpadGui {
             ui.spacing_mut().item_spacing.y = 5.0;
             // --------- Back Button and Title ----------
             ui.horizontal_top(|ui| {
-                let back_button = Button::new(icons::ICON_ARROW_BACK).frame(false);
+                let back_button = Button::new(ICON_ARROW_BACK).frame(false);
                 let back_button_response = ui.add(back_button);
                 if back_button_response.clicked() {
                     self.app_state.show_settings = false;
@@ -83,6 +81,10 @@ impl SoundpadGui {
                 self.config.save_to_file().ok();
             }
             // --------------------------------
+
+            ui.with_layout(Layout::bottom_up(Align::Min), |ui| {
+                ui.label(format!("GUI version: {}", env!("CARGO_PKG_VERSION")));
+            });
         });
     }
 
@@ -169,9 +171,9 @@ impl SoundpadGui {
         ui.horizontal_top(|ui| {
             // ---------- Play Button ----------
             let play_button = Button::new(if track.paused {
-                icons::ICON_PLAY_ARROW
+                ICON_PLAY_ARROW
             } else {
-                icons::ICON_PAUSE
+                ICON_PAUSE
             })
             .corner_radius(15.0);
 
@@ -188,9 +190,9 @@ impl SoundpadGui {
             // ---------- Loop Button ----------
             let loop_button = Button::new(
                 RichText::new(if track.looped {
-                    icons::ICON_REPEAT_ONE
+                    ICON_REPEAT_ONE
                 } else {
-                    icons::ICON_REPEAT
+                    ICON_REPEAT
                 })
                 .size(18.0),
             )
@@ -248,7 +250,7 @@ impl SoundpadGui {
             // --------------------------------
 
             // ---------- Stop Button ---------
-            let stop_button = Button::new(icons::ICON_CLOSE).frame(false);
+            let stop_button = Button::new(ICON_CLOSE).frame(false);
             let stop_button_response = ui.add_sized([30.0, 30.0], stop_button);
             if stop_button_response.clicked() {
                 action = Some(TrackAction::Stop(track.id));
@@ -311,7 +313,7 @@ impl SoundpadGui {
                     let path = item.clone();
                     ui.horizontal(|ui| {
                         handle.ui(ui, |ui| {
-                            ui.label(icons::ICON_DRAG_INDICATOR);
+                            ui.label(ICON_DRAG_INDICATOR);
                         });
                         let name = path
                             .file_name()
@@ -333,18 +335,46 @@ impl SoundpadGui {
                             self.open_dir(&path);
                         }
 
-                        let delete_dir_button = Button::new(icons::ICON_DELETE).frame(false);
+                        let delete_dir_button = Button::new(ICON_DELETE).frame(false);
                         let delete_dir_button_response =
                             ui.add_sized([18.0, 18.0], delete_dir_button);
                         if delete_dir_button_response.clicked() {
-                            self.remove_dir(&path.clone());
+                            self.app_state.dirs_to_remove.insert(path.clone());
                         }
+
+                        // Context menu
+                        dir_button_response.context_menu(|ui| {
+                            if ui
+                                .button(format!("{} {}", ICON_OPEN_IN_NEW, "Show"))
+                                .clicked()
+                            {
+                                self.open_dir(&path);
+                            }
+
+                            if ui
+                                .button(format!(
+                                    "{} {}",
+                                    ICON_OPEN_IN_BROWSER, "Open in File Manager"
+                                ))
+                                .clicked()
+                            {
+                                if let Err(e) = opener::open(&path) {
+                                    eprintln!("Failed to open file manager: {}", e);
+                                }
+                            }
+
+                            ui.separator();
+
+                            if ui.button(format!("{} {}", ICON_DELETE, "Remove")).clicked() {
+                                self.app_state.dirs_to_remove.insert(path.clone());
+                            }
+                        });
                     });
                 });
                 self.app_state.dirs = dirs;
 
                 ui.horizontal(|ui| {
-                    let add_dirs_button = Button::new(icons::ICON_ADD).frame(false);
+                    let add_dirs_button = Button::new(ICON_ADD).frame(false);
                     let add_dirs_button_response = ui.add_sized([18.0, 18.0], add_dirs_button);
                     if add_dirs_button_response.clicked() {
                         self.add_dirs();
@@ -416,8 +446,48 @@ impl SoundpadGui {
                                     self.play_file(&entry_path, false);
                                 }
                             });
-                            self.app_state.selected_file = Some(entry_path);
+                            self.app_state.selected_file = Some(entry_path.clone());
                         }
+
+                        // Context menu
+                        file_button_response.context_menu(|ui| {
+                            if ui
+                                .button(format!("{} {}", ICON_BOLT, "Play Solo"))
+                                .clicked()
+                            {
+                                self.play_file(&entry_path, false);
+                                self.app_state.selected_file = Some(entry_path.clone());
+                            }
+
+                            if ui.button(format!("{} {}", ICON_ADD, "Add New")).clicked() {
+                                self.play_file(&entry_path, true);
+                                self.app_state.selected_file = Some(entry_path.clone());
+                            }
+
+                            if ui
+                                .button(format!("{} {}", ICON_SWAP_HORIZ, "Replace Last"))
+                                .clicked()
+                                && let Some(last_track) = self.audio_player_state.tracks.last()
+                            {
+                                self.stop(Some(last_track.id));
+                                self.play_file(&entry_path, true);
+                                self.app_state.selected_file = Some(entry_path.clone());
+                            }
+
+                            ui.separator();
+
+                            if ui
+                                .button(format!(
+                                    "{} {}",
+                                    ICON_OPEN_IN_BROWSER, "Show in File Manager"
+                                ))
+                                .clicked()
+                            {
+                                if let Err(e) = opener::reveal(&entry_path) {
+                                    eprintln!("Failed to open file manager: {}", e);
+                                }
+                            }
+                        });
                     }
                 });
             });
@@ -486,7 +556,7 @@ impl SoundpadGui {
 
             // ---------- Settings button ----------
             let settings_button =
-                Button::new(icons::ICON_SETTINGS.atom_size(Vec2::new(18.0, 18.0))).frame(false);
+                Button::new(ICON_SETTINGS.atom_size(Vec2::new(18.0, 18.0))).frame(false);
             let settings_button_response = ui.add_sized([18.0, 18.0], settings_button);
             if settings_button_response.clicked() {
                 self.app_state.show_settings = true;

src/gui/mod.rs

@@ -96,26 +96,20 @@ impl SoundpadGui {
         }
     }
 
-    pub fn remove_dir(&mut self, path: &PathBuf) {
-        self.app_state.dirs.retain(|x| x != path);
-        if let Some(current_dir) = &self.app_state.current_dir
-            && current_dir == path
-        {
-            self.app_state.current_dir = None;
-            self.app_state.files.clear();
-        }
-        self.config.dirs = self.app_state.dirs.clone();
-        self.config.save_to_file().ok();
-    }
-
     pub fn open_dir(&mut self, path: &PathBuf) {
         self.app_state.current_dir = Some(path.clone());
-        self.app_state.files = path
-            .read_dir()
-            .unwrap()
-            .filter_map(|res| res.ok())
-            .map(|entry| entry.path())
-            .collect();
+        match path.read_dir() {
+            Ok(read_dir) => {
+                self.app_state.files = read_dir
+                    .filter_map(|res| res.ok())
+                    .map(|entry| entry.path())
+                    .collect();
+            }
+            Err(e) => {
+                eprintln!("Failed to read directory {:?}: {}", path, e);
+                self.app_state.files.clear();
+            }
+        }
     }
 
     pub fn play_file(&mut self, path: &PathBuf, concurrent: bool) {

src/gui/update.rs

@@ -9,6 +9,17 @@ use std::time::{Duration, Instant};
 
 impl App for SoundpadGui {
     fn update(&mut self, ctx: &Context, _frame: &mut EFrame) {
+        // Remove directories
+        for path in self.app_state.dirs_to_remove.drain() {
+            self.app_state.dirs.retain(|x| x != &path);
+            if let Some(current_dir) = &self.app_state.current_dir
+                && current_dir == &path
+            {
+                self.app_state.current_dir = None;
+                self.app_state.files.clear();
+            }
+        }
+
         // Save directories if changed
         if !self.config.dirs.eq(&self.app_state.dirs) {
             self.config.dirs = self.app_state.dirs.clone();

src/types/audio_player.rs

@@ -5,7 +5,7 @@ use crate::{
         pipewire::{create_link, get_device},
     },
 };
-use rodio::{Decoder, OutputStream, OutputStreamBuilder, Sink, Source};
+use rodio::{Decoder, DeviceSinkBuilder, MixerDeviceSink, Player, Source};
 use serde::{Deserialize, Serialize};
 use std::{
     collections::HashMap,
@@ -45,7 +45,7 @@ pub struct FullState {
 
 pub struct PlayingSound {
     pub id: u32,
-    pub sink: Sink,
+    pub sink: Player,
     pub path: PathBuf,
     pub duration: Option<f32>,
     pub looped: bool,
@@ -53,7 +53,7 @@ pub struct PlayingSound {
 }
 
 pub struct AudioPlayer {
-    pub stream_handle: OutputStream,
+    pub stream_handle: MixerDeviceSink,
     pub tracks: HashMap<u32, PlayingSound>,
     pub next_id: u32,
 
@@ -68,7 +68,7 @@ impl AudioPlayer {
         let daemon_config = get_daemon_config();
         let default_volume = daemon_config.default_volume.unwrap_or(1.0);
 
-        let stream_handle = OutputStreamBuilder::open_default_stream()?;
+        let stream_handle = DeviceSinkBuilder::open_default_sink()?;
 
         let mut audio_player = AudioPlayer {
             stream_handle,
@@ -282,7 +282,7 @@ impl AudioPlayer {
 
                 let duration = source.total_duration().map(|d| d.as_secs_f32());
 
-                let sink = Sink::connect_new(self.stream_handle.mixer());
+                let sink = Player::connect_new(self.stream_handle.mixer());
                 sink.set_volume(self.volume); // Default volume is 1.0 * master
                 sink.append(source);
                 sink.play();

src/types/commands.rs

@@ -18,6 +18,8 @@ pub trait Executable {
 
 pub struct PingCommand {}
 
+pub struct KillCommand {}
+
 pub struct PauseCommand {
     pub id: Option<u32>,
 }
@@ -82,6 +84,8 @@ pub struct ToggleLoopCommand {
     pub id: Option<u32>,
 }
 
+pub struct GetDaemonVersionCommand {}
+
 pub struct GetFullStateCommand {}
 
 #[async_trait]
@@ -91,6 +95,13 @@ impl Executable for PingCommand {
     }
 }
 
+#[async_trait]
+impl Executable for KillCommand {
+    async fn execute(&self) -> Response {
+        Response::new(true, "killed")
+    }
+}
+
 #[async_trait]
 impl Executable for PauseCommand {
     async fn execute(&self) -> Response {
@@ -347,6 +358,13 @@ impl Executable for ToggleLoopCommand {
     }
 }
 
+#[async_trait]
+impl Executable for GetDaemonVersionCommand {
+    async fn execute(&self) -> Response {
+        Response::new(true, env!("CARGO_PKG_VERSION"))
+    }
+}
+
 #[async_trait]
 impl Executable for GetFullStateCommand {
     async fn execute(&self) -> Response {
@@ -374,7 +392,7 @@ impl Executable for GetFullStateCommand {
             tracks: audio_player.get_tracks(),
             volume: audio_player.volume,
             current_input: current_input_nick,
-            all_inputs,
+            all_inputs: all_inputs,
         };
 
         Response::new(true, serde_json::to_string(&full_state).unwrap())

src/types/gui.rs

@@ -38,6 +38,7 @@ pub struct AppState {
 
     pub current_dir: Option<PathBuf>,
     pub dirs: Vec<PathBuf>,
+    pub dirs_to_remove: HashSet<PathBuf>,
 
     pub selected_file: Option<PathBuf>,
     pub files: HashSet<PathBuf>,

src/types/socket.rs

@@ -24,6 +24,10 @@ impl Request {
         Request::new("ping", vec![])
     }
 
+    pub fn kill() -> Self {
+        Request::new("kill", vec![])
+    }
+
     pub fn pause(id: Option<u32>) -> Self {
         let mut args = vec![];
         let id_str;
@@ -156,6 +160,10 @@ impl Request {
         Request::new("toggle_loop", args)
     }
 
+    pub fn get_daemon_version() -> Self {
+        Request::new("get_daemon_version", vec![])
+    }
+
     pub fn get_full_state() -> Self {
         Request::new("get_full_state", vec![])
     }

src/utils/commands.rs

@@ -7,6 +7,7 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
 
     match request.name.as_str() {
         "ping" => Some(Box::new(PingCommand {})),
+        "kill" => Some(Box::new(KillCommand {})),
         "pause" => Some(Box::new(PauseCommand { id })),
         "resume" => Some(Box::new(ResumeCommand { id })),
         "toggle_pause" => Some(Box::new(TogglePauseCommand { id })),
@@ -69,6 +70,7 @@ pub fn parse_command(request: &Request) -> Option<Box<dyn Executable + Send>> {
             Some(Box::new(SetLoopCommand { enabled, id }))
         }
         "toggle_loop" => Some(Box::new(ToggleLoopCommand { id })),
+        "get_daemon_version" => Some(Box::new(GetDaemonVersionCommand {})),
         "get_full_state" => Some(Box::new(GetFullStateCommand {})),
         _ => None,
     }

src/utils/daemon.rs

@@ -36,7 +36,7 @@ pub fn get_daemon_config() -> DaemonConfig {
 
 pub async fn link_player_to_virtual_mic() -> Result<(), Box<dyn Error>> {
     let pwsp_daemon_output;
-    if let Ok(device) = get_device("alsa_playback.pwsp-daemon").await {
+    if let Ok(device) = get_device("pwsp-daemon").await {
         pwsp_daemon_output = device;
     } else {
         eprintln!("Could not find alsa_playback.pwsp-daemon device, skipping device linking");

src/utils/pipewire.rs

@@ -210,7 +210,11 @@ pub async fn get_device(device_name: &str) -> Result<AudioDevice, Box<dyn Error>
     input_devices.extend(output_devices);
 
     for device in input_devices {
-        if device.name == device_name {
+        if device.name == device_name
+            || device.nick == device_name
+            || device.name.contains(device_name)
+            || device.nick.contains(device_name)
+        {
             return Ok(device);
         }
     }