From 32aa905e91ad6ee52fd2a2dfbaeb23ce52030904 Mon Sep 17 00:00:00 2001
From: ene <ene@sils.li>
Date: Sun, 5 Mar 2023 17:57:25 +0100
Subject: Fix(hm/conf/zsh): Import prompt & cursor in .zshrc

---
 home-manager/config/zsh/config/zsh-init.sh |  2 +-
 home-manager/config/zsh/default.nix        | 14 +++++++-------
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/home-manager/config/zsh/config/zsh-init.sh b/home-manager/config/zsh/config/zsh-init.sh
index bc9af87a..e9b84a41 100644
--- a/home-manager/config/zsh/config/zsh-init.sh
+++ b/home-manager/config/zsh/config/zsh-init.sh
@@ -27,7 +27,7 @@
 #source "${ZDOTDIR}/ali.sh"
 #source "${ZDOTDIR}/prompt.sh"
 #source "${ZDOTDIR}/hotkeys.sh"
-source "./${path_custom_cursor}"
+#source "./${path_custom_cursor}"
 #source ~/.local/lib/shell/lib
 #
 ## Load zsh-syntax-highlighting
diff --git a/home-manager/config/zsh/default.nix b/home-manager/config/zsh/default.nix
index 80bc79d8..e7555235 100644
--- a/home-manager/config/zsh/default.nix
+++ b/home-manager/config/zsh/default.nix
@@ -40,14 +40,12 @@
     };
 
     loginExtra =
-      builtins.readFile ./config/zsh-prompt.sh
-      + builtins.readFile ./config/custom_cursor.sh
-      + ''
+      ''
         eval $(ssh-agent -s) > /dev/null # start ssh agent
         export ENHANCHED_NEOFETCH="$(pacman -Qn | wc -l) (pacman), $(pacman -Qm | wc -l) (aur), $(($(cargo install --list | wc -l ) / 2)) (cargo)"
       ''
       + lib.concatStringsSep "\nsetopt " [
-        "AUTO_CD"
+        "setopt AUTO_CD" # This is needed as first item
         "AUTO_PUSHD"
         "CHASE_DOTS"
 
@@ -68,8 +66,10 @@
         "VI"
       ];
 
-    initExtraFirst = builtins.readFile ./config/zsh-init.sh;
-
+    initExtraFirst =
+      builtins.readFile ./config/zsh-init.sh
+      + builtins.readFile ./config/zsh-prompt.sh
+      + builtins.readFile ./config/custom_cursor.sh;
     shellAliases = {
       ls = "ls -a --color=auto";
       ll = ". ll";
@@ -118,7 +118,7 @@
       GOPATH = "${config.xdg.dataHome}/go";
       GTK2_RC_FILES = "${config.xdg.configHome}/gtk-2.0/gtkrc";
       LESSHISFILE = "${config.xdg.cacheHome}/less/history";
-# LESSKEYIN = "${config.xdg.configHome}/less/lesskey";
+      # LESSKEYIN = "${config.xdg.configHome}/less/lesskey";
       RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
       NPM_CONFIG_USERCONFIG = "${config.xdg.configHome}/npm/npmrc";
       NUGET_PACKAGES = "${config.xdg.cacheHome}/NuGetPackages";
-- 
cgit 1.4.1