[zsh] update plugins and change some other stuff
This commit is contained in:
parent
2f609e273c
commit
d2d1cef7ac
7 changed files with 14 additions and 29 deletions
|
@ -4,15 +4,20 @@ if [[ ! $(tty) =~ ^/dev/tty[0-9]*$ ]]; then
|
||||||
if [[ -o INTERACTIVE ]]; then
|
if [[ -o INTERACTIVE ]]; then
|
||||||
exec "${SHELL}"
|
exec "${SHELL}"
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
export XDG_CONFIG_HOME="${HOME}/.config"
|
||||||
|
export XDG_CACHE_HOME="${HOME}/.cache"
|
||||||
|
export XDG_DATA_HOME="${HOME}/.local/share"
|
||||||
|
export XDG_STATE_HOME="${HOME}/.local/state"
|
||||||
|
export XDG_RUNTIME_DIR=/tmp
|
||||||
|
|
||||||
# Add exports
|
# Add exports
|
||||||
if [[ $(uname) == "Darwin" ]]; then
|
if [[ $(uname) == "Darwin" ]]; then
|
||||||
#ONLY MACOS
|
#ONLY MACOS
|
||||||
export JAVA_HOME="/opt/homebrew/opt/openjdk@17/libexec/openjdk.jdk/Contents/Home"
|
export JAVA_HOME=$(/usr/libexec/java_home)
|
||||||
export PATH="/opt/homebrew/bin:$PATH"
|
export PATH="/opt/homebrew/bin:$PATH"
|
||||||
export PATH="/opt/homebrew/opt/openjdk@17/bin:$PATH"
|
|
||||||
export PATH="/opt/homebrew/opt/texlive/bin:$PATH"
|
export PATH="/opt/homebrew/opt/texlive/bin:$PATH"
|
||||||
export GEM_HOME=$HOME/.gem
|
export GEM_HOME=$HOME/.gem
|
||||||
export PATH=$PATH:$GEM_HOME/bin
|
export PATH=$PATH:$GEM_HOME/bin
|
||||||
|
@ -31,19 +36,10 @@ export PATH="$HOME/.cargo/bin:$PATH"
|
||||||
export PATH="$HOME/.ghcup/bin:$PATH"
|
export PATH="$HOME/.ghcup/bin:$PATH"
|
||||||
export PATH="$HOME/.miniforge3/bin:$PATH"
|
export PATH="$HOME/.miniforge3/bin:$PATH"
|
||||||
export PATH="$HOME/.cabal/bin:$PATH"
|
export PATH="$HOME/.cabal/bin:$PATH"
|
||||||
|
export PATH="$XDG_CONFIG_HOME/emacs/bin:$PATH"
|
||||||
|
|
||||||
export GOPATH="$HOME/go"
|
export GOPATH="$HOME/go"
|
||||||
export GOBIN="$GOPATH/bin"
|
export GOBIN="$GOPATH/bin"
|
||||||
|
|
||||||
#Android stuff
|
|
||||||
export ANDROID_HOME=~/android/sdk
|
|
||||||
export ANDROID_TOOLS_PATHS=$ANDROID_HOME/cmdline-tools/latest/bin:
|
|
||||||
export PATH=$ANDROID_TOOLS_PATHS:$PATH:
|
|
||||||
|
|
||||||
export XDG_CONFIG_HOME="${HOME}/.config"
|
|
||||||
export XDG_CACHE_HOME="${HOME}/.cache"
|
|
||||||
export XDG_DATA_HOME="${HOME}/.local/share"
|
|
||||||
export XDG_STATE_HOME="${HOME}/.local/state"
|
|
||||||
export XDG_RUNTIME_DIR=/tmp
|
|
||||||
|
|
||||||
. "$HOME/.cargo/env"
|
. "$HOME/.cargo/env"
|
||||||
|
|
|
@ -27,4 +27,3 @@ source $ZDOTDIR/plugins.zsh
|
||||||
if [[ $(uname) == "Darwin" ]]; then
|
if [[ $(uname) == "Darwin" ]]; then
|
||||||
eval "$(/opt/homebrew/bin/brew shellenv)"
|
eval "$(/opt/homebrew/bin/brew shellenv)"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
|
|
|
@ -10,16 +10,6 @@ function vim {
|
||||||
fi
|
fi
|
||||||
}
|
}
|
||||||
|
|
||||||
function sourceall(){
|
|
||||||
set -e
|
|
||||||
pids=$(pgrep zsh)
|
|
||||||
while IFS= read -r pid; do
|
|
||||||
kill -USR1 "$pid"
|
|
||||||
done <<< "$pids"
|
|
||||||
set +e
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function routevpn {
|
function routevpn {
|
||||||
sudo route -n add $@ 10.8.0.1
|
sudo route -n add $@ 10.8.0.1
|
||||||
}
|
}
|
||||||
|
|
|
@ -5,10 +5,10 @@ fpath+=$ZDOTDIR/plugins/zsh-completions/src
|
||||||
autoload -U compinit && compinit
|
autoload -U compinit && compinit
|
||||||
source $ZDOTDIR/plugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
|
source $ZDOTDIR/plugins/zsh-autosuggestions/zsh-autosuggestions.plugin.zsh
|
||||||
|
|
||||||
source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh
|
|
||||||
|
|
||||||
source $ZDOTDIR/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh
|
source $ZDOTDIR/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.plugin.zsh
|
||||||
|
|
||||||
|
source $ZDOTDIR/plugins/zsh-history-substring-search/zsh-history-substring-search.plugin.zsh
|
||||||
|
|
||||||
zvm_after_init_commands+=('source <(fzf --zsh) && enable-fzf-tab')
|
zvm_after_init_commands+=('source <(fzf --zsh) && enable-fzf-tab')
|
||||||
source $ZDOTDIR/plugins/fzf-tab/fzf-tab.plugin.zsh
|
source $ZDOTDIR/plugins/fzf-tab/fzf-tab.plugin.zsh
|
||||||
|
|
||||||
|
|
|
@ -1 +1 @@
|
||||||
Subproject commit c3d4e576c9c86eac62884bd47c01f6faed043fc5
|
Subproject commit 0e810e5afa27acbd074398eefbe28d13005dbc15
|
|
@ -1 +1 @@
|
||||||
Subproject commit d24f58d2f187a72697aa2781a730f65732cb2f6b
|
Subproject commit c160d09fddd28ceb3af5cf80e9253af80e450d96
|
|
@ -1 +1 @@
|
||||||
Subproject commit e0165eaa730dd0fa321a6a6de74f092fe87630b0
|
Subproject commit 5eb677bb0fa9a3e60f0eff031dc13926e093df92
|
Loading…
Add table
Reference in a new issue