hm: rename initExtraFirst to initContent with lib.mkBefore HEAD main

2 files changed, 7 insertions, 8 deletions

diff --git a/hm/gpg/default.nix b/hm/gpg/default.nix
index 2632874..a8478a8 100644
--- a/hm/gpg/default.nix
+++ b/hm/gpg/default.nix
@@ -16,7 +16,7 @@
     enableSshSupport = true;
     sshKeys = ["4077454831C98FE4BE4A9C167186C5A63615B790"];
   };
-  programs.zsh.initExtraFirst = lib.mkBefore ''
+  programs.zsh.initContent = lib.mkBefore ''
     current_tty="$(tty)"
     tty() { echo "$current_tty"; }
     SSH_AUTH_SOCK=$(gpgconf --list-dirs agent-ssh-socket)
diff --git a/hm/zsh/default.nix b/hm/zsh/default.nix
index 684493f..88a429d 100644
--- a/hm/zsh/default.nix
+++ b/hm/zsh/default.nix
@@ -2,6 +2,7 @@
   config,
   pkgs,
   self,
+  lib,
   ...
 }: {
   programs.zsh = {
@@ -61,12 +62,10 @@
       addapache = "curl https://www.apache.org/licenses/LICENSE-2.0.txt > LICENSE";
     };
 
-    initExtraFirst =
-      builtins.readFile ./config/instant-prompt.zsh
-      + "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme";
-    # +
-    initExtra =
-      ''
+    initContent = lib.mkBefore (builtins.readFile ./config/instant-prompt.zsh
+      + "source ${pkgs.zsh-powerlevel10k}/share/zsh-powerlevel10k/powerlevel10k.zsh-theme"
+      + ''
+
         rm -rf ~/.mozilla/firefox/default/containers.json.backup
 
         export ZSH=${pkgs.oh-my-zsh}/share/oh-my-zsh/
@@ -80,6 +79,6 @@
           source $ZSH/oh-my-zsh.sh
       ''
       + builtins.readFile ./config/p10k.zsh
-      + builtins.readFile ./config/functions.zsh;
+      + builtins.readFile ./config/functions.zsh);
   };
 }