diff --git a/modules/my-tinc/hosts.nix b/modules/my-tinc/hosts.nix
index 9261a1c..bb9b534 100644
--- a/modules/my-tinc/hosts.nix
+++ b/modules/my-tinc/hosts.nix
@@ -16,8 +16,8 @@ in
     services.tinc.networks.my-tinc.hostSettings = mapAttrs (name: host: {
       addresses = [ { address = host.address; } ];
       subnets = [ { address = host.subnetAddr; } ];
-      rsaPublicKey = if (host ? "rsaPublicKey") then (builtins.readFile host.rsaPublicKey) else null;
-      settings.Ed25519PublicKey = mkIf (host ? "ed25519PublicKey") (builtins.readFile host.ed25519PublicKey);
+      rsaPublicKey = mkIf (host ? "rsaPublicKey") host.rsaPublicKey;
+      settings.Ed25519PublicKey = mkIf (host ? "ed25519PublicKey") host.ed25519PublicKey;
     }) hosts;
   };
 }
diff --git a/modules/my-tinc/hosts/default.nix b/modules/my-tinc/hosts/default.nix
index 571f011..ebcf590 100644
--- a/modules/my-tinc/hosts/default.nix
+++ b/modules/my-tinc/hosts/default.nix
@@ -1,8 +1,14 @@
 {
   # TODO: Edit the list of hosts here.
   nki-cloud = {
-    subnetAddr = "10.0.0.10";
+    subnetAddr = "11.0.0.1";
     address = "nki.personal";
-    rsaPublicKey = ./nki-cloud.pub;
+    rsaPublicKey = builtins.readFile ./nki-cloud.pub;
   };
+
+  nki-macbook = {
+    subnetAddr = "11.0.0.3";
+    rsaPublicKey = builtins.readFile ./nki-macbook.pub;
+    ed25519PublicKey = "lkNkBTl5GmcQFrtA7F1nN2gq5gFK7KuGqHUN8fiJU7H";
+  }
 }
diff --git a/modules/my-tinc/hosts/nki-macbook.pub b/modules/my-tinc/hosts/nki-macbook.pub
new file mode 100644
index 0000000..7c5f30c
--- /dev/null
+++ b/modules/my-tinc/hosts/nki-macbook.pub
@@ -0,0 +1,25 @@
+
+-----BEGIN RSA PUBLIC KEY-----
+MIIECgKCBAEArruSM+4etKvZ2dWeBP8nA1lQeY/T3gBD7JMdHqG/BlEmEkEW2jrq
+1UpABXEh5MyZ2ekSG5xr9awmVdybxauC0NPiDGxfknctS4F23asK0q5XjcnPtnln
+cBhq7RPKdX1oGDyWrL4pVHOX+6cRZ6IsQemxfXlm3chl/5ore9b728wrU/FpkBBL
+5gnzI3vtPWlBhrGxQOVobdLI4EYtFfbXV/IOqoe+5po8iYCliUQGF88R0V57YYpK
+YXjuVtANMvoRsT5N7OJgoLjGeHEVXB0Umjfci+gbt+u+bKt0eBODFsawFWJCxxpY
+cgbHtAViHZLSL5MTOlSBaW6tKsR/LrDUOCKu27Ccf7ZGG6U3O32ZI95+rsmuo+y7
+DicZuW/YnvLomy+/XxzBvMYhDgQAMrOZTzCj6fjyie3FsdUHB2ydUhAkpvQMgBZM
+6m0F5kancKNXaSXv82AaJrEclqo3DjAAtOy8jS/t7JyjwUh6LdKjjt68dmbq8weK
+y9IZxQun/X+fEK4W2YVxm/nftJSPv/j1qsxakzuSHOAeQggLiOIcJi2aMftrfJJS
+9DNqoDHy1cf0I9hH6VLcwx+fk4RkDdr7+SupKjFmhSz0ZlL80uc3I4yJg+cN+4rW
+E5HFS+nxDQ1fwbH/pC5fXgvNTyepzqs+zTOKCjzezqGP4fgfCTODt6uXpuc52smY
+agUfYd5fOW+RLrAP/Z1vvFBI26RBrOpfIFYEgAsRfx5iHI/SUxu3FDSl+cewiQ3k
+AIvD+wGEpTI64nZr7sgF/rUR5mTrS51+3eWm9SHLF9R5hYHHe2HWILBvNu9YLQdI
+pQmNmu4H32/gNP8HnSm8I1zDChB84o+FnjyZ0EhTDOdg6BemssvoWnuQ+CoUsmyZ
+lB+A8bUIaFYaGtx46ESdSzHJVWV25P6vVgXbqS2OqC2Slkc8RWYKfoHLvJg28zT0
+A5naep3YWymXXhzsUXeEuyc68GZvF8BFV13XTiiULy3ZCjlBGA9xZoc4lLKdKXNk
+Y/q908RHu2BUB3z6eeVKGDCGD9E/jiK+NpBWtrPmuBNTz4cC2cbjhx17j7dLF/wa
+JY2iCeRCfNhTkE7oP9uWf5nUrUU/DlUdz4DC6JNHeo2hmLNjNQLBx+2ExtAdcF1g
+4WhDnuKtrMTedRqwQLVE7FNW9iwBDpCQlmGkg+JE0+qdQBaoKDco/l2npSVVWjCU
+5eeB+xCZd25gPFDUQtGYt6Pux/6E0+3wLr2flGODfYHEGLsGlUIisIEs2WrISxcd
+5bSDrFh23GUsOZdruUA1GDgXu5+DUFhEriZDDWYzl5Zf83qqLgYP/RZuX5VWQ8Ge
+PGw+fTnj/IneKgrhg8YgZCmK9j4hh+KMPwIDAQAB
+-----END RSA PUBLIC KEY-----