Skip to content

Commit 3379660

Browse files
committed
🚀 starship
1 parent 339ba20 commit 3379660

File tree

13 files changed

+238
-1756
lines changed

13 files changed

+238
-1756
lines changed

.gitmodules

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -13,11 +13,6 @@
1313
url = https://github.com/zdharma-continuum/fast-syntax-highlighting
1414
shallow = true
1515
branch = master
16-
[submodule "bootstrap/powerlevel10k"]
17-
path = bootstrap/powerlevel10k
18-
url = https://github.com/romkatv/powerlevel10k
19-
shallow = true
20-
branch = master
2116
[submodule "bootstrap/zsh-completions"]
2217
path = bootstrap/zsh-completions
2318
url = https://github.com/zsh-users/zsh-completions

bootstrap/bootstrap.sh

Lines changed: 13 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -114,6 +114,17 @@ DEPENDENCIES=(
114114
make
115115
)
116116

117+
function install_starship() {
118+
if [[ $(uname) == "Linux" ]]; then
119+
log_event "info" "Installing ${PURPLE}starship${NO_COLOR} with ${BLUE}curl${NO_COLOR} 🚀"
120+
curl -sS https://starship.rs/install.sh | sh -s -- --yes &>/dev/null &
121+
spinner || log_event "error" "Failed to install ${PURPLE}starship${NO_COLOR} with ${BLUE}curl${NO_COLOR}"
122+
elif [[ $(uname) == "Darwin" ]]; then
123+
log_event "info" "Installing ${PURPLE}starship${NO_COLOR} with ${BLUE}brew${NO_COLOR} 🚀"
124+
brew install starship
125+
fi
126+
}
127+
117128
function install_dependencies() {
118129
local package
119130
local packages_to_install=()
@@ -191,6 +202,7 @@ function install_dependencies() {
191202
pacman --sync --refresh --noconfirm "${packages_to_install[@]}" &>/dev/null &
192203
spinner || log_event "error" "Failed to install ${PURPLE}${packages_to_install[@]}${NO_COLOR} with ${BLUE}${PACKAGE_MANAGER}${NO_COLOR}"
193204
fi
205+
install_starship
194206
}
195207

196208
##########################################################
@@ -294,20 +306,19 @@ function symlink_shell() {
294306
symlink_item "${DOTFILES_DIR}/shell/.shell_vars" "${HOME}/.shell_vars"
295307
symlink_item "${DOTFILES_DIR}/shell/.shell_aliases" "${HOME}/.shell_aliases"
296308
symlink_item "${DOTFILES_DIR}/shell/.shell_functions" "${HOME}/.shell_functions"
309+
symlink_item "${DOTFILES_DIR}/tools/starship/starship.toml" "${HOME}/.config/starship.toml"
297310
}
298311

299312
function symlink_zsh() {
300313
# OhMyZsh
301314
symlink_item "${DOTFILES_DIR}/bootstrap/oh-my-zsh" "${HOME}/.oh-my-zsh"
302315
# OhMyZsh Custom Plugins
303-
symlink_item "${DOTFILES_DIR}/bootstrap/powerlevel10k" "${HOME}/.oh-my-zsh/custom/themes/powerlevel10k"
304316
symlink_item "${DOTFILES_DIR}/bootstrap/fast-syntax-highlighting" "${HOME}/.oh-my-zsh/custom/plugins/fast-syntax-highlighting"
305317
symlink_item "${DOTFILES_DIR}/bootstrap/zsh-autosuggestions" "${HOME}/.oh-my-zsh/custom/plugins/zsh-autosuggestions"
306318
symlink_item "${DOTFILES_DIR}/bootstrap/zsh-completions" "${HOME}/.oh-my-zsh/custom/plugins/zsh-completions"
307319
# Shell Files
308320
symlink_item "${DOTFILES_DIR}/shell/.zshrc" "${HOME}/.zshrc"
309321
symlink_item "${DOTFILES_DIR}/shell/.zprofile" "${HOME}/.zprofile"
310-
symlink_item "${DOTFILES_DIR}/shell/.p10k.zsh" "${HOME}/.p10k.zsh"
311322
}
312323

313324
function symlink_bash() {

bootstrap/powerlevel10k

Lines changed: 0 additions & 1 deletion
This file was deleted.

docs/dev-setup/terminal.md

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -88,7 +88,7 @@ productive and enjoyable:
8888
8989
- Frameworks and Themes
9090
- [ohmyzsh/oh-my-zsh] - The framework for managing your zsh shell
91-
- [romkatv/powerlevel10k] - A powerful OhMyZSH theme and prompt
91+
- [starship/starship] - The minimal, blazing-fast, and infinitely customizable prompt for any shell!
9292
- OhMyZsh Plugins
9393
- [oh-my-zsh/git] - Git aliases and functions
9494
- [oh-my-zsh/dotenv] - Loads environment variables from `.env` for the current directory
@@ -107,7 +107,7 @@ productive and enjoyable:
107107
[ohmyzsh/oh-my-zsh]: https://github.com/ohmyzsh/oh-my-zsh
108108
[zdharma-continuum/fast-syntax-highlighting]: https://github.com/zdharma-continuum/fast-syntax-highlighting
109109
[zsh-users/zsh-autosuggestions]: https://github.com/zsh-users/zsh-autosuggestions
110-
[romkatv/powerlevel10k]: https://github.com/romkatv/powerlevel10k
110+
[starship/starship]: https://github.com/starship/starship
111111
[oh-my-zsh/git]: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git
112112
[oh-my-zsh/dotenv]: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/dotenv
113113
[oh-my-zsh/macos]: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/macos

docs/dotfiles/features.md

Lines changed: 2 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ your terminal experience more productive and enjoyable:
1818

1919
- Frameworks and Themes
2020
- [ohmyzsh/oh-my-zsh] - The framework for managing your zsh shell
21-
- [romkatv/powerlevel10k] - A powerful OhMyZSH theme and prompt
21+
- [starship/starship] - The minimal, blazing-fast, and infinitely customizable prompt for any shell!
2222
- oh-my-zsh Plugins
2323
- [oh-my-zsh/git] - Git aliases and functions
2424
- [oh-my-zsh/dotenv] - Loads environment variables from `.env` for the current directory
@@ -181,7 +181,6 @@ they're enumerated in the `linux/Aptfile` which is documented in the
181181
[dependencies](../dotfiles/dependencies.md) section.
182182

183183
[OhMyBash]: https://github.com/ohmybash/oh-my-bash
184-
[powerlevel10k]: https://github.com/romkatv/powerlevel10k
185184
[OhMyZsh]: https://ohmyz.sh/
186185
[zsh-users/zsh-autosuggestions]: https://github.com/zsh-users/zsh-autosuggestions
187186
[zsh-users/zsh-completions]: https://github.com/zsh-users/zsh-completions
@@ -192,7 +191,7 @@ they're enumerated in the `linux/Aptfile` which is documented in the
192191
[ohmyzsh/oh-my-zsh]: https://github.com/ohmyzsh/oh-my-zsh
193192
[zdharma-continuum/fast-syntax-highlighting]: https://github.com/zdharma-continuum/fast-syntax-highlighting
194193
[zsh-users/zsh-autosuggestions]: https://github.com/zsh-users/zsh-autosuggestions
195-
[romkatv/powerlevel10k]: https://github.com/romkatv/powerlevel10k
194+
[starship/starship]: https://github.com/starship/starship
196195
[oh-my-zsh/git]: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/git
197196
[oh-my-zsh/dotenv]: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/dotenv
198197
[oh-my-zsh/macos]: https://github.com/ohmyzsh/ohmyzsh/tree/master/plugins/macos

docs/dotfiles/installation.md

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -63,17 +63,16 @@ the steps below:
6363
```shell
6464
# ZSH
6565
ln -s ~/.dotfiles/bootstrap/oh-my-zsh ~/.oh-my-zsh
66-
ln -s ~/.dotfiles/bootstrap/powerlevel10k ~/.oh-my-zsh/custom/themes/powerlevel10k
6766
ln -s ~/.dotfiles/bootstrap/fast-syntax-highlighting ~/.oh-my-zsh/custom/plugins/fast-syntax-highlighting
6867
ln -s ~/.dotfiles/bootstrap/zsh-autosuggestions ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions
6968
ln -s ~/.dotfiles/bootstrap/zsh-completions ~/.oh-my-zsh/custom/plugins/zsh-completions
7069
ln -s ~/.dotfiles/shell/.zshrc ~/.zshrc
71-
ln -s ~/.dotfiles/shell/.p10k.zsh ~/.p10k.zsh
7270
# BASH
7371
ln -s ~/.dotfiles/bootstrap/oh-my-bash ~/.oh-my-bash
7472
ln -s ~/.dotfiles/shell/.bashrc ~/.bashrc
7573
ln -s ~/.dotfiles/shell/.profile ~/.profile
7674
# SHELL
75+
ln -s ~/.dotfiles/shell/.shell_startup ~/.shell_startup
7776
ln -s ~/.dotfiles/shell/.shell_vars ~/.shell_vars
7877
ln -s ~/.dotfiles/shell/.shell_aliases ~/.shell_aliases
7978
ln -s ~/.dotfiles/shell/.shell_functions ~/.shell_functions

git/.gitconfig

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,7 @@
2222
[credential "https://gist.github.com"]
2323
helper =
2424
helper = !gh auth git-credential
25+
[oh-my-zsh]
26+
hide-info = 1
27+
hide-status = 1
28+
hide-dirty = 1

macos/Brewfile

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -40,6 +40,7 @@ brew "openjdk"
4040
brew "pipx"
4141
brew "ripgrep"
4242
brew "sops"
43+
brew "starship"
4344
brew "terraform-docs"
4445
brew "terragrunt"
4546
brew "thefuck"

shell/.bashrc

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -34,9 +34,6 @@ function sync() {
3434
export OSH="${HOME}/.oh-my-bash"
3535

3636
# Oh My Bash Settings
37-
OSH_THEME="powerline-multiline"
38-
OMB_PROMPT_SHOW_PYTHON_VENV=true
39-
4037
completions=(
4138
awscli
4239
brew
@@ -52,6 +49,7 @@ aliases=(
5249
general
5350
)
5451
plugins=(
52+
starship
5553
git
5654
bashmarks
5755
)

0 commit comments

Comments
 (0)