From e15431de377140da99e783bda99d10964855bac0 Mon Sep 17 00:00:00 2001 From: pfych Date: Wed, 19 Feb 2025 07:54:50 +1100 Subject: [PATCH] Remove OMZ --- .config/ohmyzsh | 1 - .gitmodules | 3 --- .zshrc | 29 ++++++++++------------------- README.md | 11 +++++++++++ 4 files changed, 21 insertions(+), 23 deletions(-) delete mode 160000 .config/ohmyzsh create mode 100644 README.md diff --git a/.config/ohmyzsh b/.config/ohmyzsh deleted file mode 160000 index b0204f7..0000000 --- a/.config/ohmyzsh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit b0204f78394d84771436a7717aafee6cad140319 diff --git a/.gitmodules b/.gitmodules index cdc05a9..e69de29 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,3 +0,0 @@ -[submodule ".config/ohmyzsh"] - path = .config/ohmyzsh - url = https://github.com/ohmyzsh/ohmyzsh.git diff --git a/.zshrc b/.zshrc index 1ade498..5d8476b 100644 --- a/.zshrc +++ b/.zshrc @@ -7,28 +7,23 @@ if [[ $(uname) == "Darwin" ]]; then export PATH="/usr/local/opt/grep/libexec/gnubin:$PATH:${HOME}/.local/bin:/usr/local/sbin:${HOME}/.local/share/gem/ruby/2.0.0/bin:/usr/local/bin" export ANDROID_SDK_ROOT=/Users/$USER/Library/Android/sdk - source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh - source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh alias date=gdate; eval "$(rbenv init - zsh)" + + source $(brew --prefix)/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh + source $(brew --prefix)/share/zsh-autosuggestions/zsh-autosuggestions.zsh + source $(brew --prefix)/opt/gitstatus/gitstatus.prompt.zsh else export PATH="${PATH}:${HOME}/.local/bin:/usr/local/sbin:${HOME}/.local/share/gem/ruby/2.0.0/bin:/usr/local/bin" + source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh - source /usr/lib/zsh-git-prompt/zshrc.sh fi export CONFIGDIR="${HOME}/.config" export XDG_CONFIG_HOME=$CONFIGDIR export EDITOR=nvim -# oh-my-zsh -export ZSH_DIR="$CONFIGDIR/ohmyzsh" -export ZSH_CUSTOM="$ZSH_DIR/custom" -export ZSH="$CONFIGDIR/ohmyzsh" -plugins=(git-prompt git) -source $ZSH/oh-my-zsh.sh - # Use NVIM alias vim=nvim @@ -42,18 +37,13 @@ ZSH_AUTOSUGGEST_USE_ASYNC=true ZSH_AUTOSUGGEST_STRATEGY=(history completion) # Prompt -function precmd { +precmd() { PROMPT="[%c] " - RPROMPT="$(git_super_status)" + RPROMPT="$GITSTATUS_PROMPT" } - # Added by serverless binary installer export PATH="$HOME/.serverless/bin:$PATH" -# tabtab source for packages -# uninstall by removing these lines -[[ -f ~/.config/tabtab/__tabtab.zsh ]] && . ~/.config/tabtab/__tabtab.zsh || true - # Nodejs export SKIP_PREFLIGHT_CHECK=true @@ -61,8 +51,9 @@ export SKIP_PREFLIGHT_CHECK=true export FZF_DEFAULT_COMMAND='find . -type d \( -name Pods -o -name .yarn -o -name node_modules -o -name .git -o -path name \) -prune -false -o -name "*"' [ -f ~/.fzf.zsh ] && source ~/.fzf.zsh -source ~/.config/scripts/scripts.sh - # thefuck eval $(thefuck --alias) alias a=fuck + +# Load extra functions +source ~/.config/scripts/scripts.sh diff --git a/README.md b/README.md new file mode 100644 index 0000000..12be564 --- /dev/null +++ b/README.md @@ -0,0 +1,11 @@ +# \*nix config + +Dot-files and scripts to be synced between my home system and work system + +## ZSH Plugins + +The following packages need to be installed with the system package manager: + +- [zsh-syntax-highlighting](https://github.com/zsh-users/zsh-syntax-highlighting) +- [zsh-autosuggestions](https://github.com/zsh-users/zsh-autosuggestions) +- [gitstatus-prompt](https://github.com/romkatv/gitstatus)