From 09da381e2af7aeab155f239ef214c80f9c4a7106 Mon Sep 17 00:00:00 2001
From: cspark <git@cspark.dev>
Date: Mon, 25 Nov 2024 11:15:45 +0000
Subject: [PATCH] Interactive zoxide command and nicer terminal prompt

---
 global-home.nix | 18 +++++++++++++++---
 global.nix      |  3 +++
 2 files changed, 18 insertions(+), 3 deletions(-)

diff --git a/global-home.nix b/global-home.nix
index e32e7001..a5a025d4 100644
--- a/global-home.nix
+++ b/global-home.nix
@@ -62,9 +62,16 @@ fi
     # Version for zoxide
     (pkgs.writeShellScriptBin "z-nvim" ''
 if [ "$1" ]; then
-	z-builtin "''${1}" && printf "\033]7;file://''${PWD}\033\\"
+	builtin-z "''${1}" && printf "\033]7;file://''${PWD}\033\\"
 else
-	z-builtin "''${HOME}" && printf "\033]7;file://''${PWD}\033\\"
+	builtin-z "''${HOME}" && printf "\033]7;file://''${PWD}\033\\"
+fi
+    '')
+    (pkgs.writeShellScriptBin "zi-nvim" ''
+if [ "$1" ]; then
+	builtin-zi "''${1}" && printf "\033]7;file://''${PWD}\033\\"
+else
+	builtin-zi "''${HOME}" && printf "\033]7;file://''${PWD}\033\\"
 fi
     '')
     
@@ -307,6 +314,9 @@ fi
 
     # Dotnet path not found fix
     DOTNET_ROOT = "${pkgs.dotnet-sdk}";
+
+    # Nicer terminal prompt
+    PS1="\[\e[0;36m\]\u\[\e[0m\]@\[\e[0;33m\]\h\[\e[0m\]:\[\e[0;35m\]\w\[\e[0m\] \$ ";
   };
 
   programs.bash = {
@@ -315,7 +325,7 @@ fi
     # bashrcExtra = "fastfetch";
     initExtra = ''
       . "$HOME/.nix-profile/etc/profile.d/hm-session-vars.sh"
-      eval "$(zoxide init bash --cmd z-builtin)" # Initialise zoxide as terminal command z-builtin
+      eval "$(zoxide init bash --cmd builtin-z)" # Initialise zoxide as terminal command builtin-z
       ([[ -z $(tty) ]] && nvim +terminal) || fastfetch
     '';
     shellAliases = {
@@ -327,6 +337,8 @@ fi
     	#cd = "source cd-nvim";
     	z = "source z-nvim";
     	cd = "source z-nvim"; # Now will use z (zoxide) as the default cd command instead
+    	zi = "source zi-nvim";
+    	cdi = "source zi-nvim";
     };
   };
 
diff --git a/global.nix b/global.nix
index c2aed684..83c07475 100644
--- a/global.nix
+++ b/global.nix
@@ -184,6 +184,9 @@
 
     # Set neovim to be used instead of less for viewing manpages
     MANPAGER = "nvim +Man!";
+
+    # Nicer terminal prompt
+    PS1="\[\e[0;36m\]\u\[\e[0m\]@\[\e[0;33m\]\h\[\e[0m\]:\[\e[0;35m\]\w\[\e[0m\] \$ ";
   };
 
   # NixOS Dynamic Libraries Fix