diff --git a/home/accounts/calendar.nix b/home/accounts/calendar.nix
index bc76dfe8..90fd504d 100644
--- a/home/accounts/calendar.nix
+++ b/home/accounts/calendar.nix
@@ -19,8 +19,12 @@
           type = "caldav";
           url = "https://cloud.xenia.me.uk/remote.php/dav";
           userName = "xenia";
-          passwordCommand =
-            [ "${pkgs.pass}/bin/pass" "show" "Calendar/NextCloud/emacs" ];
+          passwordCommand = [
+            "${pkgs.libsecret}/bin/secret-tool"
+            "lookup"
+            "url"
+            "https://cloud.xenia.me.uk"
+          ];
         };
         vdirsyncer = {
           enable = true;
diff --git a/home/config/vdirsyncer.nix b/home/config/vdirsyncer.nix
deleted file mode 100644
index 34757e8f..00000000
--- a/home/config/vdirsyncer.nix
+++ /dev/null
@@ -1,66 +0,0 @@
-{ pkgs, ... }:
-
-''
-  [general]
-  # A folder where vdirsyncer can store some metadata about each pair.
-  status_path = "~/.vdirsyncer/status/"
-
-  # CARDDAV
-  [pair nextcloud_contacts]
-  a = "nextcloud_contacts_local"
-  b = "nextcloud_contacts_remote"
-  collections = ["from b"]
-  metadata = ["displayname"]
-  conflict_resolution = null
-
-  [storage nextcloud_contacts_local]
-  type = "filesystem"
-  path = "~/.contacts/personal/"
-  fileext = ".vcf"
-
-  [storage nextcloud_contacts_remote]
-  type = "carddav"
-  read_only = true
-  url = "https://cloud.xenia.me.uk/remote.php/dav/addressbooks/users/xenia/contacts-1/"
-  username = "xenia"
-  password.fetch = ["shell", "${pkgs.pass}/bin/pass show Calendar/NextCloud/emacs | head -n1"]
-
-  # CALDAV
-  [pair nextcloud_calendar]
-  a = "nextcloud_calendar_local"
-  b = "nextcloud_calendar_remote"
-  collections = ["from b"]
-  metadata = ["displayname", "color"]
-
-  [storage nextcloud_calendar_local]
-  type = "singlefile"
-  path = "~/.calendars/nextcloud/%s.ics"
-
-  [storage nextcloud_calendar_remote]
-  type = "caldav"
-  read_only = true
-  url = "https://cloud.xenia.me.uk/remote.php/dav"
-  username = "xenia"
-  password.fetch = ["shell", "${pkgs.pass}/bin/pass show Calendar/NextCloud/emacs | head -n1"]
-
-  [pair ukaea_calendar]
-  a = "ukaea_calendar_local"
-  b = "ukaea_calendar_remote"
-  collections = ["calendar"]
-  partial_sync = "ignore"
-  metadata = ["displayname", "color"]
-
-  [storage ukaea_calendar_local]
-  type = "singlefile"
-  path = "~/.calendars/ukaea/%s.ics"
-
-  [storage ukaea_calendar_remote]
-  type = "caldav"
-  read_only = true
-  start_date = "datetime.now() - timedelta(days=31)"
-  end_date = "datetime.now() + timedelta(days=31)"
-  item_types = ["VEVENT"]
-  url = "http://localhost:1080/users/evie.litherland-smith@ukaea.uk/calendar"
-  username = "evie.litherland-smith@ukaea.uk"
-  password.fetch = ["shell", "${pkgs.pass}/bin/pass show Mail/Outlook/ukaea | head -n1"]
-''