diff --git a/homes/common.nix b/homes/common.nix
index c70a24c..25e476c 100644
--- a/homes/common.nix
+++ b/homes/common.nix
@@ -170,7 +170,7 @@ in {
           "zsh-users/zsh-completions"
         ];
       };
-      initExtra = conda_init "zsh" + nd_bash_function;
+      initContent = conda_init "zsh" + nd_bash_function;
     };
   };
   xdg = {
diff --git a/homes/darwin.nix b/homes/darwin.nix
index e3f8920..4fb4601 100644
--- a/homes/darwin.nix
+++ b/homes/darwin.nix
@@ -153,5 +153,5 @@
       '';
     };
   };
-  services = { gpg-agent = { pinentryPackage = pkgs.pinentry_mac; }; };
+  services = { gpg-agent = { pinentry = { package = pkgs.pinentry_mac; }; }; };
 }
diff --git a/programs/firefox.nix b/programs/firefox.nix
index 9d6c65d..56ee1c1 100644
--- a/programs/firefox.nix
+++ b/programs/firefox.nix
@@ -94,7 +94,7 @@
                   "https://search.millironx.com/autocompleter?q={searchTerms}";
               }
             ];
-            iconUpdateURL =
+            icon =
               "https://search.millironx.com/static/themes/simple/img/favicon.png";
             updateInterval = 24 * 60 * 60 * 1000; # every day
             definedAliases = [ "@mxs" ];