From bc074b77bae6511d460f19072ea20db417ffe2b6 Mon Sep 17 00:00:00 2001
From: Bartek Stalewski <ftpd@insomniac.pl>
Date: Sun, 28 May 2023 14:42:21 +0200
Subject: [PATCH] Swtich to starship.

---
 {zsh => _unused}/p10k.zsh              |  0
 install.sh                             |  4 ++--
 _unused/starship.toml => starship.toml |  0
 zsh/.zshrc                             | 14 +++++---------
 4 files changed, 7 insertions(+), 11 deletions(-)
 rename {zsh => _unused}/p10k.zsh (100%)
 rename _unused/starship.toml => starship.toml (100%)

diff --git a/zsh/p10k.zsh b/_unused/p10k.zsh
similarity index 100%
rename from zsh/p10k.zsh
rename to _unused/p10k.zsh
diff --git a/install.sh b/install.sh
index 782f180..f1a0cfe 100644
--- a/install.sh
+++ b/install.sh
@@ -18,7 +18,7 @@ rm -rf $XDG_DATA_HOME/repos/dotfiles
 git clone --recurse https://git.insomniac.pl/ftpd/dotfiles $XDG_DATA_HOME/repos/dotfiles
 
 # configs
-for i in fd htop astronvim tmux; do
+for i in astronvim fd htop starship.toml tmux; do
   rm -rf $XDG_CONFIG_HOME/${i}
   ln -sf $XDG_DATA_HOME/repos/dotfiles/${i} $XDG_CONFIG_HOME
 done
@@ -32,7 +32,7 @@ ln -sf $XDG_DATA_HOME/repos/AstroNvim $XDG_CONFIG_HOME/nvim
 ### modules
 mkdir -p $XDG_DATA_HOME/repos/zsh_modules
 rm -rf $XDG_DATA_HOME/repos/zsh_modules/*
-for module in mfaerevaag/wd romkatv/powerlevel10k zdharma-continuum/fast-syntax-highlighting; do
+for module in mfaerevaag/wd zdharma-continuum/fast-syntax-highlighting; do
   git clone https://github.com/${module} $XDG_DATA_HOME/repos/zsh_modules/${module#*/}
 done
 ### config
diff --git a/_unused/starship.toml b/starship.toml
similarity index 100%
rename from _unused/starship.toml
rename to starship.toml
diff --git a/zsh/.zshrc b/zsh/.zshrc
index 454ac41..d343b6b 100644
--- a/zsh/.zshrc
+++ b/zsh/.zshrc
@@ -17,9 +17,10 @@ setopt HIST_REDUCE_BLANKS
 setopt SHARE_HISTORY
 setopt INC_APPEND_HISTORY
 
-if [[ -n $DISPLAY ]]; then
-  export PATH=~/.local/bin:$PATH
-fi
+# if [[ -z $DISPLAY ]]; then
+#   export PATH=~/.local/bin:$PATH
+# fi
+path=(~/.local/bin "$path[@]")
 
 # source configuration
 source $ZDOTDIR/aliases.zsh
@@ -35,11 +36,7 @@ export WD_CONFIG=$XDG_CONFIG_HOME/wd_list
 fpath=($XDG_DATA_HOME/repos/zsh_modules/wd $fpath)
 
 # theme and colors
-source $ZDOTDIR/p10k.zsh
-source $XDG_DATA_HOME/repos/zsh_modules/powerlevel10k/powerlevel10k.zsh-theme
-if [[ -r "$XDG_CACHE_HOME/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
-  source "$XDG_CACHE_HOME/p10k-instant-prompt-${(%):-%n}.zsh"
-fi
+eval "$(starship init zsh)"
 if [[ $(command -v vivid) ]]; then
   export LS_COLORS=$(vivid generate molokai)
 else
@@ -73,4 +70,3 @@ fi
 if [[ -f ~/.local/config/zsh ]]; then
   source ~/.local/config/zsh
 fi
-