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