From b4b81baae593cf29b898be3d86334ec0f7f9f97c Mon Sep 17 00:00:00 2001 From: Tri Vo Khac Date: Wed, 24 May 2023 15:02:42 +0700 Subject: [PATCH] chore: refactor starship prompt setup --- zsh/.config/zsh/.zshrc | 2 -- zsh/.config/zsh/zsh-aliases | 2 +- zsh/.config/zsh/zsh-exports | 6 ++++-- zsh/.config/zsh/zsh-prompt | 10 ++-------- 4 files changed, 7 insertions(+), 13 deletions(-) diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc index b8f4403..b74c48f 100644 --- a/zsh/.config/zsh/.zshrc +++ b/zsh/.config/zsh/.zshrc @@ -1,5 +1,3 @@ -#!/bin/sh - # some useful options (man zshoptions) setopt autocd extendedglob nomatch menucomplete setopt interactive_comments diff --git a/zsh/.config/zsh/zsh-aliases b/zsh/.config/zsh/zsh-aliases index a78098d..af1daad 100644 --- a/zsh/.config/zsh/zsh-aliases +++ b/zsh/.config/zsh/zsh-aliases @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash [ -x "$(command -v lsd)" ] && alias ls="lsd" [ -x "$(command -v bat)" ] && alias cat="bat" diff --git a/zsh/.config/zsh/zsh-exports b/zsh/.config/zsh/zsh-exports index ee871b6..06e3989 100644 --- a/zsh/.config/zsh/zsh-exports +++ b/zsh/.config/zsh/zsh-exports @@ -1,4 +1,4 @@ -#!/bin/sh +#!/usr/bin/env bash HISTSIZE=1000000 @@ -8,4 +8,6 @@ export HISTFILE="$ZDOTDIR"/.zsh_history export EDITOR="micro" export PAGE="bat" -export VISUAL="micro" \ No newline at end of file +export VISUAL="micro" + +export STARSHIP_CONFIG="$XDG_CONFIG_HOME"/starship/starship.toml diff --git a/zsh/.config/zsh/zsh-prompt b/zsh/.config/zsh/zsh-prompt index a582614..3a2f512 100644 --- a/zsh/.config/zsh/zsh-prompt +++ b/zsh/.config/zsh/zsh-prompt @@ -1,9 +1,3 @@ -#!/bin/sh +#!/usr/bin/env bash -STARSHIP_HOME=$HOME/.config/starship -[ ! -d "$STARSHIP_HOME" ] && mkdir -p "$STARSHIP_HOME" -[ ! -f "$STARSHIP_HOME/starship.toml" ] && touch "$STARSHIP_HOME/starship.toml" - -export STARSHIP_CONFIG="$STARSHIP_HOME"/starship.toml - -eval "$(starship init zsh)" +command -v starship > /dev/null 2>&1 && eval "$(starship init zsh)"