diff --git a/data/data.toml b/data/data.toml index 120785c..db5136c 100644 --- a/data/data.toml +++ b/data/data.toml @@ -78,14 +78,6 @@ external = "~/.config/ripgrep" internal = "data/zellij" external = "~/.config/zellij" -[[apps.powerlevel10k.paths]] -internal = "data/powerlevel10k/.p10k.zsh" -external = "~/.p10k.zsh" - -[[apps.powerlevel10k.paths]] -internal = "data/powerlevel10k/.p10k.zsh" -url = "https://raw.githubusercontent.com/romkatv/powerlevel10k/master/config/p10k-robbyrussell.zsh" - [[apps.zed.paths]] internal = "data/zed/settings.json" external = "~/.config/zed/settings.json" @@ -94,10 +86,6 @@ external = "~/.config/zed/settings.json" internal = "data/zed/keymap.json" external = "~/.config/zed/keymap.json" -[[apps.pokeget.paths]] -internal = "data/pokeget" -external = "~/.config/pokeget" - [[apps.btop.paths]] internal = "data/btop/themes" external = "~/.config/btop/themes" @@ -126,10 +114,6 @@ external = "~/.config/newsboat/dark" internal = "data/newsboat/dark" url = "https://raw.githubusercontent.com/catppuccin/newsboat/main/themes/dark" -[[apps.sioyek.paths]] -internal = "data/sioyek/prefs_user.config" -external = "~/.config/sioyek/prefs_user.config" - [[apps.typos.paths]] internal = "data/typos/typos.toml" external = "~/.config/typos/typos.toml" diff --git a/data/pokeget/bulbasaur.txt b/data/pokeget/bulbasaur.txt deleted file mode 100644 index b8e9f05..0000000 --- a/data/pokeget/bulbasaur.txt +++ /dev/null @@ -1,10 +0,0 @@ - ▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄ - ▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▀▀▀▀▀▄▄▄▄▄▄▀▀ - ▀▀▀▀ diff --git a/data/pokeget/charmeleon.txt b/data/pokeget/charmeleon.txt deleted file mode 100644 index 19b8e10..0000000 --- a/data/pokeget/charmeleon.txt +++ /dev/null @@ -1,12 +0,0 @@ - ▄▄▄ - ▄▄▄▄ ▄▄▄▄▄ - ▄▄▄▄▄▄▀ ▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄ ▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄ ▀▄▄▄▄ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▀▄▄▄▄ - ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▄▄▄▄▄▄▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▀▄▄▀▀ ▄▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▀▄▄▄▀▄▄▄▄▄▄▄ - ▄▄▄▄▄ - ▀▀▀ diff --git a/data/pokeget/chikorita.txt b/data/pokeget/chikorita.txt deleted file mode 100644 index a6e7c1c..0000000 --- a/data/pokeget/chikorita.txt +++ /dev/null @@ -1,10 +0,0 @@ - ▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▀ - ▄▄▄▄▄▄▄▀▀ -▄▄▄▄▄▄▄▄▄▄ -▄▄▄▄▄▄▄▄▄▄▄ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▀▀▀▄▄▄▄▄▀▀▀ - ▀▀ diff --git a/data/pokeget/clefairy.txt b/data/pokeget/clefairy.txt deleted file mode 100644 index 8cc4d19..0000000 --- a/data/pokeget/clefairy.txt +++ /dev/null @@ -1,10 +0,0 @@ - ▄▄▄ ▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▀▀▄▄▄▄▄▀▀▀ - ▀▀ diff --git a/data/pokeget/ditto.txt b/data/pokeget/ditto.txt deleted file mode 100644 index 32a9be5..0000000 --- a/data/pokeget/ditto.txt +++ /dev/null @@ -1,7 +0,0 @@ - ▄▄▄▄ ▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▀▀▄▄▄▄▄▄▄▄▀▀ - ▀▀▀▀ diff --git a/data/pokeget/dratini.txt b/data/pokeget/dratini.txt deleted file mode 100644 index e5f5282..0000000 --- a/data/pokeget/dratini.txt +++ /dev/null @@ -1,9 +0,0 @@ - ▄▄▄ - ▄▄▄▄▄▄▄ ▄▄▄ - ▀▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▀▄▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▀ ▀▀ - ▀▄▄▄▄▀▀ diff --git a/data/pokeget/eevee.txt b/data/pokeget/eevee.txt deleted file mode 100644 index 2ade19f..0000000 --- a/data/pokeget/eevee.txt +++ /dev/null @@ -1,9 +0,0 @@ - ▄▄▄▄ - ▄▄▄▄▄▄ ▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▀▄▄▄▄▄▄▀ ▀▀ - ▀▀▄▄▀ diff --git a/data/pokeget/machoke.txt b/data/pokeget/machoke.txt deleted file mode 100644 index fc944b4..0000000 --- a/data/pokeget/machoke.txt +++ /dev/null @@ -1,11 +0,0 @@ - ▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄ - ▀▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▀▀▄▄▀ ▄▄▄▄▄▄▄▄▄▄▀▀▄▄▀▀ - ▄▄▄▄▄▄▄▄▄▄▄▄ - ▀▄▄▄▀▀▀▄▄▄▄▄▄ - ▀▄▄▄▄▄ diff --git a/data/pokeget/pikachu-world-cap.txt b/data/pokeget/pikachu-world-cap.txt deleted file mode 100644 index c6604e8..0000000 --- a/data/pokeget/pikachu-world-cap.txt +++ /dev/null @@ -1,11 +0,0 @@ - ▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄ ▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▀▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▀▀▀▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▀▄▄▄▄▄▄▄▄▄▄ - ▀▀▀▄▄▄▄▀ - ▀ diff --git a/data/pokeget/pikachu.txt b/data/pokeget/pikachu.txt deleted file mode 100644 index e37a763..0000000 --- a/data/pokeget/pikachu.txt +++ /dev/null @@ -1,10 +0,0 @@ - ▄▄▄ ▄▄ - ▄▄▄▄ ▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▀ ▄▄▄▄▄▄▄▄▄▄▄▀ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ -▄▄▄▄▄▄▄▄▄▄▄▄▀▄▄▄▄▄ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▀ - ▀▄▄▄▄▄▄▄▄▀ - ▀▀▄▀ diff --git a/data/pokeget/psyduck.txt b/data/pokeget/psyduck.txt deleted file mode 100644 index 45a40b9..0000000 --- a/data/pokeget/psyduck.txt +++ /dev/null @@ -1,11 +0,0 @@ - ▄ ▄▄ ▄▄ - ▄▄▄▄▄▄▄▄▄▀▀ -▄▄▄▄▄▄▄▄▄▄▄▄▄ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▀▀▄▄▀▄▄▄▄▄▄▀ - ▀▀▀▀ diff --git a/data/pokeget/slowpoke.txt b/data/pokeget/slowpoke.txt deleted file mode 100644 index c73718f..0000000 --- a/data/pokeget/slowpoke.txt +++ /dev/null @@ -1,11 +0,0 @@ - ▄▄▄▄▄▄ - ▀▀▄▄▄▄▄ - ▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀▀ - ▀▀▄▄▄▀▀▄▄▄▄▄▄▀ - ▀▀▀▀ diff --git a/data/pokeget/squirtle.txt b/data/pokeget/squirtle.txt deleted file mode 100644 index a77bf9f..0000000 --- a/data/pokeget/squirtle.txt +++ /dev/null @@ -1,9 +0,0 @@ - ▄▄▄▄▄▄▄ ▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄ -▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ -▀▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀ - ▀▀▄▄▄▄▄▄▄▄▄▄▄ - ▄▄▄▄▄▄▄▄▄▄▄ - ▀▀ ▀▄▄▄▄▄ - ▀▀▀ diff --git a/data/powerlevel10k/.p10k.zsh b/data/powerlevel10k/.p10k.zsh deleted file mode 100644 index 6a204d2..0000000 --- a/data/powerlevel10k/.p10k.zsh +++ /dev/null @@ -1,111 +0,0 @@ -# Config file for Powerlevel10k with the style of robbyrussell theme from Oh My Zsh. -# -# Original: https://github.com/ohmyzsh/ohmyzsh/wiki/Themes#robbyrussell. -# -# Replication of robbyrussell theme is exact. The only observable difference is in -# performance. Powerlevel10k prompt is very fast everywhere, even in large Git repositories. -# -# Usage: Source this file either before or after loading Powerlevel10k. -# -# source ~/powerlevel10k/config/p10k-robbyrussell.zsh -# source ~/powerlevel10k/powerlevel10k.zsh-theme - -# Temporarily change options. -'builtin' 'local' '-a' 'p10k_config_opts' -[[ ! -o 'aliases' ]] || p10k_config_opts+=('aliases') -[[ ! -o 'sh_glob' ]] || p10k_config_opts+=('sh_glob') -[[ ! -o 'no_brace_expand' ]] || p10k_config_opts+=('no_brace_expand') -'builtin' 'setopt' 'no_aliases' 'no_sh_glob' 'brace_expand' - -() { - emulate -L zsh -o extended_glob - - # Unset all configuration options. - unset -m '(POWERLEVEL9K_*|DEFAULT_USER)~POWERLEVEL9K_GITSTATUS_DIR' - - # Zsh >= 5.1 is required. - [[ $ZSH_VERSION == (5.<1->*|<6->.*) ]] || return - - # Left prompt segments. - typeset -g POWERLEVEL9K_LEFT_PROMPT_ELEMENTS=(prompt_char dir vcs) - # Right prompt segments. - typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=() - - # Basic style options that define the overall prompt look. - typeset -g POWERLEVEL9K_BACKGROUND= # transparent background - typeset -g POWERLEVEL9K_{LEFT,RIGHT}_{LEFT,RIGHT}_WHITESPACE= # no surrounding whitespace - typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SUBSEGMENT_SEPARATOR=' ' # separate segments with a space - typeset -g POWERLEVEL9K_{LEFT,RIGHT}_SEGMENT_SEPARATOR= # no end-of-line symbol - typeset -g POWERLEVEL9K_VISUAL_IDENTIFIER_EXPANSION= # no segment icons - - # Green prompt symbol if the last command succeeded. - typeset -g POWERLEVEL9K_PROMPT_CHAR_OK_{VIINS,VICMD,VIVIS}_FOREGROUND=green - # Red prompt symbol if the last command failed. - typeset -g POWERLEVEL9K_PROMPT_CHAR_ERROR_{VIINS,VICMD,VIVIS}_FOREGROUND=red - # Prompt symbol: bold arrow. - typeset -g POWERLEVEL9K_PROMPT_CHAR_CONTENT_EXPANSION='%B➜ ' - - # Cyan current directory. - typeset -g POWERLEVEL9K_DIR_FOREGROUND=cyan - # Show only the last segment of the current directory. - typeset -g POWERLEVEL9K_SHORTEN_STRATEGY=truncate_to_last - # Bold directory. - typeset -g POWERLEVEL9K_DIR_CONTENT_EXPANSION='%B$P9K_CONTENT' - - # Git status formatter. - function my_git_formatter() { - emulate -L zsh - if [[ -n $P9K_CONTENT ]]; then - # If P9K_CONTENT is not empty, it's either "loading" or from vcs_info (not from - # gitstatus plugin). VCS_STATUS_* parameters are not available in this case. - typeset -g my_git_format=$P9K_CONTENT - else - # Use VCS_STATUS_* parameters to assemble Git status. See reference: - # https://github.com/romkatv/gitstatus/blob/master/gitstatus.plugin.zsh. - typeset -g my_git_format="${1+%B%4F}git:(${1+%1F}" - my_git_format+=${${VCS_STATUS_LOCAL_BRANCH:-${VCS_STATUS_COMMIT[1,8]}}//\%/%%} - my_git_format+="${1+%4F})" - if (( VCS_STATUS_NUM_CONFLICTED || VCS_STATUS_NUM_STAGED || - VCS_STATUS_NUM_UNSTAGED || VCS_STATUS_NUM_UNTRACKED )); then - my_git_format+=" ${1+%3F}✗" - fi - fi - } - functions -M my_git_formatter 2>/dev/null - - # Disable the default Git status formatting. - typeset -g POWERLEVEL9K_VCS_DISABLE_GITSTATUS_FORMATTING=true - # Install our own Git status formatter. - typeset -g POWERLEVEL9K_VCS_CONTENT_EXPANSION='${$((my_git_formatter(1)))+${my_git_format}}' - typeset -g POWERLEVEL9K_VCS_LOADING_CONTENT_EXPANSION='${$((my_git_formatter()))+${my_git_format}}' - # Grey Git status when loading. - typeset -g POWERLEVEL9K_VCS_LOADING_FOREGROUND=246 - - # Instant prompt mode. - # - # - off: Disable instant prompt. Choose this if you've tried instant prompt and found - # it incompatible with your zsh configuration files. - # - quiet: Enable instant prompt and don't print warnings when detecting console output - # during zsh initialization. Choose this if you've read and understood - # https://github.com/romkatv/powerlevel10k#instant-prompt. - # - verbose: Enable instant prompt and print a warning when detecting console output during - # zsh initialization. Choose this if you've never tried instant prompt, haven't - # seen the warning, or if you are unsure what this all means. - typeset -g POWERLEVEL9K_INSTANT_PROMPT=verbose - - # Hot reload allows you to change POWERLEVEL9K options after Powerlevel10k has been initialized. - # For example, you can type POWERLEVEL9K_BACKGROUND=red and see your prompt turn red. Hot reload - # can slow down prompt by 1-2 milliseconds, so it's better to keep it turned off unless you - # really need it. - typeset -g POWERLEVEL9K_DISABLE_HOT_RELOAD=true - - # If p10k is already loaded, reload configuration. - # This works even with POWERLEVEL9K_DISABLE_HOT_RELOAD=true. - (( ! $+functions[p10k] )) || p10k reload -} - -# Tell `p10k configure` which file it should overwrite. -typeset -g POWERLEVEL9K_CONFIG_FILE=${${(%):-%x}:a} - -(( ${#p10k_config_opts} )) && setopt ${p10k_config_opts[@]} -'builtin' 'unset' 'p10k_config_opts' diff --git a/data/sioyek/prefs_user.config b/data/sioyek/prefs_user.config deleted file mode 100644 index 6013cb7..0000000 --- a/data/sioyek/prefs_user.config +++ /dev/null @@ -1,10 +0,0 @@ -font_size 14 -ui_font Shantell Sans Normal -status_bar_font_size 14 - -flat_toc 1 -horizontal_move_amount -1.0 - -use_legacy_keybinds 0 -control_click_command noop -control_right_click_command noop diff --git a/data/zsh/bottom-zshrc b/data/zsh/bottom-zshrc index 519a03a..e490407 100644 --- a/data/zsh/bottom-zshrc +++ b/data/zsh/bottom-zshrc @@ -1,16 +1,8 @@ # vim: set filetype=zsh: # Put this on bottom of ~/.zshrc -# https://github.com/ohmyzsh/ohmyzsh/wiki/Settings#automatic-title -ZSH_THEME_TERM_TITLE_IDLE="%~" -ZSH_THEME_TERM_TAB_TITLE_IDLE="%~" - -# https://github.com/romkatv/powerlevel10k#how-do-i-configure-instant-prompt -typeset -g POWERLEVEL9K_INSTANT_PROMPT=off - -# https://github.com/romkatv/powerlevel10k#mitigation -typeset -g POWERLEVEL9K_TERM_SHELL_INTEGRATION=true -typeset -g POWERLEVEL9K_RIGHT_PROMPT_ELEMENTS=() +# https://blog.izissise.net/posts/env-path/ +typeset -U path PATH # Alias alias g="git" @@ -25,6 +17,16 @@ export XDG_DATA_HOME=~/.local/share # https://www.topbug.net/blog/2016/09/27/make-gnu-less-more-powerful/ export LESS="-RF -i -K -s -x2 --wordwrap" +# zsh plugins +# https://github.com/zsh-users/zsh-autosuggestions +if [[ -f /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh ]]; then + source /opt/homebrew/share/zsh-autosuggestions/zsh-autosuggestions.zsh + + # https://github.com/zsh-users/zsh-autosuggestions#suggestion-strategy + typeset -g ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20 + typeset -g ZSH_AUTOSUGGEST_HISTORY_IGNORE=$HISTORY_IGNORE +fi + # git # https://stackoverflow.com/a/43747486 export GIT_COMPLETION_CHECKOUT_NO_GUESS=1 @@ -39,11 +41,15 @@ if command -v nvim &>/dev/null; then fi # go -export GOPATH=$HOME/go -export PATH=$PATH:$GOPATH/bin -# Depend on your company -# Please copy this manually to ~/.zshrc -# export GOPRIVATE=example.company.com +# https://stackoverflow.com/a/13542854 +if command -v go &>/dev/null; then + if [[ -d $HOME/go ]]; then + export GOPATH=$HOME/go + path=($path $GOPATH/bin) + fi + # Depend on your company + # export GOPRIVATE=example.company.com +fi # fzf # https://github.com/junegunn/fzf @@ -82,6 +88,15 @@ if command -v fzf &>/dev/null; then if command -v eza &>/dev/null; then export FZF_ALT_C_OPTS="--preview 'eza --tree --level 1 {}'" fi + + source <(fzf --zsh) + + # https://github.com/Aloxaf/fzf-tab + if [[ -f $HOME/.zsh-plugins/fzf-tab/fzf-tab.plugin.zsh ]]; then + source /Users/anon/.zsh-plugins/fzf-tab/fzf-tab.plugin.zsh + + zstyle ':completion:*' menu no + fi fi # https://github.com/BurntSushi/ripgrep @@ -135,16 +150,18 @@ if command -v moar &>/dev/null; then export PAGER=moar fi -# https://github.com/oven-sh/bun -# Depend on your settings -# Please copy this manually to ~/.zshrc -# export GITHUB_TOKEN=your_github_token - # https://github.com/Schniz/fnm if command -v fnm &>/dev/null; then eval "$(fnm env --use-on-cd)" fi +# https://github.com/oven-sh/bun +if command -v bun &>/dev/null; then + if [[ -d $HOME/.cache/.bun/bin ]]; then + path=($path $HOME/.cache/.bun/bin) + fi +fi + # https://github.com/casey/just if command -v just &>/dev/null; then alias jst="just" @@ -167,32 +184,9 @@ if command -v daktilo &>/dev/null; then export DAKTILO_CONFIG="$HOME/.config/daktilo/daktilo.toml" fi -# https://github.com/talwat/pokeget-rs -rand_poke=$((RANDOM % 13)) -if [[ $rand_poke -eq 0 ]]; then - cat ~/.config/pokeget/bulbasaur.txt -elif [[ $rand_poke -eq 1 ]]; then - cat ~/.config/pokeget/charmeleon.txt -elif [[ $rand_poke -eq 2 ]]; then - cat ~/.config/pokeget/chikorita.txt -elif [[ $rand_poke -eq 3 ]]; then - cat ~/.config/pokeget/clefairy.txt -elif [[ $rand_poke -eq 4 ]]; then - cat ~/.config/pokeget/ditto.txt -elif [[ $rand_poke -eq 5 ]]; then - cat ~/.config/pokeget/dratini.txt -elif [[ $rand_poke -eq 6 ]]; then - cat ~/.config/pokeget/eevee.txt -elif [[ $rand_poke -eq 7 ]]; then - cat ~/.config/pokeget/machoke.txt -elif [[ $rand_poke -eq 8 ]]; then - cat ~/.config/pokeget/pikachu-world-cap.txt -elif [[ $rand_poke -eq 9 ]]; then - cat ~/.config/pokeget/pikachu.txt -elif [[ $rand_poke -eq 10 ]]; then - cat ~/.config/pokeget/psyduck.txt -elif [[ $rand_poke -eq 11 ]]; then - cat ~/.config/pokeget/slowpoke.txt -elif [[ $rand_poke -eq 12 ]]; then - cat ~/.config/pokeget/squirtle.txt +# https://github.com/starship/starship +if command -v starship &>/dev/null; then + eval "$(starship init zsh)" fi + +export PATH diff --git a/data/zsh/top-zshrc b/data/zsh/top-zshrc index 738c73c..8bb7c1b 100644 --- a/data/zsh/top-zshrc +++ b/data/zsh/top-zshrc @@ -1,6 +1,11 @@ # vim: set filetype=zsh: # Put this on top of ~/.zshrc +# See https://wiki.archlinux.org/title/Zsh + +# https://lgug2z.com/articles/sensible-wordchars-for-most-developers/ +export WORDCHARS='*?[]~=&;!#$%^(){}<>' + # https://zsh.sourceforge.io/Doc/Release/Parameters.html#Parameters-Used-By-The-Shell export HISTORY_IGNORE="(l[sal]|cd|pwd|exit|z)" export HISTSIZE=100000000 @@ -22,35 +27,5 @@ setopt INC_APPEND_HISTORY_TIME bindkey "^[[1;3C" forward-word bindkey "^[[1;3D" backward-word -# https://github.com/ohmyzsh/ohmyzsh/wiki/Settings#omzupdate-mode -zstyle ':omz:update' mode disabled -zstyle ':omz:update' verbose minimal - -# Skip aliases -zstyle ':omz:*' aliases no -zstyle ':omz:lib:*' aliases no -zstyle ':omz:plugins:*' aliases no - -# https://github.com/Aloxaf/fzf-tab -zstyle ':completion:*' menu no - -# https://github.com/ohmyzsh/ohmyzsh/wiki/Settings#hyphen_insensitive -HYPHEN_INSENSITIVE="true" - -# https://github.com/ohmyzsh/ohmyzsh/issues/5569 -# https://github.com/ohmyzsh/ohmyzsh/wiki/Settings#disable_magic_functions -DISABLE_MAGIC_FUNCTIONS="true" - -# https://github.com/ohmyzsh/ohmyzsh/wiki/Settings#disable_ls_colors -DISABLE_LS_COLORS="true" - -# https://github.com/ohmyzsh/ohmyzsh/issues/10291 -# https://github.com/ohmyzsh/ohmyzsh/wiki/Settings#disable_untracked_files_dirty -DISABLE_UNTRACKED_FILES_DIRTY="true" - -# https://github.com/ohmyzsh/ohmyzsh/wiki/Settings#automatic-title -DISABLE_AUTO_TITLE=true - -# https://github.com/zsh-users/zsh-autosuggestions#suggestion-strategy -typeset -g ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=20 -typeset -g ZSH_AUTOSUGGEST_HISTORY_IGNORE=$HISTORY_IGNORE +autoload -Uz compinit +compinit diff --git a/scripts/brew_init.sh b/scripts/brew_init.sh index 85cf37c..44e05e2 100755 --- a/scripts/brew_init.sh +++ b/scripts/brew_init.sh @@ -2,11 +2,12 @@ brew install \ libgit2 pcre2 xz telnet \ + starship zsh-autosuggestions \ git neovim \ fdupes rsync rclone restic wcurl ncdu \ tlrc vivid zellij \ yt-dlp newsboat vips btop \ - fnm uv just \ + fnm oven-sh/bun/bun deno uv just \ stylua taplo typos-cli clang-format marksman asciidoctor ollama gitleaks gh glab \ - qmk daktilo \ + qmk/qmk/qmk daktilo \ redis mysql-client diff --git a/scripts/bun_maintain.sh b/scripts/bun_maintain.sh index 5ed4bf6..271ecf1 100755 --- a/scripts/bun_maintain.sh +++ b/scripts/bun_maintain.sh @@ -1,6 +1,3 @@ #!/usr/bin/env bash -bun upgrade --stable -bun outdated --global - bun update --global --latest prettier diff --git a/scripts/cargo.sh b/scripts/cargo.sh index 2dc4d3e..74f5a37 100755 --- a/scripts/cargo.sh +++ b/scripts/cargo.sh @@ -4,23 +4,8 @@ rustup update cargo install \ fd-find bat git-delta eza sd \ - difftastic zoxide \ - pokeget + difftastic zoxide cargo install --git https://github.com/BurntSushi/ripgrep ripgrep --features 'pcre2' bat cache --build - -pokeget --hide-name bulbasaur >data/pokeget/bulbasaur.txt -pokeget --hide-name charmeleon >data/pokeget/charmeleon.txt -pokeget --hide-name chikorita >data/pokeget/chikorita.txt -pokeget --hide-name clefairy >data/pokeget/clefairy.txt -pokeget --hide-name ditto >data/pokeget/ditto.txt -pokeget --hide-name dratini >data/pokeget/dratini.txt -pokeget --hide-name eevee >data/pokeget/eevee.txt -pokeget --hide-name machoke >data/pokeget/machoke.txt -pokeget --hide-name pikachu >data/pokeget/pikachu.txt -pokeget --hide-name pikachu-world-cap >data/pokeget/pikachu-world-cap.txt -pokeget --hide-name psyduck >data/pokeget/psyduck.txt -pokeget --hide-name slowpoke >data/pokeget/slowpoke.txt -pokeget --hide-name squirtle >data/pokeget/squirtle.txt diff --git a/scripts/cargo_force.sh b/scripts/cargo_force.sh deleted file mode 100755 index 2efbd0a..0000000 --- a/scripts/cargo_force.sh +++ /dev/null @@ -1,13 +0,0 @@ -#!/usr/bin/env bash - -cargo install --force \ - fd-find bat git-delta eza sd tlrc \ - difftastic vivid zellij zoxide \ - stylua typos-cli \ - pokeget \ - daktilo - -cargo install --force --git https://github.com/BurntSushi/ripgrep ripgrep --features 'pcre2' -cargo install --force --git https://github.com/Schniz/fnm fnm -cargo install --force --git https://github.com/astral-sh/rye rye -cargo install --force --git https://github.com/tamasfe/taplo taplo-cli diff --git a/scripts/manual_update.sh b/scripts/manual_update.sh index 6c3036f..df126be 100755 --- a/scripts/manual_update.sh +++ b/scripts/manual_update.sh @@ -1,13 +1,5 @@ #!/usr/bin/env bash -git -C ~/.oh-my-zsh pull -git -C ~/.oh-my-zsh/custom/themes/powerlevel10k pull -git -C ~/.oh-my-zsh/custom/plugins/zsh-autosuggestions pull -git -C ~/.oh-my-zsh/custom/plugins/fzf-tab pull - -git -C ~/.fzf pull -~/.fzf/install --key-bindings --completion --update-rc --no-bash --no-fish +git -C ~/.zsh-plugins/fzf-tab pull master fnm install --lts - -deno upgrade