diff --git a/machines/Home-Hypervisor/default.nix b/machines/Home-Hypervisor/default.nix
index bbb32cf..0f2e887 100644
--- a/machines/Home-Hypervisor/default.nix
+++ b/machines/Home-Hypervisor/default.nix
@@ -41,6 +41,7 @@ in {
     nixosProfiles.attic
     nixosProfiles.restic-server
     nixosProfiles.outline
+    nixosProfiles.radicale
 
     (import nixosProfiles.blocky {
       inherit config;
diff --git a/machines/Home-Hypervisor/dns-mapping.nix b/machines/Home-Hypervisor/dns-mapping.nix
index 4efdb60..2fcffc3 100644
--- a/machines/Home-Hypervisor/dns-mapping.nix
+++ b/machines/Home-Hypervisor/dns-mapping.nix
@@ -24,7 +24,7 @@
         "bathist.ataraxiadev.com" = "bathist.ataraxiadev.com";
         "browser.ataraxiadev.com" = "ataraxiadev.com";
         "cache.ataraxiadev.com" = "ataraxiadev.com";
-        "cinny.ataraxiadev.com" = "matrix.ataraxiadev.com";
+        "cal.ataraxiadev.com" = "ataraxiadev.com";
         "cocalc.ataraxiadev.com" = "ataraxiadev.com";
         "code.ataraxiadev.com" = "ataraxiadev.com";
         "docs.ataraxiadev.com" = "ataraxiadev.com";
diff --git a/machines/NixOS-VPS/hardware/dns-mapping.nix b/machines/NixOS-VPS/hardware/dns-mapping.nix
index afa17b6..2e1532a 100644
--- a/machines/NixOS-VPS/hardware/dns-mapping.nix
+++ b/machines/NixOS-VPS/hardware/dns-mapping.nix
@@ -6,7 +6,7 @@
     { name = "bathist.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
     { name = "browser.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
     { name = "cache.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
-    { name = "cinny.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
+    { name = "cal.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
     { name = "cocalc.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
     { name = "code.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
     { name = "dimension.ataraxiadev.com"; type = "A"; value = "100.64.0.3"; }
@@ -50,7 +50,7 @@
     { name = "bathist.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
     { name = "browser.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
     { name = "cache.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
-    { name = "cinny.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
+    { name = "cal.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
     { name = "cocalc.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
     { name = "code.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
     { name = "dimension.ataraxiadev.com"; type = "AAAA"; value = "fd7a:115c:a1e0::3"; }
diff --git a/profiles/servers/nginx.nix b/profiles/servers/nginx.nix
index fa46488..d2e5b3c 100644
--- a/profiles/servers/nginx.nix
+++ b/profiles/servers/nginx.nix
@@ -78,9 +78,9 @@ in {
         "openbooks.ataraxiadev.com"
         "cache.ataraxiadev.com"
         "docs.ataraxiadev.com"
+        "cal.ataraxiadev.com"
 
         "matrix.ataraxiadev.com"
-        "cinny.ataraxiadev.com"
         "dimension.ataraxiadev.com"
         "stats.ataraxiadev.com"
         "element.ataraxiadev.com"
@@ -149,7 +149,6 @@ in {
       "matrix:443" = {
         serverAliases = [
           "matrix.ataraxiadev.com"
-          "cinny.ataraxiadev.com"
           "dimension.ataraxiadev.com"
           "element.ataraxiadev.com"
           "stats.ataraxiadev.com"
@@ -204,6 +203,12 @@ in {
           '' + proxySettings;
         };
       } // default;
+      "cal.ataraxiadev.com" = {
+        locations."/" = {
+          proxyPass = "http://127.0.0.1:5232";
+          extraConfig = proxySettings;
+        };
+      } // default;
       "vw.ataraxiadev.com" = {
         locations."/" = {
           proxyPass = "http://127.0.0.1:8812";
diff --git a/profiles/servers/radicale.nix b/profiles/servers/radicale.nix
new file mode 100644
index 0000000..2afc17e
--- /dev/null
+++ b/profiles/servers/radicale.nix
@@ -0,0 +1,25 @@
+{ config, pkgs, lib, ... }: {
+  secrets.radicale-htpasswd = {
+    owner = "radicale";
+    services = [ "radicale.service" ];
+  };
+  services.radicale = {
+    enable = true;
+    settings = {
+      server = {
+        hosts = [ "127.0.0.1:5232" ];
+      };
+      auth = {
+        type = "htpasswd";
+        htpasswd_filename = config.secrets.radicale-htpasswd.decrypted;
+        htpasswd_encryption = "bcrypt";
+      };
+      storage = {
+        filesystem_folder = "/var/lib/radicale/collections";
+      };
+      web.type = "internal";
+    };
+  };
+
+  persist.state.directories = [ "/var/lib/radicale" ];
+}
\ No newline at end of file