From 97e1c57488a3109bf10a60eaed8b790a182446aa Mon Sep 17 00:00:00 2001
From: zuma <lucien@shenanigans.cc>
Date: Mon, 10 Feb 2025 18:19:19 +0100
Subject: [PATCH] Add ActivityWatch and Feishin

---
 commons/programs/hyprland.nix     | 9 +++++++--
 commons/programs/waybar.nix       | 2 +-
 hosts/t0urn3s0l/configuration.nix | 3 +++
 3 files changed, 11 insertions(+), 3 deletions(-)

diff --git a/commons/programs/hyprland.nix b/commons/programs/hyprland.nix
index 4859801..b3538cf 100644
--- a/commons/programs/hyprland.nix
+++ b/commons/programs/hyprland.nix
@@ -135,8 +135,13 @@
       exec-once = [
         # Set Hyprland cursor the same as GTK apps
         "hyprctl setcursor \"Bibata-Modern-Classic\" 24"
-        "swww-daemon"
-        "waybar"
+
+        "swww-daemon" # Animated Wallpaper engine
+        "waybar" # Sweet top bar
+
+        # Sleep is needed because otherwise waybar is not initialized
+        "sleep 1 && aw-qt" # ActivityWatch
+        "sleep 1 && aw-awatcher" # ActivityWatcher Wayland Watcher
       ];
     };
   };
diff --git a/commons/programs/waybar.nix b/commons/programs/waybar.nix
index fc706b5..82498e8 100644
--- a/commons/programs/waybar.nix
+++ b/commons/programs/waybar.nix
@@ -11,11 +11,11 @@
         ];
         modules-center = [ "hyprland/window" ];
         modules-right = [
+          "tray"
           "custom/exit"
           "pulseaudio"
           "network"
           "battery"
-          "tray"
           "clock"
         ];
 
diff --git a/hosts/t0urn3s0l/configuration.nix b/hosts/t0urn3s0l/configuration.nix
index cf08993..a60ba57 100644
--- a/hosts/t0urn3s0l/configuration.nix
+++ b/hosts/t0urn3s0l/configuration.nix
@@ -161,6 +161,7 @@
     waybar # A bar.
     bibata-cursors # Pretty cursors
     kdenlive # Video editing software
+    feishin # Audio Player that connects to my Navidrome server
 
     # Shell stuff
     zsh # Favorite shell so far
@@ -184,6 +185,8 @@
     wl-clipboard # Clipboard manager
     swww # Wallpaper engine
     pulseaudio-dlna # To play sound on sound system
+    activitywatch # Stats on time spent
+    awatcher # Wayland Idle and window watcher
   ];
 
   services.gvfs.enable = true; # Enable Trash so that if I delete my nix files without having saved them I can backup .........