Skip to content

Commit aa4f442

Browse files
committed
Merge branch 'feature/zsh' into develop
2 parents 0b94f76 + ea8edda commit aa4f442

File tree

3 files changed

+12
-17
lines changed

3 files changed

+12
-17
lines changed

.gitmodules

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,6 @@
11
[submodule "confluent/confluent-kafka-script-generator"]
22
path = confluent/confluent-kafka-script-generator
33
url = https://github.com/codejsha/confluent-kafka-script-generator.git
4+
[submodule "macos/zsh/plugins"]
5+
path = macos/zsh/plugins
6+
url = https://github.com/codejsha/zsh-plugins.git

macos/zsh/.zshrc

Lines changed: 8 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -1,31 +1,22 @@
1-
### ohmyzsh
2-
export ZSH="${HOME}/.oh-my-zsh"
3-
export ZSH_COMPDUMP="${HOME}/.cache/zcompdump/zcompdump-${ZSH_VERSION}"
4-
DISABLE_AUTO_TITLE="true"
5-
DISABLE_LS_COLORS="true"
6-
ENABLE_CORRECTION="false"
7-
plugins=(aliases brew copypath docker docker-compose forklift git golang gpg-agent gradle kubectl kubectx npm pip poetry python virtualenv vscode yarn)
8-
fpath+=${ZSH_CUSTOM:-${ZSH:-~/.oh-my-zsh}/custom}/plugins/zsh-completions/src
9-
source ${ZSH}/oh-my-zsh.sh
10-
111
### shell integration
2+
export ZSH_COMPDUMP="${HOME}/.cache/zcompdump/zcompdump-${ZSH_VERSION}"
123
export STARSHIP_CONFIG="${HOME}/.config/starship/starship.toml"
134
eval "$(starship init zsh)"
145
eval "$(zoxide init zsh)"
156
eval "$(atuin init zsh --disable-up-arrow)"
167
source ${HOMEBREW_PREFIX}/opt/git-extras/share/git-extras/git-extras-completion.zsh
178
source ${HOMEBREW_PREFIX}/share/zsh-autosuggestions/zsh-autosuggestions.zsh
189
source ${HOMEBREW_PREFIX}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
19-
20-
### terminal title
21-
case ${TERM} in
22-
xterm*)
23-
precmd () {print -Pn "\e]0;%~\a"}
24-
;;
25-
esac
10+
source ${HOME}/tools/zsh-plugins/alias.plugin.zsh
11+
source ${HOME}/tools/zsh-plugins/docker.plugin.zsh
12+
source ${HOME}/tools/zsh-plugins/docker-compose.plugin.zsh
13+
FPATH=${HOMEBREW_PREFIX}/share/zsh-completions:${FPATH}
14+
autoload -Uz compinit
15+
compinit -C
2616

2717
### variables
2818
export LS_COLORS="di=36:ln=38;5;210:or=31:so=32:pi=33:ex=32:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43"
19+
export PATH="/opt/homebrew/opt/curl/bin:${PATH}"
2920
export PATH="/opt/homebrew/opt/llvm/bin:${PATH}"
3021
export PATH="${HOME}/go/bin:${PATH}"
3122
export PATH="${HOME}/.krew/bin:${PATH}"

macos/zsh/plugins

Submodule plugins added at 8006e03

0 commit comments

Comments
 (0)