Add goreleaser

Signed-off-by: Hadi <hadi@example.com>
add perm/tmp indication
2026-05-11 22:02:34 +02:00 · 2026-05-04 13:14:50 +02:00 · 2026-05-04 13:13:29 +02:00 · 2026-05-04 13:10:58 +02:00 · 2026-05-04 13:02:45 +02:00 · 2026-05-04 12:59:11 +02:00
14 changed files with 238 additions and 124 deletions
@@ -0,0 +1,28 @@
+name: Release
+
+on:
+  push:
+    tags:
+      - "v*"
+
+permissions:
+  contents: write
+
+jobs:
+  release:
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/checkout@v4
+        with:
+          fetch-depth: 0
+
+      - uses: actions/setup-go@v5
+        with:
+          go-version-file: go.mod
+
+      - uses: goreleaser/goreleaser-action@v6
+        with:
+          version: "~> v2"
+          args: release --clean
+        env:
+          GITHUB_TOKEN: ${{ secrets.GITHUB_TOKEN }}
@@ -0,0 +1,31 @@
+version: 2
+
+before:
+  hooks:
+    - go mod tidy
+
+builds:
+  - binary: usbguard-tui
+    goos:
+      - linux
+    goarch:
+      - amd64
+      - arm64
+    ldflags:
+      - -s -w -X main.version={{.Version}}
+
+archives:
+  - formats:
+      - tar.gz
+    name_template: "{{ .ProjectName }}_{{ .Os }}_{{ .Arch }}"
+
+checksum:
+  name_template: checksums.txt
+
+changelog:
+  sort: asc
+  filters:
+    exclude:
+      - "^docs:"
+      - "^test:"
+      - "^ci:"
@@ -2,12 +2,19 @@
 ▖▖▄▖▄ ▄▖       ▌  ▄▖▖▖▄▖
 ▌▌▚ ▙▘▌ ▌▌▀▌▛▘▛▌  ▐ ▌▌▐
 ▙▌▄▌▙▘▙▌▙▌█▌▌ ▙▌  ▐ ▙▌▟▖
