diff --git a/home/programs/khal.nix b/home/programs/khal.nix
index c9de72c..e3855bc 100644
--- a/home/programs/khal.nix
+++ b/home/programs/khal.nix
@@ -21,6 +21,9 @@
     [[typo3]]
     path = ${config.xdg.dataHome}/vdir/calendars/private/typo3
     color = #FFE377
+    [[nixosorg]]
+    path = ${config.xdg.dataHome}/vdir/calendars/private/nixosorg
+    color = light blue
 
     [[work]]
     path = ${config.xdg.dataHome}/vdir/calendars/company/personal
diff --git a/home/programs/vdirsyncer.nix b/home/programs/vdirsyncer.nix
index 96a8703..ee6bbd5 100644
--- a/home/programs/vdirsyncer.nix
+++ b/home/programs/vdirsyncer.nix
@@ -5,6 +5,8 @@
 
   frequency = "Mon..Thu *-*-* 15,12,8:00";
 
+  # Run `vdirsyncer discover <name>` after adding a new pair
+
   configuration = ''
     [general]
     status_path = "${config.xdg.dataHome}/vdirsyncer/status/"
@@ -25,6 +27,19 @@
     start_date = "datetime.now() - timedelta(days=60)"
     end_date = "datetime.now() + timedelta(days=365)"
 
+    [pair nixos]
+    a = "nixos_calendar_private"
+    b = "nixos_calendar_public"
+    collections = null
+    [storage nixos_calendar_private]
+    type = "caldav"
+    url = "https://nextcloud.daniel-siepmann.de/remote.php/dav/calendars/dsiepmann/nixosorg/"
+    username = "dsiepmann"
+    password.fetch = ["command", "${pkgs.libsecret}/bin/secret-tool", "lookup", "account", "app-dsiepmann@nextcloud.daniel-siepmann.de"]
+    [storage nixos_calendar_public]
+    type = "http"
+    url = "https://calendar.google.com/calendar/ical/b9o52fobqjak8oq8lfkhg3t0qg%40group.calendar.google.com/public/basic.ics"
+
     [pair company_calendar]
     a = "company_calendar_local"
     b = "company_calendar_remote"