diff --git a/configuration.nix b/configuration.nix index 5a4cde4..05d5357 100644 --- a/configuration.nix +++ b/configuration.nix @@ -4,6 +4,7 @@ inputs.sops-nix.nixosModules.sops ./system-modules/adb.nix ./system-modules/auto-mount.nix + ./system-modules/calendar.nix ./system-modules/hardware-configuration.nix ./system-modules/fuse.nix ./system-modules/games.nix diff --git a/home-modules/waybar.nix b/home-modules/waybar.nix index 0b57ab1..b4de74f 100644 --- a/home-modules/waybar.nix +++ b/home-modules/waybar.nix @@ -1,9 +1,12 @@ -{ pkgs, rice, ... }: let - sep = " "; +{ config, pkgs, rice, domain, user, ... }: +let + sep = " "; in { - home.packages = - let - waybar_mode_script = /*bash*/ '' + sops.secrets = { + "nx2site/radicale/password" = { }; + }; + home.packages = with pkgs; [ + (writeShellApplication { name = "waybar_mode"; text = /*bash*/ '' print_help() { echo "Usage: waybar_mode {set |unset}" } @@ -33,19 +36,118 @@ in { ;; esac exit 0 - ''; - cclock_script = /*bash*/ '' + '';}) + (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')" elif [ "$1" = "--no-icons" ]; then echo "$(date +'%A the')" "$ord" "of" "$(date +'%B')" "$(date +'%R')" fi - ''; - in - with pkgs; [ - (writeShellApplication { name = "waybar_mode"; text = waybar_mode_script;}) - (writeShellApplication { name = "cclock"; text = cclock_script;}) + '';}) + (writers.writePython3Bin "caldav_event" { + libraries = with pkgs.python3Packages; [ caldav ics pytz ]; + flakeIgnore = [ "E302" "E305""E501" ]; + } /* python */ '' +import os +from caldav import DAVClient +from datetime import datetime, timezone +import json +from ics import Calendar + +def get_password(password_file): + with open(password_file, "r") as file: + return file.read().strip() + +def load_cache(cache_file): + if os.path.exists(cache_file): + with open(cache_file, "r") as file: + return json.load(file) + return None + +def save_cache(cache_file, data): + with open(cache_file, "w") as file: + json.dump(data, file) + +def get_ongoing_and_next_event(url, username, password): + now = datetime.now(timezone.utc) + ongoing_events = [] + upcoming_events = [] + + try: + client = DAVClient(url, username=username, password=password) + principal = client.principal() + calendars = principal.calendars() + + for calendar in calendars: + events = calendar.events() + for event in events: + ical_data = event.data + calendar_parsed = Calendar(ical_data) + + for event in calendar_parsed.events: + event_name = event.name or "(No Title)" + start_time = event.begin.astimezone(timezone.utc) + end_time = event.end.astimezone(timezone.utc) + + if start_time <= now <= end_time: + ongoing_events.append((event_name, start_time.timestamp(), end_time.timestamp())) + elif start_time > now: + upcoming_events.append((event_name, start_time.timestamp(), end_time.timestamp())) + except Exception as e: + print(f"Error accessing {url}: {e}") + + upcoming_events.sort(key=lambda x: x[1]) # Sort by start time + return ongoing_events, upcoming_events[0] if upcoming_events else None + +if __name__ == "__main__": + 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.${domain}/" + username = "${user}" + password = get_password(password_file) + + cache = load_cache(cache_file) + now = datetime.now(timezone.utc).timestamp() + + if cache and cache.get("next_event_start") and now < cache["next_event_start"]: + ongoing_events = cache.get("ongoing_events", []) + next_event = (cache["next_event_name"], cache["next_event_start"], cache["next_event_end"]) if "next_event_name" in cache else None + else: + ongoing_events, next_event = get_ongoing_and_next_event(url, username, password) + + cache_data = { + "ongoing_events": ongoing_events, + "next_event_name": next_event[0] if next_event else None, + "next_event_start": next_event[1] if next_event else None, + "next_event_end": next_event[2] if next_event else None + } + save_cache(cache_file, cache_data) + + if ongoing_events: + for event_name, start_time, end_time in ongoing_events: + time_remaining = end_time - now + hours, rem = divmod(int(time_remaining), 3600) + minutes, _ = divmod(rem, 60) + + if hours == 0: + print(f"{event_name} {minutes} minute{'s ' if minutes > 1 else ' '}left") + else: + print(f"{event_name} {hours} hour{'s ' if hours > 1 else ' '}and {minutes} minute{'s ' if minutes > 1 else ' '}left") + else: + if next_event: + event_name, start_time, end_time = next_event + time_until_start = start_time - now + hours, rem = divmod(int(time_until_start), 3600) + minutes, _ = divmod(rem, 60) + + if hours == 0: + print(f"'{event_name}' starts in {minutes} minute{'s ' if minutes > 1 else ' '}") + else: + print(f"'{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.") +'') ]; programs.waybar = { @@ -78,7 +180,7 @@ in { ]; modules-right = [ "custom/mode" - "custom/ctimeremaining" + "custom/caldav_event" "custom/cclock" "tray" ]; @@ -97,10 +199,11 @@ in { exec = "cclock"; restart-interval = 60; }; - # "custom/ctimeremaining" = { - # exec = "nx_gcal_event lookup"; - # restart-interval = 60; - # }; + "custom/caldav_event" = { + format = "󰃰${sep}{}"; + exec = "caldav_event"; + restart-interval = 60; + }; "custom/mode" = { exec = "cat /tmp/waybar-mode"; interval = "once"; @@ -182,6 +285,7 @@ in { #clock, #custom-cclock, #custom-mode, + #custom-caldav-event, #battery, #cpu, #tray, @@ -242,12 +346,12 @@ in { color: rgb(${f green.base}); } - #battery.critical { + #battery.critical { background: rgb(${f negative.base}); color: rgb(${f foreground}); } ''; - #battery.critical:not(.charging) { + #battery.critical:not(.charging) { }; } diff --git a/home.nix b/home.nix index a2f6144..52a9bec 100644 --- a/home.nix +++ b/home.nix @@ -69,46 +69,54 @@ home.homeDirectory = "/home/${user}"; home.stateVersion = "24.05"; home.packages = with pkgs; [ + bat + brightnessctl + browsh chromium - - # zathura - xfce.thunar - - # spotify - spicetify-cli - - swww playerctl - - imv mpv mediainfo exiftool ffmpeg - pavucontrol - fontpreview - lynx w3m browsh - bat du-dust eza neofetch tldr fzf figlet ripgrep lolcat jq glow - brightnessctl wev - piper-tts - sssnake pipes - dig - screen - reflex - - gnumake cmake - - speedtest-go - imagemagick - - qbittorrent - + dig + du-dust + exiftool + eza + ffmpeg + figlet + fontpreview + fzf glib - pv + glow + gnumake gsettings-desktop-schemas - - yt-dlp + imagemagick + imv + jq + lolcat + lynx + mediainfo + mpv + neofetch + pavucontrol + pdfgrep + piper-tts + pipes + playerctl + pv + qbittorrent + reflex + ripgrep + screen + speedtest-go + spicetify-cli + sssnake + swww + tldr + w3m + wev wl-clipboard xclip + xfce.thunar xournal - ghostscript - + yt-dlp + inputs.zen-browser.packages."${system}".default ] ++ (with pkgs-unstable; [ diff --git a/sops-secrets.yaml b/sops-secrets.yaml index 6c974cf..d249be7 100644 --- a/sops-secrets.yaml +++ b/sops-secrets.yaml @@ -27,7 +27,9 @@ nx2site: sslCertificateKey.pem: ENC[AES256_GCM,data:Wzmi17UA4mpCr4VaUolfKwZJEZ5K9Ybp2/K3noC/D/QYlgJfwWnQEoXDfLj3lVVnz0V/m71NAtZ9p3/jhiQCyIwt0cOmsAmd1isHf0KQwGagc8cHttwDeZT7AzLW4axqevpZM8bjVk/TJ/k+uGbArqSwgu2W7C77uCltSS8AydWzD2D7eQciDZzQ4yyHShW9f0SH8Q/wumuY4ksjLs4roYtQgtr1ezUb1U329xA1y81apd47RHviJ/moOBQYY2Y8fbNryUmfqvGYtsfXxmNElJpGAStqjBCo0bncOetP+bfj90CJlbkIn1JzcPOa5ZJjDg==,iv:28PcaWyOsQ8gN6qvZYDS3H4lKKlU7ihxxLUXMYgHPEY=,tag:6t+jvoAZkYlqg/2d8V5Emw==,type:str] dhparams.pem: ENC[AES256_GCM,data:wGIUlT8QHruxHvrlaUdEDU3aKkB5hvQLZXic1ryKr1hIFw9uOv1hOCOPY+QUDBzfm+DXv62hTFAeq4siAoZ0wWvQ0uBuSZZBGrfuY1ZTsTJmpgTphdHi+S4/kl/Vt7nuBlvdW8VbwU+mzmSK4UuIjuvAl0RI+q9C/BAu0tsXvKfaCkrbYwSi6pdPjToEoATPWfuCdkZUulENBIdBkTLZ6F97fgNgsXub2xOEIRxqFAzg3G2nO3Mn7rSRRJraZNIsHgBTYpSNcijDBwZpgYKjcKsochYUNzVrCuLOu5xJPUU87pmd+Rup2hpMfWyK0xtUjncvHyfctEZANqfo+RdEBg81n1WHkFb1WnWUsRh8RmcVZuA9skI5S7Xhp4L2B5IKn0XGnKLG3og9iYb9tDVQys4o5/68+jjxdm51fmRYo3FvghnyFCYkQ/tm+ClCcRSPocYDrfSf0Rvg2v9nPmMj0IrEHlzVnafiJgp3VjI9cYLNW2wKiwf0Z8dWkrtnS8G7p072+w0fklmvLrdvlLZduAwrY6gS2nMbPUz1AwjAoMmQi7sFmbkP6M/PmkVV+hNP7T9ntmC4BQr2k5/3gKZPOEPO/xeMLlla68QpDVxU06NhC0Z3d5t3YY0wIVISNZXi4fgQO0G5nvFpPyyWCvvg39gulyAwUJfFQ3erNNFTjJe7X9RjqoJvjTgFm4IaYcL64Cr49KDu6Za01g492rBCEL842o3lVmZSqOYCG3UEEsSwOxn2iROZKgorZ5dyd1n1WevM+pKTUAaucy52iLJGLISRAVv82ZkmbS5L4zMHkYxVjUnqrYIZsk6+7sRHIQ31E0YtUFdMjRYUcOwfR1u+Ox+zV1NawpKjsuhKl+DRN+Q1TXUdEumUU1pDHT/RXtNHsyYOgeCBbTs93kdhFcHgO0dh5Ou/2N8EcTzWwAYd/qyE3wMZZTggTb44xwu6h0XhaLtnAk2lZ4vXwSaozf+Vq/uxAvYLxrhx6ujKVyX/O053YsKqOPKerYoN17uO8PrKoA==,iv:e0RPF9ZtzSRBRzMtWTWY3AVGsMXxvldA2HjiW9hf97Q=,tag:eb9ACnuGR+8eqncWoKQ/pw==,type:str] vaultwarden.env: ENC[AES256_GCM,data:9LcB2B/IJ2xQCTNKtRr9bBbtFqZMGSi/9jPozmGUtMvgeVqlljpbtVgCzH62oeUQMLeKQ0SxHsQ7GDgU25X6wVZ8qMT4hzVzNYJnXljs1/ePPN+NfCsPtnBjo+jQLvhVPb8gIGpmT/ZqNMXBLNpLWu2U3RQVzwlJS2wQsP4kbR+z2nuEL/bs52qI9cNmsRTA/C8gIQHCHJby+PTh6BbXp0Wvy0xI+KHKx2qSYiVXsjowid+0h56/Ma1cqUcZlxUiDSUYmTvmgYPzigFD9jOkg1mhHRIi8iste6EDVWB0jHcKMMihd7dMZ64/UUY2y5/ardIP9jUA,iv:/EQv/PYTIHANDjbjMe/BmY6dwjok9YsYj5iKLWyu0eI=,tag:IMcJ3nle9wJANuogrJBUuQ==,type:str] - radicale-htpasswd: ENC[AES256_GCM,data:P7flxa84q/SVhkV1A1aV/R6B2EqwFX0WTpHctK/Jz1yhPxRotWSH1qvJpWjAmVdtX/icWdxHSKdhbscDDEMf5EQ=,iv:Dc/bMYU9gTzHTDEpwkLx9tzeG2AEJJsj2XNxPVSd0Sc=,tag:7U91MLVKq0Ya6FuOgV44rA==,type:str] + radicale: + htpasswd: ENC[AES256_GCM,data:aPSxsPGzAQ9C6iHYbNDkIN8htYSEAJu6vvGH4Jd+yQtiWr/RyDgA4FSTn8/RN8vyVs3gsIGUUmPTwHUfZi2+dFs=,iv:DjrfciKTqj4PH3eIhpnWQp6I8sFhH2Isf3qmCGzziy8=,tag:jKdrcuojQdgoKRDsZxLtEA==,type:str] + password: ENC[AES256_GCM,data:wnXEAWH/aiCbB0FUnAZ73kfhFeNuuvo=,iv:4uVb7f9JBRDjX060fKGc3MwA1wBJuf6QKU6rom+0aIE=,tag:NHikKehpTfeWKT72OXRqdw==,type:str] paperless.pw: ENC[AES256_GCM,data:IW63GmHCVCIebWg917VNyLjQMQ6LIg8rwg==,iv:7/kSSlWFUV0vaaMfagBM/0IxeMhZ16mYN2ZlKmKFU3Y=,tag:S0cmsYkZP6v6NbhFRiv3Sg==,type:str] nextcloud: admin-pass: ENC[AES256_GCM,data:u6k70HwxBKAom8kvUihNjwbYsOikOt4sG1U=,iv:K0XPh1NfaGhFJ0ZVOWqnihZee6uuWxr0Vu8aR0ykr30=,tag:YyxgoVUxk4YxFnDmXkBXpw==,type:str] @@ -85,8 +87,8 @@ sops: SHJLR3lvdlFiRmJuU25RUHFFTmpjamMKbzycdDvQBAuOiRROTZEQSnaXoPapz73L yVS9EUP25FSx/sGqRqaCefbeaybuM1aso6LDnlomv4Bib7zjugWKSw== -----END AGE ENCRYPTED FILE----- - lastmodified: "2024-12-28T15:07:30Z" - mac: ENC[AES256_GCM,data:/0aTAChZQYaV+JcKpzShdkN3KDLTtTgvQar+bGePHyAXjby2FTn8+Nw6N0nSSEkqP6F6CIcEsGx1Q1RqTY5op/6MgkFwxA8bl11kX0rQtz1n1nrHglxI6rh20euIpxGVVEj+3vpIgeLyrmPICQpqbuPm+ujImoMv9hxl/+HXYAE=,iv:1wqiuYMpDg3+T0NUL0CQ2CNqW2+fQHlDve+DkUwqpjs=,tag:d2za03gqiQunKMOF2V1ARA==,type:str] + lastmodified: "2025-01-31T18:19:08Z" + mac: ENC[AES256_GCM,data:RpbqXk0JclXNVcHs5jCHVaw59AwzCnfhGsxoQnOwNEYWnAxEC5b0fXtjIC6Od4ziPJkPzUtfHgBG9Ub+b+RL7LUMPmsPOZ8XxE16YTrr+athK1s07I8doON8UpIsGj+MP/quJgy9pb/AvReOce/5Qe8SZG4Lig68I3iqHYFsiJ4=,iv:Huc7dZQPkJ+aPBgfqxdhy+PRl+8520aZMmqBeNd/C2w=,tag:M897FVr8TfAx3zDaml69Ww==,type:str] pgp: - created_at: "2024-06-09T19:44:41Z" enc: |- diff --git a/system-modules/calendar.nix b/system-modules/calendar.nix index 00b81e3..8ca01c3 100644 --- a/system-modules/calendar.nix +++ b/system-modules/calendar.nix @@ -1,5 +1,11 @@ { ... }: { programs.dconf.enable = true; - services.gnome.evolution-data-server.enable = true; + services = { + gnome = { + evolution-data-server.enable = true; # optional to use google/nextcloud calendar + gnome-online-accounts.enable = true; # optional to use google/nextcloud calendar + gnome-keyring.enable = true; + }; + }; }