-
 ```

+[![Go Version](https://img.shields.io/github/go-mod/go-version/anotherhadi/usbguard-tui)](go.mod)
+[![Release](https://img.shields.io/github/v/release/anotherhadi/usbguard-tui)](https://github.com/anotherhadi/usbguard-tui/releases)
+[![License: MIT](https://img.shields.io/badge/License-MIT-yellow.svg)](LICENSE)
+[![Go Report Card](https://goreportcard.com/badge/github.com/anotherhadi/usbguard-tui)](https://goreportcard.com/report/github.com/anotherhadi/usbguard-tui)
+
 # USBGuard TUI

 A terminal UI for managing USB devices via [usbguard](https://usbguard.github.io/).
+
+USBGuard is a software framework for implementing a USB device authorization policy (allowlisting/blocklisting). It protects your system against rogue USB devices by scanning them and checking their parameters against a set of rules.
+
 Built with [bubbletea](https://github.com/charmbracelet/bubbletea) & Goland!

 ## Requirements
@@ -16,7 +16,7 @@
    pname = "usbguard-tui";
    version = "1.0.0";

-    ldflags = ["-s" "-w"];
+    ldflags = ["-s" "-w" "-X main.version=${version}"];
  in {
    packages = forAllSystems (system: pkgs: {
      "${pname}" = pkgs.buildGoModule {
@@ -25,7 +25,7 @@
        src = ./.;
        outputs = ["out"];

-        vendorHash = "sha256-SMhllO87YlmySHroKfPq1pHb67CwHaZ3XMp3t983etc=";
+        vendorHash = "sha256-NfmNdQaISob3ZguQnwgfXHUDUFION988ucp18q996pM=";

        meta = with pkgs.lib; {
          description = "A terminal UI for managing USB devices via usbguard.";
@@ -3,32 +3,27 @@ module github.com/anotherhadi/usbguard-tui
 go 1.26.2

 require (
-	github.com/charmbracelet/bubbles v1.0.0
-	github.com/charmbracelet/bubbletea v1.3.10
-	github.com/charmbracelet/lipgloss v1.1.0
-	github.com/charmbracelet/x/ansi v0.11.6
+	charm.land/bubbles/v2 v2.1.0
+	charm.land/bubbletea/v2 v2.0.6
+	charm.land/lipgloss/v2 v2.0.3
+	github.com/charmbracelet/x/ansi v0.11.7
 )

 require (
 	github.com/atotto/clipboard v0.1.4 // indirect
-	github.com/aymanbagabas/go-osc52/v2 v2.0.1 // indirect
-	github.com/charmbracelet/colorprofile v0.4.1 // indirect
-	github.com/charmbracelet/x/cellbuf v0.0.15 // indirect
+	github.com/charmbracelet/colorprofile v0.4.3 // indirect
+	github.com/charmbracelet/ultraviolet v0.0.0-20260416155717-489999b90468 // indirect
 	github.com/charmbracelet/x/term v0.2.2 // indirect
-	github.com/clipperhouse/displaywidth v0.9.0 // indirect
-	github.com/clipperhouse/stringish v0.1.1 // indirect
-	github.com/clipperhouse/uax29/v2 v2.5.0 // indirect
-	github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f // indirect
-	github.com/lucasb-eyer/go-colorful v1.3.0 // indirect
-	github.com/mattn/go-isatty v0.0.20 // indirect
-	github.com/mattn/go-localereader v0.0.1 // indirect
-	github.com/mattn/go-runewidth v0.0.19 // indirect
-	github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 // indirect
+	github.com/charmbracelet/x/termios v0.1.1 // indirect
+	github.com/charmbracelet/x/windows v0.2.2 // indirect
+	github.com/clipperhouse/displaywidth v0.11.0 // indirect
+	github.com/clipperhouse/uax29/v2 v2.7.0 // indirect
+	github.com/lucasb-eyer/go-colorful v1.4.0 // indirect
+	github.com/mattn/go-runewidth v0.0.23 // indirect
 	github.com/muesli/cancelreader v0.2.2 // indirect
-	github.com/muesli/termenv v0.16.0 // indirect
 	github.com/rivo/uniseg v0.4.7 // indirect
 	github.com/sahilm/fuzzy v0.1.1 // indirect
 	github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e // indirect
-	golang.org/x/sys v0.38.0 // indirect
-	golang.org/x/text v0.3.8 // indirect
+	golang.org/x/sync v0.20.0 // indirect
+	golang.org/x/sys v0.43.0 // indirect
 )
@@ -1,49 +1,39 @@
+charm.land/bubbles/v2 v2.1.0 h1:YSnNh5cPYlYjPxRrzs5VEn3vwhtEn3jVGRBT3M7/I0g=
+charm.land/bubbles/v2 v2.1.0/go.mod h1:l97h4hym2hvWBVfmJDtrEHHCtkIKeTEb3TTJ4ZOB3wY=
+charm.land/bubbletea/v2 v2.0.6 h1:UHN/91OyuhaOFGSrBXQ/hMZD8IO1Uc4BvHlgHXL2WJo=
+charm.land/bubbletea/v2 v2.0.6/go.mod h1:MH/D8ZLlN3op37vQvijKuU29g3rqTp+aQapURFonF9g=
+charm.land/lipgloss/v2 v2.0.3 h1:yM2zJ4Cf5Y51b7RHIwioil4ApI/aypFXXVHSwlM6RzU=
+charm.land/lipgloss/v2 v2.0.3/go.mod h1:7myLU9iG/3xluAWzpY/fSxYYHCgoKTie7laxk6ATwXA=
 github.com/atotto/clipboard v0.1.4 h1:EH0zSVneZPSuFR11BlR9YppQTVDbh5+16AmcJi4g1z4=
 github.com/atotto/clipboard v0.1.4/go.mod h1:ZY9tmq7sm5xIbd9bOK4onWV4S6X0u6GY7Vn0Yu86PYI=
-github.com/aymanbagabas/go-osc52/v2 v2.0.1 h1:HwpRHbFMcZLEVr42D4p7XBqjyuxQH5SMiErDT4WkJ2k=
-github.com/aymanbagabas/go-osc52/v2 v2.0.1/go.mod h1:uYgXzlJ7ZpABp8OJ+exZzJJhRNQ2ASbcXHWsFqH8hp8=
-github.com/aymanbagabas/go-udiff v0.3.1 h1:LV+qyBQ2pqe0u42ZsUEtPiCaUoqgA9gYRDs3vj1nolY=
-github.com/aymanbagabas/go-udiff v0.3.1/go.mod h1:G0fsKmG+P6ylD0r6N/KgQD/nWzgfnl8ZBcNLgcbrw8E=
-github.com/charmbracelet/bubbles v1.0.0 h1:12J8/ak/uCZEMQ6KU7pcfwceyjLlWsDLAxB5fXonfvc=
-github.com/charmbracelet/bubbles v1.0.0/go.mod h1:9d/Zd5GdnauMI5ivUIVisuEm3ave1XwXtD1ckyV6r3E=
-github.com/charmbracelet/bubbletea v1.3.10 h1:otUDHWMMzQSB0Pkc87rm691KZ3SWa4KUlvF9nRvCICw=
-github.com/charmbracelet/bubbletea v1.3.10/go.mod h1:ORQfo0fk8U+po9VaNvnV95UPWA1BitP1E0N6xJPlHr4=
-github.com/charmbracelet/colorprofile v0.4.1 h1:a1lO03qTrSIRaK8c3JRxJDZOvhvIeSco3ej+ngLk1kk=
-github.com/charmbracelet/colorprofile v0.4.1/go.mod h1:U1d9Dljmdf9DLegaJ0nGZNJvoXAhayhmidOdcBwAvKk=
-github.com/charmbracelet/lipgloss v1.1.0 h1:vYXsiLHVkK7fp74RkV7b2kq9+zDLoEU4MZoFqR/noCY=
-github.com/charmbracelet/lipgloss v1.1.0/go.mod h1:/6Q8FR2o+kj8rz4Dq0zQc3vYf7X+B0binUUBwA0aL30=
-github.com/charmbracelet/x/ansi v0.11.6 h1:GhV21SiDz/45W9AnV2R61xZMRri5NlLnl6CVF7ihZW8=
-github.com/charmbracelet/x/ansi v0.11.6/go.mod h1:2JNYLgQUsyqaiLovhU2Rv/pb8r6ydXKS3NIttu3VGZQ=
-github.com/charmbracelet/x/cellbuf v0.0.15 h1:ur3pZy0o6z/R7EylET877CBxaiE1Sp1GMxoFPAIztPI=
-github.com/charmbracelet/x/cellbuf v0.0.15/go.mod h1:J1YVbR7MUuEGIFPCaaZ96KDl5NoS0DAWkskup+mOY+Q=
-github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91 h1:payRxjMjKgx2PaCWLZ4p3ro9y97+TVLZNaRZgJwSVDQ=
-github.com/charmbracelet/x/exp/golden v0.0.0-20241011142426-46044092ad91/go.mod h1:wDlXFlCrmJ8J+swcL/MnGUuYnqgQdW9rhSD61oNMb6U=
+github.com/aymanbagabas/go-udiff v0.4.1 h1:OEIrQ8maEeDBXQDoGCbbTTXYJMYRCRO1fnodZ12Gv5o=
+github.com/aymanbagabas/go-udiff v0.4.1/go.mod h1:0L9PGwj20lrtmEMeyw4WKJ/TMyDtvAoK9bf2u/mNo3w=
+github.com/charmbracelet/colorprofile v0.4.3 h1:QPa1IWkYI+AOB+fE+mg/5/4HRMZcaXex9t5KX76i20Q=
+github.com/charmbracelet/colorprofile v0.4.3/go.mod h1:/zT4BhpD5aGFpqQQqw7a+VtHCzu+zrQtt1zhMt9mR4Q=
+github.com/charmbracelet/ultraviolet v0.0.0-20260416155717-489999b90468 h1:Q9fO0y1Zo5KB/5Vu8JZoLGm1N3RzF9bNj3Ao3xoR+Ac=
+github.com/charmbracelet/ultraviolet v0.0.0-20260416155717-489999b90468/go.mod h1:bAAz7dh/FTYfC+oiHavL4mX1tOIBZ0ZwYjSi3qE6ivM=
+github.com/charmbracelet/x/ansi v0.11.7 h1:kzv1kJvjg2S3r9KHo8hDdHFQLEqn4RBCb39dAYC84jI=
+github.com/charmbracelet/x/ansi v0.11.7/go.mod h1:9qGpnAVYz+8ACONkZBUWPtL7lulP9No6p1epAihUZwQ=
+github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f h1:pk6gmGpCE7F3FcjaOEKYriCvpmIN4+6OS/RD0vm4uIA=
+github.com/charmbracelet/x/exp/golden v0.0.0-20250806222409-83e3a29d542f/go.mod h1:IfZAMTHB6XkZSeXUqriemErjAWCCzT0LwjKFYCZyw0I=
 github.com/charmbracelet/x/term v0.2.2 h1:xVRT/S2ZcKdhhOuSP4t5cLi5o+JxklsoEObBSgfgZRk=
 github.com/charmbracelet/x/term v0.2.2/go.mod h1:kF8CY5RddLWrsgVwpw4kAa6TESp6EB5y3uxGLeCqzAI=
-github.com/clipperhouse/displaywidth v0.9.0 h1:Qb4KOhYwRiN3viMv1v/3cTBlz3AcAZX3+y9OLhMtAtA=
-github.com/clipperhouse/displaywidth v0.9.0/go.mod h1:aCAAqTlh4GIVkhQnJpbL0T/WfcrJXHcj8C0yjYcjOZA=
-github.com/clipperhouse/stringish v0.1.1 h1:+NSqMOr3GR6k1FdRhhnXrLfztGzuG+VuFDfatpWHKCs=
-github.com/clipperhouse/stringish v0.1.1/go.mod h1:v/WhFtE1q0ovMta2+m+UbpZ+2/HEXNWYXQgCt4hdOzA=
-github.com/clipperhouse/uax29/v2 v2.5.0 h1:x7T0T4eTHDONxFJsL94uKNKPHrclyFI0lm7+w94cO8U=
-github.com/clipperhouse/uax29/v2 v2.5.0/go.mod h1:Wn1g7MK6OoeDT0vL+Q0SQLDz/KpfsVRgg6W7ihQeh4g=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f h1:Y/CXytFA4m6baUTXGLOoWe4PQhGxaX0KpnayAqC48p4=
-github.com/erikgeiser/coninput v0.0.0-20211004153227-1c3628e74d0f/go.mod h1:vw97MGsxSvLiUE2X8qFplwetxpGLQrlU1Q9AUEIzCaM=
+github.com/charmbracelet/x/termios v0.1.1 h1:o3Q2bT8eqzGnGPOYheoYS8eEleT5ZVNYNy8JawjaNZY=
+github.com/charmbracelet/x/termios v0.1.1/go.mod h1:rB7fnv1TgOPOyyKRJ9o+AsTU/vK5WHJ2ivHeut/Pcwo=
+github.com/charmbracelet/x/windows v0.2.2 h1:IofanmuvaxnKHuV04sC0eBy/smG6kIKrWG2/jYn2GuM=
+github.com/charmbracelet/x/windows v0.2.2/go.mod h1:/8XtdKZzedat74NQFn0NGlGL4soHB0YQZrETF96h75k=
+github.com/clipperhouse/displaywidth v0.11.0 h1:lBc6kY44VFw+TDx4I8opi/EtL9m20WSEFgwIwO+UVM8=
+github.com/clipperhouse/displaywidth v0.11.0/go.mod h1:bkrFNkf81G8HyVqmKGxsPufD3JhNl3dSqnGhOoSD/o0=
+github.com/clipperhouse/uax29/v2 v2.7.0 h1:+gs4oBZ2gPfVrKPthwbMzWZDaAFPGYK72F0NJv2v7Vk=
+github.com/clipperhouse/uax29/v2 v2.7.0/go.mod h1:EFJ2TJMRUaplDxHKj1qAEhCtQPW2tJSwu5BF98AuoVM=
 github.com/kylelemons/godebug v1.1.0 h1:RPNrshWIDI6G2gRW9EHilWtl7Z6Sb1BR0xunSBf0SNc=
 github.com/kylelemons/godebug v1.1.0/go.mod h1:9/0rRGxNHcop5bhtWyNeEfOS8JIWk580+fNqagV/RAw=
-github.com/lucasb-eyer/go-colorful v1.3.0 h1:2/yBRLdWBZKrf7gB40FoiKfAWYQ0lqNcbuQwVHXptag=
-github.com/lucasb-eyer/go-colorful v1.3.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
-github.com/mattn/go-isatty v0.0.20 h1:xfD0iDuEKnDkl03q4limB+vH+GxLEtL/jb4xVJSWWEY=
-github.com/mattn/go-isatty v0.0.20/go.mod h1:W+V8PltTTMOvKvAeJH7IuucS94S2C6jfK/D7dTCTo3Y=
-github.com/mattn/go-localereader v0.0.1 h1:ygSAOl7ZXTx4RdPYinUpg6W99U8jWvWi9Ye2JC/oIi4=
-github.com/mattn/go-localereader v0.0.1/go.mod h1:8fBrzywKY7BI3czFoHkuzRoWE9C+EiG4R1k4Cjx5p88=
-github.com/mattn/go-runewidth v0.0.19 h1:v++JhqYnZuu5jSKrk9RbgF5v4CGUjqRfBm05byFGLdw=
-github.com/mattn/go-runewidth v0.0.19/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6 h1:ZK8zHtRHOkbHy6Mmr5D264iyp3TiX5OmNcI5cIARiQI=
-github.com/muesli/ansi v0.0.0-20230316100256-276c6243b2f6/go.mod h1:CJlz5H+gyd6CUWT45Oy4q24RdLyn7Md9Vj2/ldJBSIo=
+github.com/lucasb-eyer/go-colorful v1.4.0 h1:UtrWVfLdarDgc44HcS7pYloGHJUjHV/4FwW4TvVgFr4=
+github.com/lucasb-eyer/go-colorful v1.4.0/go.mod h1:R4dSotOR9KMtayYi1e77YzuveK+i7ruzyGqttikkLy0=
+github.com/mattn/go-runewidth v0.0.23 h1:7ykA0T0jkPpzSvMS5i9uoNn2Xy3R383f9HDx3RybWcw=
+github.com/mattn/go-runewidth v0.0.23/go.mod h1:XBkDxAl56ILZc9knddidhrOlY5R/pDhgLpndooCuJAs=
 github.com/muesli/cancelreader v0.2.2 h1:3I4Kt4BQjOR54NavqnDogx/MIoWBFa0StPA8ELUXHmA=
 github.com/muesli/cancelreader v0.2.2/go.mod h1:3XuTXfFS2VjM+HTLZY9Ak0l6eUKfijIfMUZ4EgX0QYo=
-github.com/muesli/termenv v0.16.0 h1:S5AlUN9dENB57rsbnkPyfdGuWIlkmzJjbFf0Tf5FWUc=
-github.com/muesli/termenv v0.16.0/go.mod h1:ZRfOIKPFDYQoDFF4Olj7/QJbW60Ol/kL1pU3VfY/Cnk=
 github.com/rivo/uniseg v0.4.7 h1:WUdvkW8uEhrYfLC4ZzdpI2ztxP1I582+49Oc5Mq64VQ=
 github.com/rivo/uniseg v0.4.7/go.mod h1:FN3SvrM+Zdj16jyLfmOkMNblXMcoc8DfTHruCPUcx88=
 github.com/sahilm/fuzzy v0.1.1 h1:ceu5RHF8DGgoi+/dR5PsECjCDH1BE3Fnmpo7aVXOdRA=
@@ -52,9 +42,7 @@ github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e h1:JVG44RsyaB9T2KIHavM
 github.com/xo/terminfo v0.0.0-20220910002029-abceb7e1c41e/go.mod h1:RbqR21r5mrJuqunuUZ/Dhy/avygyECGrLceyNeo4LiM=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d h1:jtJma62tbqLibJ5sFQz8bKtEM8rJBtfilJ2qTU199MI=
 golang.org/x/exp v0.0.0-20231006140011-7918f672742d/go.mod h1:ldy0pHrwJyGW56pPQzzkH36rKxoZW1tw7ZJpeKx+hdo=
-golang.org/x/sys v0.0.0-20210809222454-d867a43fc93e/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.6.0/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.38.0 h1:3yZWxaJjBmCWXqhN1qh02AkOnCQ1poK6oF+a7xWL6Gc=
-golang.org/x/sys v0.38.0/go.mod h1:OgkHotnGiDImocRcuBABYBEXf8A9a87e/uXjp9XT3ks=
-golang.org/x/text v0.3.8 h1:nAL+RVCQ9uMn3vJZbV+MRnydTJFPf8qqY42YiA6MrqY=
-golang.org/x/text v0.3.8/go.mod h1:E6s5w1FMmriuDzIBO73fBruAKo1PCIq6d2Q6DHfQ8WQ=
+golang.org/x/sync v0.20.0 h1:e0PTpb7pjO8GAtTs2dQ6jYa5BWYlMuX047Dco/pItO4=
+golang.org/x/sync v0.20.0/go.mod h1:9xrNwdLfx4jkKbNva9FpL6vEN7evnE43NNNJQ2LF3+0=
+golang.org/x/sys v0.43.0 h1:Rlag2XtaFTxp19wS8MXlJwTvoh8ArU6ezoyFsMyCTNI=
+golang.org/x/sys v0.43.0/go.mod h1:4GL1E5IUh+htKOUEOaiffhrAeqysfVGipDYzABqnCmw=
@@ -20,6 +20,7 @@ func ListDevices() ([]Device, error) {
 	if err != nil {
 		return nil, wrapExecError(err)
 	}
+	rules := listRules()
 	var devices []Device
 	for _, line := range strings.Split(strings.TrimSpace(string(out)), "\n") {
 		if line == "" {
@@ -27,12 +28,31 @@ func ListDevices() ([]Device, error) {
 		}
 		d, err := parseLine(line)
 		if err == nil {
+			d.Permanent = rules[d.VidPid] == d.Status
 			devices = append(devices, d)
 		}
 	}
 	return devices, nil
 }

+func listRules() map[string]Status {
+	out, err := exec.Command("usbguard", "list-rules").Output()
+	if err != nil {
+		return nil
+	}
+	rules := make(map[string]Status)
+	for _, line := range strings.Split(strings.TrimSpace(string(out)), "\n") {
+		if line == "" {
+			continue
+		}
+		d, err := parseLine(line)
+		if err == nil {
+			rules[d.VidPid] = d.Status
+		}
+	}
+	return rules
+}
+
 func AllowDevice(id int, permanent bool) error  { return applyPolicy("allow-device", id, permanent) }
 func BlockDevice(id int, permanent bool) error  { return applyPolicy("block-device", id, permanent) }
 func RejectDevice(id int, permanent bool) error { return applyPolicy("reject-device", id, permanent) }
@@ -16,10 +16,11 @@ const (
 )

 type Device struct {
-	ID     int
-	Name   string
-	Status Status
-	VidPid string
+	ID        int
+	Name      string
+	Status    Status
+	VidPid    string
+	Permanent bool
 }

 func (d Device) Title() string       { return d.Name }
@@ -2,11 +2,12 @@ package ui

 import (
 	"fmt"
+	"image/color"
 	"io"

-	"github.com/charmbracelet/bubbles/list"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
+	"charm.land/bubbles/v2/list"
+	tea "charm.land/bubbletea/v2"
+	"charm.land/lipgloss/v2"
 	"github.com/anotherhadi/usbguard-tui/internal/guard"
 )

@@ -25,18 +26,18 @@ func (d deviceDelegate) Render(w io.Writer, m list.Model, index int, item list.I

 	selected := index == m.Index()

-	var color lipgloss.Color
+	var clr color.Color
 	if selected {
 		var ok bool
-		color, ok = statusColorsSelected[dev.Status]
+		clr, ok = statusColorsSelected[dev.Status]
 		if !ok {
-			color = colorMuted
+			clr = colorMuted
 		}
 	} else {
 		var ok bool
-		color, ok = statusColors[dev.Status]
+		clr, ok = statusColors[dev.Status]
 		if !ok {
-			color = colorMuted
+			clr = colorMuted
 		}
 	}

@@ -45,7 +46,7 @@ func (d deviceDelegate) Render(w io.Writer, m list.Model, index int, item list.I
 		nameStyle = lipgloss.NewStyle().
 			Border(lipgloss.NormalBorder(), false, false, false, true).
 			BorderForeground(colorAccent).
-			Foreground(color).
+			Foreground(clr).
 			Bold(true).
 			PaddingLeft(1)
 		descStyle = lipgloss.NewStyle().
@@ -54,13 +55,17 @@ func (d deviceDelegate) Render(w io.Writer, m list.Model, index int, item list.I
 			Foreground(colorMuted).
 			PaddingLeft(1)
 	} else {
-		nameStyle = lipgloss.NewStyle().Foreground(color).PaddingLeft(2)
+		nameStyle = lipgloss.NewStyle().Foreground(clr).PaddingLeft(2)
 		descStyle = lipgloss.NewStyle().Foreground(colorMuted).PaddingLeft(2)
 	}

+	permIndicator := "○ tmp"
+	if dev.Permanent {
+		permIndicator = "● perm"
+	}
 	fmt.Fprintf(w, "%s\n%s",
 		nameStyle.Render(dev.Name),
-		descStyle.Render(fmt.Sprintf("id:%-3d  %s  %s", dev.ID, dev.VidPid, string(dev.Status))),
+		descStyle.Render(fmt.Sprintf("id:%-3d  %s  %s  %s", dev.ID, dev.VidPid, string(dev.Status), permIndicator)),
 	)
 }

@@ -89,11 +94,11 @@ func (d actionDelegate) Render(w io.Writer, m list.Model, index int, item list.I
 		return
 	}
 	if index == m.Index() {
-		color, ok := statusColorsSelected[a.status]
+		clr, ok := statusColorsSelected[a.status]
 		if !ok {
-			color = colorAccent
+			clr = colorAccent
 		}
-		fmt.Fprintf(w, "  %s", lipgloss.NewStyle().Bold(true).Foreground(color).Render("> "+a.label))
+		fmt.Fprintf(w, "  %s", lipgloss.NewStyle().Bold(true).Foreground(clr).Render("> "+a.label))
 	} else {
 		fmt.Fprintf(w, "    %s", a.label)
 	}
@@ -1,13 +1,13 @@
 package ui

-import "github.com/charmbracelet/bubbles/key"
+import "charm.land/bubbles/v2/key"

 type listKeyMap struct {
-	Open       key.Binding
-	Filter     key.Binding
-	Refresh    key.Binding
-	Quit       key.Binding
-	Help       key.Binding
+	Open    key.Binding
+	Filter  key.Binding
+	Refresh key.Binding
+	Quit    key.Binding
+	Help    key.Binding
 	// shown only in full help
 	Allow      key.Binding
 	AllowPerm  key.Binding
@@ -29,17 +29,17 @@ func (k listKeyMap) FullHelp() [][]key.Binding {
 }

 var listKeys = listKeyMap{
-	Open:       key.NewBinding(key.WithKeys("enter"), key.WithHelp("enter", "select action")),
+	Open:       key.NewBinding(key.WithKeys("enter", "tab", "l"), key.WithHelp("enter/l", "select action")),
 	Filter:     key.NewBinding(key.WithKeys("/"), key.WithHelp("/", "filter")),
 	Refresh:    key.NewBinding(key.WithKeys("r"), key.WithHelp("r", "refresh")),
-	Quit:       key.NewBinding(key.WithKeys("q", "ctrl+c"), key.WithHelp("q", "quit")),
+	Quit:       key.NewBinding(key.WithKeys("q", "esc", "ctrl+c"), key.WithHelp("q/esc", "quit")),
 	Help:       key.NewBinding(key.WithKeys("?"), key.WithHelp("?", "more")),
 	Allow:      key.NewBinding(key.WithKeys("a"), key.WithHelp("a", "allow")),
 	AllowPerm:  key.NewBinding(key.WithKeys("A"), key.WithHelp("A", "allow (perm)")),
 	Block:      key.NewBinding(key.WithKeys("b"), key.WithHelp("b", "block")),
 	BlockPerm:  key.NewBinding(key.WithKeys("B"), key.WithHelp("B", "block (perm)")),
-	Reject:     key.NewBinding(key.WithKeys("j"), key.WithHelp("j", "reject")),
-	RejectPerm: key.NewBinding(key.WithKeys("J"), key.WithHelp("J", "reject (perm)")),
+	Reject:     key.NewBinding(key.WithKeys("e"), key.WithHelp("e", "reject")),
+	RejectPerm: key.NewBinding(key.WithKeys("E"), key.WithHelp("E", "reject (perm)")),
 }

 var cancelKey = key.NewBinding(key.WithKeys("esc", "q", "ctrl+c"), key.WithHelp("esc/q", "cancel"))
@@ -4,12 +4,13 @@ import (
 	"strings"
 	"time"

+	"charm.land/bubbles/v2/help"
+	"charm.land/bubbles/v2/key"
+	"charm.land/bubbles/v2/list"
+	"charm.land/bubbles/v2/textinput"
+	tea "charm.land/bubbletea/v2"
+	"charm.land/lipgloss/v2"
 	"github.com/anotherhadi/usbguard-tui/internal/guard"
-	"github.com/charmbracelet/bubbles/help"
-	"github.com/charmbracelet/bubbles/key"
-	"github.com/charmbracelet/bubbles/list"
-	tea "github.com/charmbracelet/bubbletea"
-	"github.com/charmbracelet/lipgloss"
 )

 type state int
@@ -45,17 +46,23 @@ func New() Model {
 	l.SetShowStatusBar(true)
 	l.SetShowTitle(false)
 	l.DisableQuitKeybindings()
-	// free j/k for our shortcuts
 	l.KeyMap.CursorUp = key.NewBinding(key.WithKeys("up", "k"), key.WithHelp("↑/k", "up"))
-	l.KeyMap.CursorDown = key.NewBinding(key.WithKeys("down"), key.WithHelp("↓", "down"))
-	l.FilterInput.PromptStyle = lipgloss.NewStyle().Foreground(colorAccent)
-	l.FilterInput.Cursor.Style = lipgloss.NewStyle().Foreground(colorAccent)
+	l.KeyMap.CursorDown = key.NewBinding(key.WithKeys("down", "j"), key.WithHelp("↓/j", "down"))
+
+	l.Styles = list.DefaultStyles(true)
+	filterStyles := textinput.DefaultStyles(true)
+	filterStyles.Focused.Prompt = filterStyles.Focused.Prompt.Foreground(colorAccent)
+	filterStyles.Blurred.Prompt = filterStyles.Blurred.Prompt.Foreground(colorAccent)
+	l.Styles.Filter = filterStyles
+
+	h := help.New()
+	h.Styles = help.DefaultStyles(true)

 	return Model{
 		state:      stateList,
 		list:       l,
 		actionList: makeActionList(),
-		help:       help.New(),
+		help:       h,
 	}
 }

@@ -87,7 +94,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	case tea.WindowSizeMsg:
 		m.width = msg.Width
 		m.height = msg.Height
-		m.help.Width = msg.Width
+		m.help.SetWidth(msg.Width)
 		m.list.SetSize(msg.Width, m.listHeight())
 		m.updateActionListSize()
 		return m, nil
@@ -124,11 +131,25 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 		}
 		return m, fetchDevices

-	case tea.KeyMsg:
+	case tea.KeyPressMsg:
 		if m.state == statePopup {
 			return m.updatePopup(msg)
 		}
 		return m.updateList(msg)
+
+	case tea.MouseClickMsg:
+		if m.state == statePopup {
+			var cmd tea.Cmd
+			m.actionList, cmd = m.actionList.Update(msg)
+			return m, cmd
+		}
+
+	case tea.MouseWheelMsg:
+		if m.state == statePopup {
+			var cmd tea.Cmd
+			m.actionList, cmd = m.actionList.Update(msg)
+			return m, cmd
+		}
 	}

 	if m.state == stateList {
@@ -140,7 +161,7 @@ func (m Model) Update(msg tea.Msg) (tea.Model, tea.Cmd) {
 	return m, nil
 }

-func (m Model) updateList(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+func (m Model) updateList(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 	if msg.String() == "ctrl+c" {
 		return m, tea.Quit
 	}
@@ -184,7 +205,7 @@ func (m Model) updateList(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 	return m, cmd
 }

-func (m Model) updatePopup(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
+func (m Model) updatePopup(msg tea.KeyPressMsg) (tea.Model, tea.Cmd) {
 	switch {
 	case key.Matches(msg, cancelKey):
 		m.state = stateList
@@ -201,7 +222,16 @@ func (m Model) updatePopup(msg tea.KeyMsg) (tea.Model, tea.Cmd) {
 	return m, cmd
 }

-func (m Model) View() string {
+func (m Model) View() tea.View {
+	return tea.View{
+		Content:     m.renderContent(),
+		AltScreen:   true,
+		WindowTitle: "USBGuard TUI",
+		MouseMode:   tea.MouseModeCellMotion,
+	}
+}
+
+func (m Model) renderContent() string {
 	header := m.renderHeader()
 	notice := m.renderNotice()
 	listView := strings.TrimRight(m.list.View(), "\n")
@@ -238,7 +268,7 @@ func (m Model) renderActionSelect() string {
 	color := statusColors[dev.Status]
 	innerW := m.actionListInnerWidth()

-	title := popupTitleStyle.Copy().Foreground(color).Width(innerW).Render(dev.Name)
+	title := popupTitleStyle.Foreground(color).Width(innerW).Render(dev.Name)
 	hint := lipgloss.NewStyle().Foreground(colorMuted).Width(innerW).Render("↑↓ navigate  enter confirm  esc cancel")

 	content := strings.Join([]string{title, m.actionList.View(), "", hint}, "\n")
@@ -3,7 +3,7 @@ package ui
 import (
 	"strings"

-	"github.com/charmbracelet/lipgloss"
+	"charm.land/lipgloss/v2"
 	"github.com/charmbracelet/x/ansi"
 )

@@ -1,28 +1,30 @@
 package ui

 import (
+	"image/color"
+
+	"charm.land/lipgloss/v2"
 	"github.com/anotherhadi/usbguard-tui/internal/guard"
-	"github.com/charmbracelet/lipgloss"
 )

 var (
-	colorAllowed          = lipgloss.Color("28")
-	colorAllowedSelected  = lipgloss.Color("42")
-	colorBlocked          = lipgloss.Color("124")
-	colorBlockedSelected  = lipgloss.Color("196")
-	colorRejected         = lipgloss.Color("130")
-	colorRejectedSelected = lipgloss.Color("214")
-	colorMuted            = lipgloss.Color("240")
-	colorAccent           = lipgloss.Color("99")
+	colorAllowed          color.Color = lipgloss.Color("28")
+	colorAllowedSelected  color.Color = lipgloss.Color("42")
+	colorBlocked          color.Color = lipgloss.Color("124")
+	colorBlockedSelected  color.Color = lipgloss.Color("196")
+	colorRejected         color.Color = lipgloss.Color("130")
+	colorRejectedSelected color.Color = lipgloss.Color("214")
+	colorMuted            color.Color = lipgloss.Color("240")
+	colorAccent           color.Color = lipgloss.Color("99")
 )

-var statusColors = map[guard.Status]lipgloss.Color{
+var statusColors = map[guard.Status]color.Color{
 	guard.Allowed:  colorAllowed,
 	guard.Blocked:  colorBlocked,
 	guard.Rejected: colorRejected,
 }

-var statusColorsSelected = map[guard.Status]lipgloss.Color{
+var statusColorsSelected = map[guard.Status]color.Color{
 	guard.Allowed:  colorAllowedSelected,
 	guard.Blocked:  colorBlockedSelected,
 	guard.Rejected: colorRejectedSelected,
@@ -4,18 +4,25 @@ import (
 	"fmt"
 	"os"

-	tea "github.com/charmbracelet/bubbletea"
+	tea "charm.land/bubbletea/v2"
 	"github.com/anotherhadi/usbguard-tui/internal/guard"
 	"github.com/anotherhadi/usbguard-tui/internal/ui"
 )

+var version = "dev"
+
 func main() {
+	if len(os.Args) > 1 && (os.Args[1] == "--version" || os.Args[1] == "-version" || os.Args[1] == "-v") {
+		fmt.Println("usbguard-tui", version)
+		return
+	}
+
 	if err := guard.Check(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
 	}

-	p := tea.NewProgram(ui.New(), tea.WithAltScreen())
+	p := tea.NewProgram(ui.New())
 	if _, err := p.Run(); err != nil {
 		fmt.Fprintln(os.Stderr, err)
 		os.Exit(1)
Author	SHA1	Message	Date
Hadi	6267bc6087	Add goreleaser Signed-off-by: Hadi <hadi@example.com>	2026-05-04 13:14:50 +02:00
Hadi	1661ec4f57	add perm/tmp indication Signed-off-by: Hadi <hadi@example.com>	2026-05-04 13:13:29 +02:00
Hadi	6e3beb44e1	add --version Signed-off-by: Hadi <hadi@example.com>	2026-05-04 13:10:58 +02:00
Hadi	6811a1c7fd	edit keybinds Signed-off-by: Hadi <hadi@example.com>	2026-05-04 13:02:45 +02:00
Hadi	e67b259cfb	upgrade bubbletea - v2 Signed-off-by: Hadi <hadi@example.com>	2026-05-04 12:59:11 +02:00
Hadi	dfa9a30586	Add badges	2026-05-01 01:05:56 +02:00
Hadi	d181eae077	Update README	2026-04-30 19:32:02 +02:00