fix: improve shell configs

3 files changed, 151 insertions, 54 deletions

diff --git a/zsh/.config/zsh/.zshrc b/zsh/.config/zsh/.zshrc
new file mode 100644
index 0000000..ceca7dc
--- /dev/null
+++ b/zsh/.config/zsh/.zshrc
@@ -0,0 +1,151 @@
+# Opts
+HYPHEN_INSENSITIVE="true"
+DISABLE_UPDATE_PROMPT="true"
+DISABLE_AUTO_TITLE="true"
+HISTFILE=~/.zsh_history
+HISTSIZE=10000
+SAVEHIST=10000
+
+setopt NO_BEEP
+setopt MENU_COMPLETE
+setopt auto_pushd             # auto push to the directory stack on cd
+setopt extended_history       # record timestamp of command in HISTFILE
+setopt hist_expire_dups_first # delete duplicates first when HISTFILE size exceeds HISTSIZE
+setopt hist_ignore_dups       # ignore duplicated commands history list
+setopt hist_ignore_space      # ignore commands that start with space
+setopt hist_verify            # show command with history expansion to user before running it
+setopt share_history          # share command history data
+
+# Exports
+typeset -A ZSH_HIGHLIGHT_STYLES
+export ZSH_HIGHLIGHT_STYLES[path]='fg=cyan'
+export ZSH_HIGHLIGHT_HIGHLIGHTERS=(main brackets pattern line)
+export ZSH_AUTOSUGGEST_STRATEGY=(match_prev_cmd completion)
+
+# Aliases
+alias ls='ls --color=tty'
+alias l='ls -lah'
+alias la='ls -lAh'
+alias ll='ls -lh'
+alias lla='ls -lA'
+alias lsa='ls -lah'
+alias grep='grep --color'
+alias ipa="ip -s -c -h a"
+alias untar="tar -zxvf"
+alias td=". td.sh"
+alias vim=nvim
+alias pip=pip3
+alias python=python3
+alias dexec="docker exec -it"
+alias dps="docker ps"
+alias dc="docker compose"
+alias dce="docker compose exec"
+alias dcps="docker compose ps"
+alias dcls="docker compose ls"
+alias dcdn="docker compose down"
+alias dcup="docker compose up"
+alias dcupd="docker compose up -d"
+alias dcl="docker compose logs"
+alias dclf="docker compose logs -f"
+alias dct="docker context"
+alias dcu="docker context use"
+
+# Misc
+command -v fd &>/dev/null && _fzf_compgen_path() {
+  fd --hidden --follow --exclude ".git" . "$1"
+}
+
+command -v fd &>/dev/null && _fzf_compgen_dir() {
+  fd --type d --hidden --follow --exclude ".git" . "$1"
+}
+
+eval "$(starship init zsh 2>/dev/null)"
+
+set_win_title() {
+  local prefix
+
+  if [ "$USER" != "tobyv" ]; then
+    prefix="${USER} in "
+  fi
+
+  if [ -n "$SSH_CLIENT" ] || [ -n "$SSH_TTY" ]; then
+    prefix="${prefix/in/on}${HOST} in "
+  fi
+
+  echo -ne "\033]0;${prefix}${PWD/$HOME/~}\007"
+}
+
+precmd_functions+=(set_win_title)
+
+bindkey '^ ' autosuggest-accept
+bindkey '^[[Z' reverse-menu-complete
+
+# Plugins
+function plugin-load {
+  local repo plugin_name plugin_dir initfile initfiles
+  export ZPLUGINDIR=${ZPLUGINDIR:-${ZDOTDIR:-$HOME/.config/zsh}/plugins}
+  for repo in $@; do
+    plugin_name=${repo:t}
+    plugin_dir=$ZPLUGINDIR/$plugin_name
+    initfile=$plugin_dir/$plugin_name.plugin.zsh
+
+    if [[ ! -d $plugin_dir ]]; then
+      echo "Cloning $repo"
+      git clone -q --depth 1 --recursive --shallow-submodules https://github.com/$repo $plugin_dir
+    fi
+
+    if [[ ! -e $initfile ]]; then
+      initfiles=($plugin_dir/*.plugin.{z,}sh(N) $plugin_dir/*.{z,}sh{-theme,}(N))
+      [[ ${#initfiles[@]} -gt 0 ]] || { echo "Plugin has no init file '$repo'."  >&2 && continue }
+      ln -sf "${initfiles[1]}" "$initfile"
+    fi
+
+    fpath+=$plugin_dir
+    (( $+functions[zsh-defer] )) && zsh-defer . $initfile || . $initfile
+  done
+}
+
+repos=(
+  romkatv/zsh-defer
+  jirutka/zsh-shift-select
+  zsh-users/zsh-completions
+  Aloxaf/fzf-tab
+  joshskidmore/zsh-fzf-history-search
+  srijanshetty/zsh-pandoc-completion
+  zsh-users/zsh-syntax-highlighting
+  zsh-users/zsh-autosuggestions
+)
+
+plugin-load $repos
+
+function comp-load {
+  local comp src name comp_file
+  export ZCOMPDIR=${ZCOMPDIR:-${XDG_DATA_HOME:-$HOME/.local/share}/zsh/site-functions}
+  mkdir -p $ZCOMPDIR
+  for comp in $@; do
+    src="$(echo $comp | sed 's/[:][^:]*$//')"
+    name="$(echo $comp | sed 's/.*[:]//' | sed 's/^[^_]/_&/')"
+
+    if [[ -n $name ]]; then
+      name="$(basename $src | sed 's/^[^_]/_&/')"
+    fi
+
+    comp_file=$ZCOMPDIR/$name
+
+    if [[ ! -f $comp_file ]]; then
+      curl -sL https://raw.githubusercontent.com/$src >$comp_file
+    fi
+  done
+
+  fpath+=$ZCOMPDIR
+
+  autoload -U compinit
+  compinit -i
+
+  zstyle ':completion:*' menu select
+}
+
+comps=(
+  dotnet/cli/master/scripts/register-completions.zsh:_dotnet
+  docker/cli/master/contrib/completion/zsh/_docker
+)
diff --git a/zsh/.config/zsh/aliases.sh b/zsh/.config/zsh/aliases.sh
deleted file mode 100644
index 3e87862..0000000
--- a/zsh/.config/zsh/aliases.sh
+++ /dev/null
@@ -1,30 +0,0 @@
-alias ls='ls --color=tty'
-alias l='ls -lah'
-alias la='ls -lAh'
-alias ll='ls -lh'
-alias lla='ls -lA'
-alias lsa='ls -lah'
-alias grep='grep --color'
-alias ipa="ip -s -c -h a"
-alias untar="tar -zxvf"
-alias td=". td.sh"
-alias vim=nvim
-#python
-alias pip=pip3
-alias python=python3
-# docker
-alias dexec="docker exec -it"
-alias dps="docker ps"
-# docker compose
-alias dc="docker compose"
-alias dce="docker compose exec"
-alias dcps="docker compose ps"
-alias dcls="docker compose ls"
-alias dcdn="docker compose down"
-alias dcup="docker compose up"
-alias dcupd="docker compose up -d"
-alias dcl="docker compose logs"
-alias dclf="docker compose logs -f"
-# docker context
-alias dct="docker context"
-alias dcu="docker context use"
diff --git a/zsh/.config/zsh/env.sh b/zsh/.config/zsh/env.sh
deleted file mode 100644
index 2429dd6..0000000
--- a/zsh/.config/zsh/env.sh
+++ /dev/null
@@ -1,24 +0,0 @@
-# XDG
-export XDG_CONFIG_HOME=~/.config
-export XDG_CACHE_HOME=~/.cache
-export XDG_DATA_HOME=~/.local/share
-export XDG_RUNTIME_DIR=~/.xdg
-
-# Path
-export PATH=$PATH:$HOME/.local/bin
-export PATH=$PATH:$HOME/.scripts
-export PATH=$PATH:$HOME/.go/bin
-export PATH=$PATH:$HOME/.dotnet/tools
-export PATH=$PATH:$HOME/.cargo/bin
-export PATH=$PATH:/usr/local/texlive/2021/bin/x86_64-linux
-
-# Misc
-export EDITOR="$(command -v vim 2>/dev/null || command -v vi)"
-export VISUAL="code --wait"
-export GPG_TTY=$(tty)
-export MANPAGER="sh -c 'col -bx | bat -l man -p'"
-export MANROFFOPT="-c"
-export GOPATH=$HOME/.go
-export STARSHIP_LOG="error"
-export FZF_PREVIEW_COMMAND="bat --style=numbers,changes --wrap never --color always {} || cat {} || tree -C {}"
-export FZF_CTRL_T_OPTS="--min-height 30 --preview-window down:60% --preview-window noborder --preview '($FZF_PREVIEW_COMMAND) 2> /dev/null'"