Add .desktop for deb

.github/workflows/release.yml

@@ -1,10 +1,10 @@
 name: Release
-
+permissions:
+  contents: write
 on:
   push:
     tags:
       - 'v[0-9]*.*.*'
-
 env:
   CARGO_TERM_COLOR: always
 jobs:
@@ -18,12 +18,12 @@ jobs:
       - uses: dtolnay/rust-toolchain@nightly
       - name: Install dependencies
         run: |
-          apt-get update
+          sudo apt-get update
-          apt-get install -y curl
+          sudo apt-get install -y curl
-          apt-get install build-essential -y
+          sudo apt-get install build-essential -y
-          apt-get install libdbus-1-dev -y
+          sudo apt-get install libdbus-1-dev -y
-          apt-get install libssl-dev -y
+          sudo apt-get install libssl-dev -y
-          apt-get install pkg-config -y
+          sudo apt-get install pkg-config -y
       - name: install cargo-deb
         run: cargo install cargo-deb
 
@@ -54,7 +54,7 @@ jobs:
 
       - run: zip "awatcher-bundle.zip" awatcher
         working-directory: target/release
-      - name: Upload binaries to release
+      - name: Upload awatcher-bundle to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
@@ -65,15 +65,14 @@ jobs:
 
       - run: zip "awatcher.zip" awatcher
         working-directory: target/release
-      - name: Upload binaries to release
+      - name: Upload awatcher to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}
           file: target/release/awatcher.zip
 
-      - name: cargo build deb
+      - run: cargo deb
-        run: cargo deb --features=bundle
+      - name: Upload deb to release
-      - name: Upload binaries to release
         uses: svenstaro/upload-release-action@v2
         with:
           repo_token: ${{ secrets.GITHUB_TOKEN }}

.github/workflows/verify.yml

@@ -1,11 +1,11 @@
+name: Check
+
 on:
   push:
     branches:
     - main
   pull_request:
 
-name: check
-
 env:
   CARGO_TERM_COLOR: always
 jobs:

Cargo.lock

@@ -405,7 +405,7 @@ dependencies = [
 
 [[package]]
 name = "awatcher"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "anyhow",
  "aw-datastore",
@@ -3845,7 +3845,7 @@ checksum = "0046fef7e28c3804e5e38bfa31ea2a0f73905319b677e57ebe37e49358989b5d"
 
 [[package]]
 name = "watchers"
-version = "0.1.0"
+version = "0.1.1"
 dependencies = [
  "anyhow",
  "aw-client-rust",

Cargo.toml

@@ -1,5 +1,6 @@
 [package]
 name = "awatcher"
+description = "An activity and idle watcher based on ActivityWatch"
 version = { workspace = true }
 authors = ["Demmie <2e3s19@gmail.com>"]
 edition = "2021"
@@ -17,7 +18,7 @@ image = { version = "0.24.6" }
 members = ["watchers"]
 
 [workspace.package]
-version = "0.1.0"
+version = "0.1.1"
 
 [workspace.dependencies]
 anyhow = "1.0.70"
@@ -53,3 +54,9 @@ Awatcher is a window activity and idle watcher with an optional tray and UI for
 The goal is to compensate the fragmentation of desktop environments on Linux by supporting all reportable environments, 
 to add more flexibility to reports with filters, and to have better UX with the distribution by a single executable.
 """
+assets = [
+    ["src/bundle/awatcher.desktop", "usr/share/applications/", "644"],
+    ["src/bundle/logo.png", "usr/share/awatcher/icons/awatcher.png", "644"],
+    ["target/release/awatcher", "usr/bin/", "755"],
+    ["README.md", "usr/share/doc/awatcher/README", "644"],
+]

src/bundle/awatcher.desktop

@@ -0,0 +1,8 @@
+[Desktop Entry]
+Type=Application
+Terminal=false
+Categories=Utility;
+Exec=awatcher
+Name=Awatcher
+GenericName=Activity watcher
+Icon=/usr/share/awatcher/icons/awatcher.png

src/bundle/menu.rs

@@ -17,8 +17,8 @@ pub struct Tray {
 impl ksni::Tray for Tray {
     fn icon_pixmap(&self) -> Vec<ksni::Icon> {
         vec![ksni::Icon {
-            width: 100,
+            width: 128,
-            height: 100,
+            height: 128,
             data: include_bytes!("./logo.argb32").to_vec(),
         }]
     }