diff --git a/git-crypt/secrets.nix b/git-crypt/secrets.nix
index 286fdf6..0ad1179 100644
Binary files a/git-crypt/secrets.nix and b/git-crypt/secrets.nix differ
diff --git a/home-modules/bar/caldav-event.nix b/home-modules/bar/caldav-event.nix
index 097fc05..c9e0a0c 100644
--- a/home-modules/bar/caldav-event.nix
+++ b/home-modules/bar/caldav-event.nix
@@ -1,6 +1,8 @@
-{ pkgs, ... }@all: with all; {
+{ pkgs, ... }@all: with all; let
+  username = "lennart";
+in {
   sops.secrets = {
-    "nx2site/radicale/password" = { };
+    "nx2site/nextcloud/lennart_pass" = { };
   };
   home.packages = [
     (pkgs.writers.writePython3Bin "caldav_event" {
@@ -90,10 +92,10 @@ def is_too_old(event_dict: dict) -> bool:
     return now - last_checked >= timedelta(minutes=10)
 
 if __name__ == "__main__":
-    password_file = "${config.sops.secrets."nx2site/radicale/password".path}"  # Path to password file
+    password_file = "${config.sops.secrets."nx2site/nextcloud/lennart_pass".path}"  # Path to password file
     cache_file = "/tmp/caldav_event_cache.json"  # Path to cache file
-    url = "https://dav.${hyper.domain}/"
-    username = "nx2"
+    url = "https://n.${hyper.domain}/remote.php/dav/calendars/${username}/"
+    username = "${username}"
     password = get_password(password_file)
     now = datetime.now(timezone.utc).timestamp()
 
diff --git a/home-modules/email.nix b/home-modules/email.nix
index 02d5f9e..cd56500 100644
--- a/home-modules/email.nix
+++ b/home-modules/email.nix
@@ -187,14 +187,17 @@
       userName = "lennart@${hyper.domain}";
       realName = "Lennart J. Kurzweg";
       imap = {
-        port = 143;
-        host = "mail.${hyper.domain}";
-        tls.useStartTls = true;
+        port = 993;
+        host = "ssh.${hyper.domain}";
+        tls.enable = true;
       };
       smtp = {
-        port = 587;
-        host = "mail.${hyper.domain}";
-        tls.useStartTls = true;
+        port = 465;
+        host = "mail-eu.smtp2go.com";
+        tls.enable = true;
+        # port = 587;
+        # host = "mail.${hyper.domain}";
+        # tls.useStartTls = true;
       };
       signature = {
         text = ''
diff --git a/home-modules/ssh.nix b/home-modules/ssh.nix
index 7bf978b..3046f5a 100644
--- a/home-modules/ssh.nix
+++ b/home-modules/ssh.nix
@@ -36,6 +36,12 @@
       "nxace"                            = (nxace "nxace" );
       "nxacel"                           = (nxace "nxacel") // { hostname = "10.0.1.1"; };
       "nxrpli"                           = (nxace "nxrpil") // { hostname = "10.0.1.31"; port = 22; };
+      "nx2s-email-relay" = default // {
+        identityFile = "${hyper.home}/vault/ssh/nx2s-email-relay";
+        host = "35.243.218.208";
+        port = 22;
+        user = secrets.ssh.nx2s-email-relay-user;
+      };
     };
   };
   services.ssh-agent = {
diff --git a/home-modules/yazi.nix b/home-modules/yazi.nix
index eeadbfb..38ff487 100644
--- a/home-modules/yazi.nix
+++ b/home-modules/yazi.nix
@@ -88,8 +88,8 @@ in {
       	{ on = ";";         run = "shell --interactive";         desc = "Run a shell command";                            }
       	{ on = ":";         run = "shell --block --interactive"; desc = "Run a shell command (block until finishes)";     }
       	{ on = ".";         run = "hidden toggle";               desc = "Toggle the visibility of hidden files";          }
-      	{ on = "s";         run = "search fd";                   desc = "Search files by name using fd";                  }
-      	{ on = "S";         run = "search rg";                   desc = "Search files by content using ripgrep";          }
+      	{ on = "s";         run = "search --via=fd";             desc = "Search files by name using fd";                  }
+      	{ on = "S";         run = "search --via=rg";             desc = "Search files by content using ripgrep";          }
       	{ on = "<C-s>";     run = "escape --search";             desc = "Cancel the ongoing search";                      }
       	{ on = "z";         run = "plugin zoxide";               desc = "Jump to a directory using zoxide";               }
       	{ on = "Z";         run = "plugin fzf";                  desc = "Jump to a directory or reveal a file using fzf"; }
diff --git a/system-modules/nix.nix b/system-modules/nix.nix
index 5fcbe0b..651f9ac 100644
--- a/system-modules/nix.nix
+++ b/system-modules/nix.nix
@@ -3,12 +3,12 @@
     experimental-features = [ "nix-command" "flakes" ];
     substituters = [
       "https://cache.nixos.org/"
-      # "https://cache.nixos-cuda.org"
+      "https://cache.nixos-cuda.org"
       "https://nix-community.cachix.org"
     ];
     trusted-public-keys = [
       "nix-community.cachix.org-1:mB9FSh9qf2dCimDSUo8Zy7bkq5CX+/rkCWyvRCYg3Fs="
-      # "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
+      "cache.nixos-cuda.org:74DUi4Ye579gUqzH4ziL9IyiJBlDpMRn9MBN8oNan9M="
     ];
   };
 }