Merge branches 'upstream-custom' and 'zshfish' into dev

This commit is contained in:
Yingjie Wang 2024-08-25 10:39:37 -04:00
commit abef5c5f00
6 changed files with 24 additions and 6 deletions

View File

@ -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 ~/

View File

@ -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

View File

@ -32,6 +32,7 @@ bind = $mainMod SHIFT, left, resizeactive, -100 0
bind = $mainMod SHIFT, up, resizeactive, 0 -100 bind = $mainMod SHIFT, up, resizeactive, 0 -100
bind = $mainMod SHIFT, down, resizeactive, 0 100 bind = $mainMod SHIFT, down, resizeactive, 0 100
bind = $mainMod, G, togglegroup bind = $mainMod, G, togglegroup
bind = $mainMod CTRL, Tab, changegroupactive, f
# Actions # Actions
bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh

View File

@ -7,4 +7,5 @@ misc {
disable_splash_rendering = true disable_splash_rendering = true
enable_swallow = true enable_swallow = true
swallow_regex = ^(Alacritty|kitty|thunar)$ swallow_regex = ^(Alacritty|kitty|thunar)$
font_family = FiraCode Nerd Font
} }

View File

@ -11,3 +11,12 @@ general {
col.inactive_border = rgba(ffffffff) col.inactive_border = rgba(ffffffff)
layout = dwindle layout = dwindle
} }
group {
col.border_active = $color11
col.border_inactive = rgba(ffffffff)
groupbar {
col.active = $color11
col.inactive = $color13
}
}

View File

@ -265,6 +265,7 @@
// Memory // Memory
"memory": { "memory": {
"format": " {used:0.1f}G", "format": " {used:0.1f}G",
"tooltip-format": "{total:0.1f}G total\n{swapTotal:0.1f}G swap\n{used:0.1f}G used\n{avail:0.1f}G free\n{percentage}% used",
"on-click": "alacritty -e htop", "on-click": "alacritty -e htop",
"interval": 10, "interval": 10,
"states": { "states": {
@ -369,6 +370,7 @@
}, },
"network#speed": { "network#speed": {
"format": " {bandwidthTotalBits}", "format": " {bandwidthTotalBits}",
"tooltip-format": " {bandwidthUpBits}\n {bandwidthDownBits}",
"interval": 5 "interval": 5
}, },