From 72fe3f24924556af4f6e13b66b46e5aee4648028 Mon Sep 17 00:00:00 2001 From: Ryan Date: Thu, 7 Dec 2023 11:31:31 +0800 Subject: [PATCH] Update --- .config/hypr/hyprland.conf.d/autoexec.conf | 2 +- .config/hypr/hyprland.conf.d/keybind.conf | 2 ++ .config/hypr/scripts/logout.sh | 6 +++--- .config/starship.toml | 5 ----- .config/waybar/config | 2 +- .zshrc | 13 ++++++++++--- 6 files changed, 17 insertions(+), 13 deletions(-) delete mode 100644 .config/starship.toml diff --git a/.config/hypr/hyprland.conf.d/autoexec.conf b/.config/hypr/hyprland.conf.d/autoexec.conf index fef4041..bd910c1 100644 --- a/.config/hypr/hyprland.conf.d/autoexec.conf +++ b/.config/hypr/hyprland.conf.d/autoexec.conf @@ -8,7 +8,7 @@ env = WLR_NO_HARDWARE_CURSORS,1 # Execute your favorite apps at launch exec=pidof -q hyprpaper || hyprpaper -exec=pidof -q wlsunset || wlsunset -S 08:00 -s 19:00 +exec=pidof -q wlsunset || wlsunset -S 08:00 -s 19:00 -d 1800 exec=pidof -q waybar || waybar exec=~/.config/hypr/scripts/clamshell.sh exec-once=fcitx5 -d diff --git a/.config/hypr/hyprland.conf.d/keybind.conf b/.config/hypr/hyprland.conf.d/keybind.conf index f884fbd..b78fced 100644 --- a/.config/hypr/hyprland.conf.d/keybind.conf +++ b/.config/hypr/hyprland.conf.d/keybind.conf @@ -13,6 +13,8 @@ bind = $mainMod CTRL, r, exec, hyprctl reload bind = $mainMod CTRL, 65, exec, fcitx5-remote -t bind = $mainMod, M, exec, swaync-client -t bind = $mainMod CTRL, l, exec, ~/.config/hypr/scripts/logout.sh +# TODO: use a script instead +bind = $mainMod SHIFT, s, exec, hyprshot --clipboard-only -m region # Move focus with mainMod + arrow keys bind = $mainMod, left, movefocus, l diff --git a/.config/hypr/scripts/logout.sh b/.config/hypr/scripts/logout.sh index 2d87c0b..66b76bc 100755 --- a/.config/hypr/scripts/logout.sh +++ b/.config/hypr/scripts/logout.sh @@ -29,8 +29,8 @@ if test "$choice" = lock ; then idlepid=$! # swaylock -e -c 282828 --inside-color 00000003 - swaylock -S --effect-blur "12x12" --effect-greyscale --effect-vignette 0.5:0.5 --inside-color 00000000 \ - -e --ring-color 00000000 --line-uses-inside --indicator --clock --text-color 689d6a + swaylock -S --effect-blur "12x12" --effect-greyscale --effect-vignette 0.5:0.5 --inside-color 28282860 \ + -e --ring-color 00000000 --line-color 00000000 --indicator --clock --text-color ebdbb2 kill $idlepid @@ -39,5 +39,5 @@ if test "$choice" = lock ; then hyprctl dispatch exec waybar light -S $bright elif test -n "$choice"; then - loginctl $choice + systemctl $choice fi diff --git a/.config/starship.toml b/.config/starship.toml deleted file mode 100644 index 77812a0..0000000 --- a/.config/starship.toml +++ /dev/null @@ -1,5 +0,0 @@ -# Get editor completions based on the config schema -"$schema" = 'https://starship.rs/config-schema.json' - -# Inserts a blank line between shell prompts -add_newline = true diff --git a/.config/waybar/config b/.config/waybar/config index ff9b591..c446c6b 100644 --- a/.config/waybar/config +++ b/.config/waybar/config @@ -91,7 +91,7 @@ "format": "󰎈 {}", "return-type": "json", "exec": "playerctl -a metadata --format '{\"text\": \"{{uc(playerName)}}: {{artist}} - {{markup_escape(title)}}\", \"tooltip\": \"{{playerName}} : {{markup_escape(title)}}\", \"class\": \"{{status}}\"}' -F", - "max-length": 35, + "max-length": 50, "on-click-middle": "playerctl play-pause", "on-click-right": "plaerctl next", "on-click-left": "playerctl previous" diff --git a/.zshrc b/.zshrc index a01b300..b2fe49e 100644 --- a/.zshrc +++ b/.zshrc @@ -22,6 +22,7 @@ zinit light sindresorhus/pure zinit wait lucid for \ zdharma-continuum/fast-syntax-highlighting \ agkozak/zsh-z \ + zpm-zsh/colors \ zpm-zsh/colorize \ juancldcmt/shortify.zsh \ juancldcmt/kitty-zsh @@ -31,6 +32,15 @@ zinit light hlissner/zsh-autopair zinit light zsh-users/zsh-history-substring-search zinit light zsh-users/zsh-completions +# Software +zinit ice as"command" from"gh-r" mv"bat* -> bat" pick"bat/bat" +zinit light sharkdp/bat + +zinit from"gh-r" as"program" mv"direnv* -> direnv" \ + atclone'./direnv hook zsh > zhook.zsh' atpull'%atclone' \ + pick"direnv" src="zhook.zsh" for \ + direnv/direnv + autoload -Uz _zinit (( ${+_comps} )) && _comps[zinit]=_zinit @@ -112,10 +122,7 @@ export HISTORY_SUBSTRING_SEARCH_FUZZY=1 #colored output export MANWIDTH=${MANWIDTH:-78} -test -e /bin/nvim && export MANPAGER='nvim +Man!' || \ - export MANLESS="Manual\ \$MAN_PN\ ?ltline\ %lt?L/%L.:byte\ %bB?s/%s..?\:?pB\ %pB\\%.." test -n "$LS_COLORS" || eval $(dircolors) || echo 'Warning: Unable to set LS_COLORS' -export LESS="--use-color -RSM~" #local path export PATH="${PATH}:${HOME}/.local/bin:${HOME}/.scripts:${HOME}/cargo/bin:${HOME}/.cache/go/bin:${HOME}/.local/share/nvim/mason/bin"