home: fix 25.05 deprecation warnings

3 files changed, 8 insertions, 3 deletions

diff --git a/home/baseline/zsh.nix b/home/baseline/zsh.nix
index 8dd169c..48fdd4a 100644
--- a/home/baseline/zsh.nix
+++ b/home/baseline/zsh.nix
@@ -6,9 +6,11 @@ in
   config = {
     programs.zsh = {
       enable = true;
+
       autosuggestion.enable = true;
       syntaxHighlighting.enable = true;
-      initExtra = import ./zshrc.nix pkgs;
+
+      initContent = lib.mkAfter (import ./zshrc.nix pkgs);
     };
   };
 }
diff --git a/home/desktop/firefox.nix b/home/desktop/firefox.nix
index 4a7bbac..a074ac0 100644
--- a/home/desktop/firefox.nix
+++ b/home/desktop/firefox.nix
@@ -15,7 +15,7 @@ in
         id = 0;
         name = "default";
 
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+        extensions.packages = with pkgs.nur.repos.rycee.firefox-addons; [
           decentraleyes
           darkreader
           old-reddit-redirect
diff --git a/home/environ/gpg.nix b/home/environ/gpg.nix
index dd58181..91feee6 100644
--- a/home/environ/gpg.nix
+++ b/home/environ/gpg.nix
@@ -24,7 +24,10 @@ in
       maxCacheTtl = 3600 * 6;
       maxCacheTtlSsh = 3600 * 6;
 
-      pinentryPackage = pkgs.pinentry-gtk2;
+      pinentry = {
+        package = pkgs.pinentry-gtk2;
+        program = "pinentry-gtk-2";
+      };
     };
   };
 }