From f7e85f9cad07e290602f6978faa5473c178b33bf Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Wed, 14 Aug 2024 19:56:21 -0400 Subject: [PATCH 1/8] feat: change group active by key --- hypr/conf/keybindings/custom.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/hypr/conf/keybindings/custom.conf b/hypr/conf/keybindings/custom.conf index 8416416..c4c292f 100644 --- a/hypr/conf/keybindings/custom.conf +++ b/hypr/conf/keybindings/custom.conf @@ -32,6 +32,7 @@ bind = $mainMod SHIFT, left, resizeactive, -100 0 bind = $mainMod SHIFT, up, resizeactive, 0 -100 bind = $mainMod SHIFT, down, resizeactive, 0 100 bind = $mainMod, G, togglegroup +bind = $mainMod CTRL, Tab, changegroupactive, f # Actions bind = $mainMod, PRINT, exec, ~/dotfiles/hypr/scripts/screenshot.sh From ed6d78ebb9f88405b34ecb0b9c8ec23d255b12c0 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Wed, 14 Aug 2024 20:54:02 -0400 Subject: [PATCH 2/8] new: set FiraCode Nerd Font --- hypr/conf/misc.conf | 1 + 1 file changed, 1 insertion(+) diff --git a/hypr/conf/misc.conf b/hypr/conf/misc.conf index b5facfb..9bebf30 100644 --- a/hypr/conf/misc.conf +++ b/hypr/conf/misc.conf @@ -7,4 +7,5 @@ misc { disable_splash_rendering = true enable_swallow = true swallow_regex = ^(Alacritty|kitty|thunar)$ + font_family = FiraCode Nerd Font } From 0abb9203485d41f6d5e389b81e4e810eefa889ad Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Wed, 14 Aug 2024 20:54:21 -0400 Subject: [PATCH 3/8] new: group style --- hypr/conf/windows/default.conf | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/hypr/conf/windows/default.conf b/hypr/conf/windows/default.conf index b880c5d..2ae9a3e 100644 --- a/hypr/conf/windows/default.conf +++ b/hypr/conf/windows/default.conf @@ -11,3 +11,12 @@ general { col.inactive_border = rgba(ffffffff) layout = dwindle } + +group { + col.border_active = $color11 + col.border_inactive = rgba(ffffffff) + groupbar { + col.active = $color11 + col.inactive = $color13 + } +} From 526979a9f95d9b150f2e8c7b3d3a009e510b0d7d Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Sun, 18 Aug 2024 00:23:22 -0400 Subject: [PATCH 4/8] fix: alsp fix kitten ssh in zinit --- .zshrc_zinit | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.zshrc_zinit b/.zshrc_zinit index 70f73a4..d13af97 100644 --- a/.zshrc_zinit +++ b/.zshrc_zinit @@ -46,7 +46,9 @@ eval "$(fzf --zsh)" # Miscs # ----------------------------------------------------- # 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. [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh From 0c738fdb67f45f2110630b7dab065e1768c0acf0 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Wed, 21 Aug 2024 21:03:13 -0400 Subject: [PATCH 5/8] fix: add powerlevel10k install --- .install/zsh.sh | 9 +++++---- 1 file changed, 5 insertions(+), 4 deletions(-) diff --git a/.install/zsh.sh b/.install/zsh.sh index 41dd57c..b45fdd7 100644 --- a/.install/zsh.sh +++ b/.install/zsh.sh @@ -8,12 +8,13 @@ zsh_manager=$(gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) if [[ "${zsh_manager}" == *"oh my zsh"* ]]; then source .install/install-packages.sh RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" - 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 + 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 packagesYay=("zinit"); - source .install/install-packages.sh + source .install/install-packages.sh _installSymLink zshrc ~/.zshrc ~/dotfiles/.zshrc_zinit ~/.zshrc fi _installSymLink p10k ~/.p10k.zsh ~/dotfiles/.p10k.zsh ~/ From 30b94d192bddbc6b20e118390e1826684faa5287 Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Wed, 21 Aug 2024 23:28:45 -0400 Subject: [PATCH 6/8] update: network speed tooltip --- waybar/themes/meow-blur/modules.json | 1 + 1 file changed, 1 insertion(+) diff --git a/waybar/themes/meow-blur/modules.json b/waybar/themes/meow-blur/modules.json index a5ecd8e..3b6bf76 100644 --- a/waybar/themes/meow-blur/modules.json +++ b/waybar/themes/meow-blur/modules.json @@ -369,6 +369,7 @@ }, "network#speed": { "format": "ī‚Ÿ {bandwidthTotalBits}", + "tooltip-format": "īƒ˜ {bandwidthUpBits}\nīƒ— {bandwidthDownBits}", "interval": 5 }, From 3aac72de3bd4017a2fbd057972fddfc39f23c17e Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Sun, 25 Aug 2024 10:32:13 -0400 Subject: [PATCH 7/8] update: memory tooltip --- waybar/themes/meow-blur/modules.json | 1 + 1 file changed, 1 insertion(+) diff --git a/waybar/themes/meow-blur/modules.json b/waybar/themes/meow-blur/modules.json index 3b6bf76..2a8fb05 100644 --- a/waybar/themes/meow-blur/modules.json +++ b/waybar/themes/meow-blur/modules.json @@ -265,6 +265,7 @@ // Memory "memory": { "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", "interval": 10, "states": { From f176886688de95e91f49a8b84ddf13eed89f680d Mon Sep 17 00:00:00 2001 From: Yingjie Wang Date: Sun, 25 Aug 2024 10:39:27 -0400 Subject: [PATCH 8/8] fix: install ohmyzsh only if haven't --- .install/zsh.sh | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/.install/zsh.sh b/.install/zsh.sh index b45fdd7..da46dc8 100644 --- a/.install/zsh.sh +++ b/.install/zsh.sh @@ -7,7 +7,9 @@ echo "Please select the zsh plugin manager:" zsh_manager=$(gum choose --limit=1 --cursor-prefix "( ) " --selected-prefix "(x) " --unselected-prefix "( ) " "oh my zsh" "zinit") if [[ "${zsh_manager}" == *"oh my zsh"* ]]; then 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 + RUNZSH=no CHSH=no sh -c "$(curl -fsSL https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/tools/install.sh)" + fi 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