From 4aa82369574c310bf582f40625a2c775ea073557 Mon Sep 17 00:00:00 2001
From: Wroclaw <wroclaw223@outlook.com>
Date: Fri, 30 May 2025 19:05:18 +0200
Subject: [PATCH] nixos/shell: make sure zoxide is evaled latest

---
 nixos/modules/shell.nix | 22 +++++++++++++---------
 1 file changed, 13 insertions(+), 9 deletions(-)

diff --git a/nixos/modules/shell.nix b/nixos/modules/shell.nix
index 21d7088..2c70c93 100644
--- a/nixos/modules/shell.nix
+++ b/nixos/modules/shell.nix
@@ -39,15 +39,19 @@ in
       HISTCONTROL=ignoreboth
     '';
 
-    programs.bash.interactiveShellInit = ''
-      HISTCONTROL=ignoreboth
-      if test -n "$KITTY_INSTALLATION_DIR"; then
-        export KITTY_SHELL_INTEGRATION="enabled,no-sudo"
-        source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"
-      fi
-      eval "''$(zoxide init bash)"
-      alias bye=exit
-    '';
+    programs.bash.interactiveShellInit = lib.mkMerge [
+      ''
+        HISTCONTROL=ignoreboth
+        if test -n "$KITTY_INSTALLATION_DIR"; then
+          export KITTY_SHELL_INTEGRATION="enabled,no-sudo"
+          source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"
+        fi
+        alias bye=exit
+      ''
+      (lib.mkAfter ''
+        eval "''$(${lib.getExe pkgs.zoxide} init bash)"
+      '')
+    ];
 
     environment.etc."xdg/kitty/kitty.conf".text = ''
       font_family MesloLGS Nerd Font