Compare commits
4
Commits
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
f176886688 | ||
|
|
0c738fdb67 | ||
|
|
526979a9f9 | ||
|
|
adab24d93f |
+8
-5
@@ -7,13 +7,16 @@ echo "Please select the zsh plugin manager:"
|
|||||||
zsh_manager=$(gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "oh my zsh" "zinit")
|
zsh_manager=$(gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "oh my zsh" "zinit")
|
||||||
if [[ "${zsh_manager}" == *"oh my zsh"* ]]; then
|
if [[ "${zsh_manager}" == *"oh my zsh"* ]]; then
|
||||||
source .install/install-packages.sh
|
source .install/install-packages.sh
|
||||||
RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
|
if [ ! -d ~/.oh-my-zsh ]; then
|
||||||
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
|
RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"
|
||||||
git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/fast-syntax-highlighting
|
fi
|
||||||
_installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_ohmyzsh ~/.zshrc
|
git clone --depth=1 https://github.com/romkatv/powerlevel10k.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/themes/powerlevel10k
|
||||||
|
git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
|
||||||
|
git clone https://github.com/zdharma-continuum/fast-syntax-highlighting.git ${ZSH_CUSTOM:-$HOME/.oh-my-zsh/custom}/plugins/fast-syntax-highlighting
|
||||||
|
_installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_ohmyzsh ~/.zshrc
|
||||||
else
|
else
|
||||||
packagesYay=("zinit");
|
packagesYay=("zinit");
|
||||||
source .install/install-packages.sh
|
source .install/install-packages.sh
|
||||||
_installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_zinit ~/.zshrc
|
_installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_zinit ~/.zshrc
|
||||||
fi
|
fi
|
||||||
_installSymLink p10k ~/.p10k.zsh ~/dotfiles/.p10k.zsh ~/
|
_installSymLink p10k ~/.p10k.zsh ~/dotfiles/.p10k.zsh ~/
|
||||||
|
|||||||
+10
-2
@@ -42,7 +42,7 @@ export PATH=$HOME/.cargo/bin:$HOME/.local/bin:/usr/local/bin:$PATH
|
|||||||
|
|
||||||
export LANG=en_US.UTF-8
|
export LANG=en_US.UTF-8
|
||||||
|
|
||||||
export EDITOR='vim'
|
export EDITOR='nvim'
|
||||||
|
|
||||||
export MAKEFLAGS='-j$(nproc)'
|
export MAKEFLAGS='-j$(nproc)'
|
||||||
export CFLAGS='-march=native -O2 -pipe'
|
export CFLAGS='-march=native -O2 -pipe'
|
||||||
@@ -55,8 +55,16 @@ alias wakemac="wakeonlan 18:C0:4D:8D:56:0E"
|
|||||||
alias ls="eza --icons=auto"
|
alias ls="eza --icons=auto"
|
||||||
alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
|
alias githashselector="git log --oneline | gum filter | cut -d' ' -f1"
|
||||||
alias bat="bat --paging=never"
|
alias bat="bat --paging=never"
|
||||||
|
alias code="code --ozone-platform=wayland --enable-wayland-ime"
|
||||||
# fix ssh if in kitty
|
# fix ssh if in kitty
|
||||||
[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
|
if [[ "$TERM" == "xterm-kitty" && -z "$SSH_CONNECTION" ]]; then
|
||||||
|
alias ssh="kitty +kitten ssh"
|
||||||
|
fi
|
||||||
|
|
||||||
|
# -----------------------------------------------------
|
||||||
|
# Completion
|
||||||
|
# -----------------------------------------------------
|
||||||
|
[[ -f /home/wyj/.dart-cli-completion/zsh-config.zsh ]] && . /home/wyj/.dart-cli-completion/zsh-config.zsh || true
|
||||||
|
|
||||||
# -----------------------------------------------------
|
# -----------------------------------------------------
|
||||||
# evals
|
# evals
|
||||||
|
|||||||
+3
-1
@@ -46,7 +46,9 @@ eval "$(fzf --zsh)"
|
|||||||
# Miscs
|
# Miscs
|
||||||
# -----------------------------------------------------
|
# -----------------------------------------------------
|
||||||
# fix ssh if in kitty
|
# fix ssh if in kitty
|
||||||
[ "$TERM" = "xterm-kitty" ] && alias ssh="kitty +kitten ssh"
|
if [[ "$TERM" == "xterm-kitty" && -z "$SSH_CONNECTION" ]]; then
|
||||||
|
alias ssh="kitty +kitten ssh"
|
||||||
|
fi
|
||||||
|
|
||||||
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
|
||||||
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
[[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh
|
||||||
|
|||||||
Reference in New Issue
Block a user