diff --git a/machines/moritz-desktop/configuration.nix b/machines/moritz-desktop/configuration.nix
index e089aed..0ab1f1c 100644
--- a/machines/moritz-desktop/configuration.nix
+++ b/machines/moritz-desktop/configuration.nix
@@ -30,8 +30,6 @@
       desktop.enable = true;
       personal.enable = true;
       personal.mail = true;
-      personal.calendar = true;
-      personal.contacts = true;
       impermanence.enable = true;
       webis.enable = true;
     };
diff --git a/modules/moritz/profiles/personal_calendar.nix b/modules/moritz/profiles/personal_calendar.nix
index e4b7358..af32e19 100644
--- a/modules/moritz/profiles/personal_calendar.nix
+++ b/modules/moritz/profiles/personal_calendar.nix
@@ -8,7 +8,7 @@ with lib; let
 in {
   options.my.profiles.personal.calendar = mkEnableOption "calendar";
 
-  config = mkIf cfg.calendar {
+  config = mkIf cfg.contacts {
     environment.persistence."/persist".users.moritz.directories = [
       ".local/share/vdirsyncer/"
     ];
diff --git a/vars/shared/moritz-nextcloud/password/machines/moritz-desktop b/vars/shared/moritz-nextcloud/password/machines/moritz-desktop
deleted file mode 120000
index fc84b2f..0000000
--- a/vars/shared/moritz-nextcloud/password/machines/moritz-desktop
+++ /dev/null
@@ -1 +0,0 @@
-../../../../../sops/machines/moritz-desktop
\ No newline at end of file
diff --git a/vars/shared/moritz-nextcloud/password/secret b/vars/shared/moritz-nextcloud/password/secret
index dc32170..ad2c110 100644
--- a/vars/shared/moritz-nextcloud/password/secret
+++ b/vars/shared/moritz-nextcloud/password/secret
@@ -2,17 +2,13 @@
 	"data": "ENC[AES256_GCM,data:Zptujcz6GZrljTksLIeGQGKRsUDAYISLJHxsukdHPHA=,iv:Risivz70zVjHB6UUNpIZpHE0V2QpkHWaTPoOVx9x9Nc=,tag:FM4qJhg2inw0aHwjZ8wI0g==,type:str]",
 	"sops": {
 		"age": [
-			{
-				"recipient": "age1rgyueg2rnfw2er0rzkc6dc97p38fekjujdusfje6xn7g40plpfrshrlsyu",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBEUGdFQXI1VGt4ZTdqRmp2\naHZPOS9vU29YZnVYUXhQVkJiNWV3OGZxeGxnCjdXc3k1RGJXUmQ1eUtQR0UxcEpD\nMWZtWGxDMGlFYWFiMU5qOVZVVlhNUHcKLS0tIHZsVTFRYmxQMXVueHZGU1k3ZXVF\nK3RwWWtndXhXa3RQQnFMNytoMmdWRHMKXbNLlE+4EFRR1gk69rCZ3bc4SsWNr88g\nzz7cPH8jHCX94YHDNj1rK11yibudMZvR9HM7kefckzRt4GIXbKwufQ==\n-----END AGE ENCRYPTED FILE-----\n"
-			},
 			{
 				"recipient": "age12jlzcjwwhtgws4ku4nemwknsps3a6um74kdpxfv9pzvgdlhufp8q08c0j7",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBlRjZJR2dFUS9LK3JTT0ZQ\nVEZFRUtRdWtBYXNDam9QUVMrSDlJRG95aFJBCnpiVU9vQTZ5TVJrZnlpWU1HNEU5\nTi9GYUwvMTlrK3BEdmtldGxJMitEUmsKLS0tIHpDOXE2VnJGbVZJbnNzaXBMRHRj\nOVVkWWZCUGs3SmNFK1Iwb3lZK05OK2sKuni8J/XwM+9meWOdfuyUqRDJu2X+n3yh\nFuXT3AfrWoWkRmZcOEtItYN1EiVb83QEbt1K3To4Kix12p1nWHtGag==\n-----END AGE ENCRYPTED FILE-----\n"
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA1RFhHc3krVW56eFJoL0RX\nNUU1VmRVdlU1Tko2RDlRbC9GY2RLODkwb3prCnZjdGhPQjRrb24xMFFOL1htRUk5\nZ1l0TEpVZXdtdzJuZmlEUTluOTJKcFkKLS0tIDNZS0dwNnU5d1N4R09EKzBYTldB\nN2hRRXM4R0cvcVhnTVhxcTNHZzF3S3MKJtVnPznxXFASvVRj3fWJs4vvzLF3ipeC\nj2pxTb1Tc62gqoGWhCwnoRUrkSsmKbDNJNlZuTme+4hI7Xv5gpQpzA==\n-----END AGE ENCRYPTED FILE-----\n"
 			},
 			{
-				"recipient": "age13u2jaly7xxpehmh0r9573gzrh5ffcstfx7u7py57lrugm09nxqeqx5w265",
-				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBHOGZ3ZjJBMkgyZkY0SXJG\nQXRRUVNnbXg5TWVjQng5VFVnMlFtbGEyN3pzCjlPOXU0aXVYZXY3UDZ1STZhcWRF\ndWRHWTZPU1p6akNDZlhWWWpHY3p5Mk0KLS0tIHdIdU5rWjFWVjhKdE1USlJVQlJa\nUnBsZ0FVazBhbVljd2lyaUR2VWVVMVUKTKrxu8yO8cmlsNRsxqh8m6E8/kkTj1yi\nWYYaVqSSzLTAXvMzMFHEJnL4qQIHkkGj9fl2mRHEr7KJNTXWKo6gVA==\n-----END AGE ENCRYPTED FILE-----\n"
+				"recipient": "age1rgyueg2rnfw2er0rzkc6dc97p38fekjujdusfje6xn7g40plpfrshrlsyu",
+				"enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGeXRRdHNXMFJiZjAwZnFP\nWW9hSjFJNlBDbXp2THU3YWpaQ1d3RGV2NjM4CkszN0o1ZjNCT2ExY3hEVEtidjhH\nQ0lSbVhHanFNbFVKd0o3bHhLK3M3UGMKLS0tIFdMRk9PQXhwNkpJMXl5NktDSmxW\nczR3K3RPbHl6UlBuMDRjSGlqU2w3R00Kw0dEbmNBpwyabLHzig2+OKBmJ57R3itZ\nXKV1AK15ulnQAtuXePAQ0NtVA/92xW/0aTOWAfTiwnM81qG982guoA==\n-----END AGE ENCRYPTED FILE-----\n"
 			}
 		],
 		"lastmodified": "2025-04-19T10:34:35Z",