From 941c8803b3957c14523f2c40a8d189caedecb17c Mon Sep 17 00:00:00 2001
From: Artur Manuel <amad@atl.tools>
Date: Thu, 3 Apr 2025 02:10:01 +0100
Subject: [PATCH] amadaluzian-zsh: fix package a small bit

---
 packages/amadaluzian-zsh/config/.zshrc |  6 +++---
 packages/amadaluzian-zsh/default.nix   | 16 +++++++++-------
 2 files changed, 12 insertions(+), 10 deletions(-)

diff --git a/packages/amadaluzian-zsh/config/.zshrc b/packages/amadaluzian-zsh/config/.zshrc
index d6e2aaf..17c656d 100644
--- a/packages/amadaluzian-zsh/config/.zshrc
+++ b/packages/amadaluzian-zsh/config/.zshrc
@@ -1,11 +1,11 @@
+source "@zsh-deferPath@"
+
 eval "$(@starshipPath@ init zsh)"
 eval "$(@zoxidePath@ init zsh --cmd j)"
 
-source "@zsh-deferPath@"
-
+zsh-defer source "@fzf-tabPath@"
 zsh-defer source "@zsh-syntax-highlightingPath@"
 zsh-defer source "@zsh-autosuggestionsPath@"
-source "@fzf-tabPath@"
 
 zstyle ':fzf-tab:*' fzf-command "@fzfPath@"
 
diff --git a/packages/amadaluzian-zsh/default.nix b/packages/amadaluzian-zsh/default.nix
index f4633c5..2f78f19 100644
--- a/packages/amadaluzian-zsh/default.nix
+++ b/packages/amadaluzian-zsh/default.nix
@@ -16,27 +16,29 @@
 symlinkJoin {
   name = "amadaluzian-zsh";
   paths = [
+    eza
     zsh
     inputs.self.packages.${system}.amadaluzian-starship
     zoxide
+    fzf
   ];
   nativeBuildInputs = [ makeWrapper ];
   postBuild = ''
-    cp -Lr ${./config} $out/share/zshrc
-    substituteInPlace $out/share/zshrc/.zshrc \
+    cp -Lr ${./config} $out/share/amadaluzian-zshrc
+    substituteInPlace $out/share/amadaluzian-zshrc/.zshrc \
       --subst-var-by ezaPath ${lib.getExe' eza "eza"} \
-      --subst-var-by fzf-tabPath ${zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh \
-      --subst-var-by zsh-deferPath ${zsh-defer}/share/zsh-defer/zsh-defer.plugin.zsh \
-      --subst-var-by zsh-syntax-highlightingPath ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \
-      --subst-var-by zsh-autosuggestionsPath ${zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh \
       --subst-var-by starshipPath ${
         lib.getExe' inputs.self.packages.${system}.amadaluzian-starship "starship"
       } \
       --subst-var-by zoxidePath ${lib.getExe' zoxide "zoxide"} \
       --subst-var-by fzfPath ${lib.getExe' fzf "fzf"} \
+      --subst-var-by fzf-tabPath ${zsh-fzf-tab}/share/fzf-tab/fzf-tab.plugin.zsh \
+      --subst-var-by zsh-deferPath ${zsh-defer}/share/zsh-defer/zsh-defer.plugin.zsh \
+      --subst-var-by zsh-syntax-highlightingPath ${zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh \
+      --subst-var-by zsh-autosuggestionsPath ${zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh \
 
     wrapProgram $out/bin/zsh \
-      --set ZDOTDIR $out/share/zshrc \
+      --set ZDOTDIR $out/share/amadaluzian-zshrc \
   '';
   meta.mainProgram = "zsh";
   passthru.shellPath = "/bin/zsh";