From 7c10a8bbb0463479eff064b634b0c0d588fb3142 Mon Sep 17 00:00:00 2001 From: Daniel Lundin Date: Tue, 26 Mar 2024 20:28:48 +0100 Subject: [PATCH] remove deprecated zsh config --- .config/oh-my-posh/config.yaml | 82 ---------- .zsh/history.zsh | 45 ------ .zshrc | 274 --------------------------------- 3 files changed, 401 deletions(-) delete mode 100644 .config/oh-my-posh/config.yaml delete mode 100644 .zsh/history.zsh delete mode 100644 .zshrc diff --git a/.config/oh-my-posh/config.yaml b/.config/oh-my-posh/config.yaml deleted file mode 100644 index c73a2fb..0000000 --- a/.config/oh-my-posh/config.yaml +++ /dev/null @@ -1,82 +0,0 @@ -# yaml-language-server: $schema=https://raw.githubusercontent.com/JanDeDobbeleer/oh-my-posh/main/themes/schema.json -version: 2 -final_space: true -pwd: osc7 -disable_cursor_positioning: true -shell_integration: true -blocks: - - type: prompt - alignment: left - newline: true - segments: - - type: path - style: plain - foreground: "#999" - template: "{{ .Path }} " - properties: - style: full - - - type: prompt - alignment: right - filler: "<#333>⎯" - segments: - - type: git - style: plain - foreground: "#777" - foreground_templates: - - "{{ if or (.Working.Changed) (.Staging.Changed) }}#3b8{{ end }}" - - "{{ if and (gt .Ahead 0) (gt .Behind 0) }}#3b8{{ end }}" - - "{{ if gt .Ahead 0 }}#B388FF{{ end }}" - - "{{ if gt .Behind 0 }}#B388FB{{ end }}" - template: " {{ .HEAD }} {{if .BranchStatus }}{{ .BranchStatus - }}{{ end }}{{ if .Working.Changed }}  {{ .Working.String }}{{ end }}{{ if and - (.Working.Changed) (.Staging.Changed) }} |{{ end }}{{ if .Staging.Changed }}  - {{ .Staging.String }}{{ end }}{{ if gt .StashCount 0 }}  {{ .StashCount }}{{ - end }}" - properties: - fetch_status: true - - - type: rprompt - segments: - - type: executiontime - style: plain - foreground: "#c93" - template: "󱦟 {{ .FormattedMs }}" - properties: - threshold: 500 - - - type: session - style: plain - foreground: "#666" - template: " {{ .UserName }}@{{ .HostName }}" - - - type: time - style: plain - foreground: "#666" - template: " {{ .CurrentDate | date .Format }}" - properties: - time_format: "15:04" - - - type: prompt - alignment: left - newline: true - segments: - - type: path - style: plain - foreground: "#678" - template: "{{ .Path }}" - properties: - style: folder - - - type: text - style: plain - foreground: "#6c9" - template: " %" - properties: - style: folder - -transient_prompt: - background: transparent - foreground: "#6c9" - template: "\n%% " - filler: "-" diff --git a/.zsh/history.zsh b/.zsh/history.zsh deleted file mode 100644 index f0b901a..0000000 --- a/.zsh/history.zsh +++ /dev/null @@ -1,45 +0,0 @@ -typeset -g MY_HISTORY_SEARCH_OFFSET=0 -typeset -g MY_HISTORY_SEARCH_PREFIX="" - -function my-history-prefix-search() { - if [[ $LASTWIDGET != my-history-prefix-search-* ]]; then - # start state machine - MY_HISTORY_SEARCH_OFFSET=-1 - MY_HISTORY_SEARCH_PREFIX="$LBUFFER" - fi - local offset_delta=$1 - local offset=$((MY_HISTORY_SEARCH_OFFSET + $offset_delta)) - - (($offset < 0)) && return - local result=$( - atuin search \ - --filter-mode session \ - --search-mode prefix \ - --limit 1 \ - --offset $offset \ - --format '{command}' \ - "$MY_HISTORY_SEARCH_PREFIX" || - atuin search \ - --search-mode prefix \ - --limit 1 \ - --offset $offset \ - --format '{command}' \ - "$MY_HISTORY_SEARCH_PREFIX" || - ) - if [[ -n "$result" ]]; then - BUFFER=$result - CURSOR=${#BUFFER} - MY_HISTORY_SEARCH_OFFSET=$offset - fi -} - -function my-history-prefix-search-backward-widget() { - my-history-prefix-search +1 -} - -function my-history-prefix-search-forward-widget() { - my-history-prefix-search -1 -} - -zle -N my-history-prefix-search-backward-widget -zle -N my-history-prefix-search-forward-widget diff --git a/.zshrc b/.zshrc deleted file mode 100644 index 545e2bb..0000000 --- a/.zshrc +++ /dev/null @@ -1,274 +0,0 @@ -if [[ ! -f $HOME/.local/share/zinit/zinit.git/zinit.zsh ]]; then - print -P "%F{33} %F{220}Installing %F{33}ZDHARMA-CONTINUUM%F{220} Initiative Plugin Manager (%F{33}zdharma-continuum/zinit%F{220})…%f" - command mkdir -p "$HOME/.local/share/zinit" && command chmod g-rwX "$HOME/.local/share/zinit" - command git clone --depth=1 https://github.com/zdharma-continuum/zinit "$HOME/.local/share/zinit/zinit.git" && \ - print -P "%F{33} %F{34}Installation successful.%f%b" || \ - print -P "%F{160} The clone has failed.%f%b" -fi - -source "$HOME/.local/share/zinit/zinit.git/zinit.zsh" -autoload -Uz _zinit -(( ${+_comps} )) && _comps[zinit]=_zinit - -zi ice wait lucid -zi load zsh-users/zsh-completions -# zi ice wait lucid -# zi load zsh-users/zsh-autosuggestions -zi ice wait lucid -zi load zdharma-continuum/fast-syntax-highlighting -zi ice wait lucid -zi load nix-community/nix-zsh-completions -zi ice wait lucid -zi load olets/zsh-abbr -zi ice wait lucid -zi snippet https://raw.githubusercontent.com/ohmyzsh/ohmyzsh/master/plugins/shrink-path/shrink-path.plugin.zsh - -zstyle ':completion:*' use-cache on -zstyle ':completion:*' cache-path ~/.zsh/cache - -# Highlighting -zle_highlight=('paste:none') - -## History -HISTSIZE=50000 -SAVEHIST=50000 -HISTFILE=~/.zsh_history -setopt append_history -setopt extended_history -setopt hist_expire_dups_first -setopt hist_fcntl_lock -setopt hist_ignore_all_dups -setopt hist_ignore_space -setopt HIST_IGNORE_SPACE -setopt hist_lex_words -setopt hist_reduce_blanks -setopt hist_save_no_dups -setopt hist_subst_pattern -setopt hist_verify -setopt share_history -export HISTORY_IGNORE="(ls *|cd *|rm *|pwd|reboot|exit|e *|*AWS*|*SECRET*|*PASSWORD*|*TOKEN*|*API*|*KEY*|*PASS*|*SECRETS*|*SECRET_KEY*|*SECRET_TOKEN*|*SECRET_KEY_BASE*|*SECRET_TOKEN_BASE*)" -export WORDCHARS='*?_-.[]~=&;!#$%^(){}<>' - - -## zsh settings -setopt pipe_fail -setopt auto_pushd -setopt no_beep -setopt no_rm_star_silent -setopt extended_glob -setopt ksh_glob -setopt null_glob - -export LC_ALL=en_US.UTF-8 - -export PATH=$HOME/bin:$HOME/.cargo/bin:$PATH - -redraw-prompt() { - local precmd - for precmd in $precmd_functions; do - $precmd - done - zle reset-prompt -} -zle -N redraw-prompt - -_jump() { - _dir=$(fre --sorted | fzf-tmux --no-sort -p 90%,40% -y 0) - [ -n "$_dir" ] && pushd $_dir >>/dev/null - zle && zle redraw-prompt -} -zle -N _jump - -fre_chpwd() { - fre --add "$(pwd)" -} -typeset -gaU chpwd_functions -chpwd_functions+=fre_chpwd - -_cwd_gitroot() { - _gitroot=$(git rev-parse --show-toplevel 2>/dev/null || pwd) - _dir=$((echo "$_gitroot" && fd -td . "$_gitroot") | fzf-tmux -p 90%,40% -y 0) - [ -n "$_dir" ] && cd $_dir - zle && zle redraw-prompt -} -zle -N _cwd_gitroot - -## Keybindings -source $HOME/.zsh/history.zsh -bindkey -e -bindkey '^g' _jump -# bindkey '^P' atuin-up-search -bindkey '^p' my-history-prefix-search-backward-widget -bindkey '^n' my-history-prefix-search-forward-widget -bindkey "^[[A" my-history-prefix-search-backward-widget -bindkey "^[[B" my-history-prefix-search-forward-widget - - -## Pager -export LESS="--mouse --wheel-lines=1 -nRXF" -export LESSCOLORIZER="bat" -export LESSOPEN="|lesspipe.sh %s" -export PAGER="bat" -export BAT_PAGER="less -r" - -## Clipboard OSC 52 - function clip { echo -en "\x1b]52;c;$(base64 -w0)\x07" } - -## Aliases -alias c='cut -c-${COLUMNS}' -alias e='tmux-edit-helper' -alias dotgit='git --work-tree $HOME --git-dir $HOME/.dot_git' -alias git='git-branchless wrap --' -alias l='bat --wrap=never --pager="less -S"' -alias ls=eza -alias tail='tail -n $LINES' -alias timestamp='TZ=Z date "+%Y%m%dT%H%M%SZ"' -alias top='btm --basic --enable_cache_memory --enable_gpu_memory --battery' -alias v=vgrep -alias ve='env EDITOR= vgrep -s' -alias xc=clip -alias w="history -1 | sed -e 's/[0-9]* //' | xargs viddy -n1" - -## ripgrep -export RIPGREP_CONFIG_PATH=${HOME}/.config/shelman-theme/current/rg/rg.conf - - -tree() { - eza --tree --color=always "$@" | bat --wrap=never -} - -# "auto paging" -rg() { - /usr/bin/rg -p "$@" | bat -} - - -## vim -export EDITOR=nvim - -## fzf -export FZF_TMUX=1 -export FZF_COMPLETION_TRIGGER=";" -export FZF_DEFAULT_COMMAND='fd --type f --hidden --follow --exclude .git' -. /usr/share/fzf/completion.zsh -. /usr/share/fzf/key-bindings.zsh - -## direnv -eval "$(direnv hook zsh)" - -## pyenv -export PYENV_ROOT="$HOME/.pyenv" -command -v pyenv >/dev/null || export PATH="$PYENV_ROOT/bin:$PATH" -export PATH="/home/dln/.pyenv/shims:${PATH}" -export PYENV_SHELL=zsh -# command pyenv rehash 2>/dev/null # this is slow -pyenv() { - local command - command="${1:-}" - if [ "$#" -gt 0 ]; then - shift - fi - - case "$command" in - activate|deactivate|rehash|shell) - eval "$(pyenv "sh-$command" "$@")" - ;; - *) - command pyenv "$command" "$@" - ;; - esac -} - - -autoload -Uz compdef -autoload -U +X bashcompinit && bashcompinit -autoload -U +X compinit && compinit - -## Nix -export PATH=$HOME/.nix-profile/bin:$PATH -export LOCALE_ARCHIVE=/usr/lib/locale/locale-archive -export NIX_REMOTE=daemon - -## eksctl -if [ ! -f "${fpath[1]}/_eksctl" ]; then - command -v eksctl >/dev/null 2>&1 && eksctl completion zsh > "${fpath[1]}/_eksctl" -fi - -## Kubernetes -if [ ! -f "${fpath[1]}/_kubectl" ]; then - command -v kubectl >/dev/null 2>&1 && kubectl completion zsh > "${fpath[1]}/_kubectl" -fi -export PATH=$HOME/.krew/bin:$PATH -alias kubectl='grc kubectl' - -## bazel -#if [ ! -f "${fpath[1]}/_bazel" ]; then -# curl -sLo "${fpath[1]}/_bazel" https://raw.githubusercontent.com/bazelbuild/bazel/master/scripts/zsh_completion/_bazel -#fi - -## git-branchless -if [ ! -f "${fpath[1]}/_git_branchless" ]; then - curl -sLo "${fpath[1]}/_git_branchless" https://gist.githubusercontent.com/minijackson/68effb0e6c7d8333e20f07da20076c28/raw/5469ffa1c6adc245adb82316f1013937c5148da7/_git-branchless -fi - -## go-task -if [ ! -f "${fpath[1]}/_task" ]; then - curl -sLo "${fpath[1]}/_task" https://raw.githubusercontent.com/go-task/task/main/completion/zsh/_task -fi - -## kapp -if [ ! -f "${fpath[1]}/_kapp" ]; then - command -v kapp >/dev/null 2>&1 && kapp completion zsh --tty=false > "${fpath[1]}/_kapp" -fi - -## kn -if [ ! -f "${fpath[1]}/_kn" ]; then - command -v kn >/dev/null 2>&1 && kn completion zsh > "${fpath[1]}/_kn" -fi - -## talos cli -if [ ! -f "${fpath[1]}/_talosctl" ]; then - command -v talosctl >/dev/null 2>&1 && talosctl completion zsh > "${fpath[1]}/_talosctl" -fi - -## pulumi -if [ ! -f "${fpath[1]}/_pulumi" ]; then - command -v pulumi >/dev/null 2>&1 && pulumi gen-completion zsh > "${fpath[1]}/_pulumi" -fi - -## vault -complete -o nospace -C /usr/bin/vault vault - -## Google Cloud -[ -f /opt/google-cloud-sdk/completion.zsh.inc ] && source /opt/google-cloud-sdk/completion.zsh.inc -if [ -f '/home/dln/google-cloud-sdk/path.zsh.inc' ]; then . '/home/dln/google-cloud-sdk/path.zsh.inc'; fi -if [ -f '/home/dln/google-cloud-sdk/completion.zsh.inc' ]; then . '/home/dln/google-cloud-sdk/completion.zsh.inc'; fi - -## Golang -export PATH=$HOME/go/bin:$PATH -export GOPROXY=https://athens.aarn.shelman.io - -## Ansible -export ANSIBLE_NOCOWS=1 - -## Docker -export DOCKER_BUILDKIT=1 - -PROG=tea _CLI_ZSH_AUTOCOMPLETE_HACK=1 source "/home/dln/.config/tea/autocomplete.zsh" - -## AWS -complete -o nospace -C /usr/bin/mcli mcli -complete -C '/usr/bin/aws_completer' aws - -function _grc() { - shift words - (( CURRENT-- )) - _normal -} -compdef _grc grc - -# Atuin history -eval "$(atuin init zsh --disable-up-arrow)" - -# Prompt -eval "$(oh-my-posh init zsh --config $HOME/.config/oh-my-posh/config.yaml)"