diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix
index 23f2427..506b082 100644
--- a/home-modules/waybar.nix
+++ b/home-modules/waybar.nix
@@ -4,8 +4,8 @@ in {
   sops.secrets = {
     "nx2site/radicale/password" = { };
   };
-  home.packages = with pkgs; [
-    (writeShellApplication { name = "waybar_mode"; text = /*bash*/ ''
+  home.packages = [
+    (pkgs.writeShellApplication { name = "waybar_mode"; text = /*bash*/ ''
       print_help() {
           echo "Usage: waybar_mode {set <string>|unset}"
       }
@@ -36,7 +36,7 @@ in {
       esac
       exit 0
     '';})
-    (writeShellApplication { name = "cclock"; text = /*bash*/ ''
+    (pkgs.writeShellApplication { name = "cclock"; text = /*bash*/ ''
       ord=$(date +"%e" | awk '{printf("%d%s\n", $1, ($1==11||$1==12||$1==13)?"th":((($1%10)==1)?"st":((($1%10)==2)?"nd":((($1%10)==3)?"rd":"th"))))}')
       if [ $# -eq 0 ]; then
         echo "󰃮${sep}$(date +'%A the')" "$ord" "of" "$(date +'%B')" " ${sep}$(date +'%R')"
@@ -44,9 +44,9 @@ in {
         echo "$(date +'%A the')" "$ord" "of" "$(date +'%B')"  "$(date +'%R')"
       fi
     '';})
-    (writers.writePython3Bin "caldav_event" {
+    (pkgs.writers.writePython3Bin "caldav_event" {
       libraries = with pkgs.python3Packages; [ caldav ics pytz ];
-      flakeIgnore = [ "E302" "E305""E501" "E261" ];
+      flakeIgnore = [ "E302" "E305" "E501" "E261" ];
     } /* python */ ''
 import os
 import json
@@ -81,7 +81,7 @@ def load_cache(cache_file):
 
 def save_cache(cache_file, data):
     with open(cache_file, "w") as file:
-        json.dump(data, file, default=datetime_converter)
+        json.dump(data, file, default=datetime_converter, indent=4)
 
 
 def get_ongoing_or_next_event(url, username, password):
@@ -117,44 +117,50 @@ def get_ongoing_or_next_event(url, username, password):
         print(f"Error accessing {url}: {e}")
         return None
 
+def is_expired(event_dict: dict):
+    now = datetime.now(timezone.utc).timestamp()
+    event_start = event_dict['event_begin'].timestamp()
+    event_end = event_dict['event_end'].timestamp()
+    return not (event_start <= now <= event_end)
+
 if __name__ == "__main__":
-    password_file = "/home/nx2/.config/sops-nix/secrets/nx2site/radicale/password"  # Path to password file
+    password_file = "${config.sops.secrets."nx2site/radicale/password".path}"  # Path to password file
     cache_file = "/tmp/caldav_event_cache.json"  # Path to cache file
     url = "https://dav.${hyper.domain}/"
-    username = "${hyper.user}"
+    username = "nx2"
     password = get_password(password_file)
-
-    event_dict = load_cache(cache_file)
     now = datetime.now(timezone.utc).timestamp()
 
-    if event_dict is None or event_dict['event_begin'].timestamp() <= now and now < event_dict['event_end'].timestamp():
+    event_dict = load_cache(cache_file)
+
+    if (event_dict is None) or (is_expired(event_dict)):
         event_dict = get_ongoing_or_next_event(url, username, password)
-        if event_dict is None:
-            print("No upcoming events found.")
-            exit(0)
-        cache_data = {
-            "event_name": event_dict['event_name'] if event_dict is not None else None,
-            "event_begin": event_dict['event_begin'] if event_dict is not None else None,
-            "event_end": event_dict['event_end'] if event_dict is not None else None
-        }
-        save_cache(cache_file, cache_data)
+        save_cache(cache_file, event_dict)
 
-        if event_dict:
-            event_start = event_dict['event_begin'].timestamp()
-            event_end = event_dict['event_end'].timestamp()
+    if event_dict is None: # none were found
+        print("* zen *")
+        exit(0)
 
-            if event_start <= now <= event_end:
-                time_remaining = event_end - now
-                hours, rem = divmod(int(time_remaining), 3600)
-                minutes, _ = divmod(rem, 60)
-                print(f"{event_dict['event_name']} ends in {hours} hour{'s ' if hours != 1 else ' '}and {minutes} minute{'s ' if minutes != 1 else ' '}")
-            else:
-                time_until_start = event_start - now
-                hours, rem = divmod(int(time_until_start), 3600)
-                minutes, _ = divmod(rem, 60)
-                print(f"{event_dict['event_name']} starts in {hours} hour{'s ' if hours != 1 else ' '}and {minutes} minute{'s ' if minutes != 1 else ' '}")
-        else:
-            print("No upcoming events found.")
+    event_start = event_dict['event_begin'].timestamp()
+    event_end = event_dict['event_end'].timestamp()
+
+    if event_start <= now <= event_end: # is currently ongoing
+        action_string = "ends"
+        t = event_end - now # time_remaining
+    else: # is in the future
+        action_string = "starts"
+        t = event_start - now # time_remaining
+
+    hours, rem = divmod(int(t), 3600)
+    minutes, _ = divmod(rem, 60)
+    hour_string = f"{hours} hour{'s ' if hours != 1 else ' '}and " if hours > 0 else ""
+    minu_string = f"{minutes} minute{'s ' if minutes != 1 else ' '}" if minutes > 0 else ""
+    if hour_string == "" and minu_string == "":
+        time_string = "now"
+    else:
+        time_string = "in " + hour_string + minu_string
+
+    print(f"{event_dict['event_name']} {action_string} {time_string}")
 '')
   ];