diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile new file mode 100644 index 0000000..8ca89d3 --- /dev/null +++ b/.config/zsh/.zprofile @@ -0,0 +1,5 @@ +# unused for now +# export PATH="${$(find ~/.local/bin -type d -printf %p:)%%:}:$PATH" + +# default apps +export EDITOR="/usr/bin/nvim" diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv new file mode 100644 index 0000000..8ca89d3 --- /dev/null +++ b/.config/zsh/.zshenv @@ -0,0 +1,5 @@ +# unused for now +# export PATH="${$(find ~/.local/bin -type d -printf %p:)%%:}:$PATH" + +# default apps +export EDITOR="/usr/bin/nvim" diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc new file mode 100644 index 0000000..5b2d89a --- /dev/null +++ b/.config/zsh/.zshrc @@ -0,0 +1,65 @@ +# ls colors +eval "$(dircolors -b)" + +# history +HISTSIZE=10000000 +SAVEHIST=10000000 +HISTFILE="${HOME}/.cache/zsh_history" +setopt hist_expire_dups_first +setopt hist_ignore_dups +setopt hist_ignore_all_dups +setopt hist_ignore_space +setopt hist_find_no_dups +setopt hist_save_no_dups + +# change word-style +autoload -U select-word-style +select-word-style b + +# options +setopt extendedglob +setopt auto_pushd + +# keybinds +bindkey -e +bindkey '^[[Z' reverse-menu-complete +bindkey "^[[1;3C" forward-word +bindkey "^[[1;5C" forward-word +bindkey "^[[1;3D" backward-word +bindkey "^[[1;5D" backward-word + + +bindkey "^[^H" backward-word +bindkey "^[^L" forward-word +bindkey "^[h" backward-char +bindkey "^[f" forward-char + +# completions +autoload -Uz compinit +if [[ -n ${ZDOTDIR}/.zcompdump(#qN.mh+24) ]]; then + compinit; +else + compinit -C; +fi; + +zstyle ':completion:*' menu select +zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' +zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}:ma=48;5;8;38;5;15" + +# prompt +autoload -U colors && colors +PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " + +# ls aliases +alias ls="lsd --color=auto" +alias l="ls -lh" +alias la="ls -lah" +alias ll="ls -lh" +alias tree="ls --tree" + +# aliases +alias dt="git --git-dir=$HOME/.dotfiles/git --work-tree=$HOME" +alias rz="exec zsh" +alias ..="cd .." +alias ...="cd ..." +alias reload_completion="autoload -Uz compinit && compinit" diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..3923b7b --- /dev/null +++ b/.gitignore @@ -0,0 +1,4 @@ +# lazy.nvim lockfile +lazy-lock.json +**/tmux/plugins/ +.zcompdump diff --git a/.gitmodules b/.gitmodules index 536d84d..f6c6a45 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,6 +1,3 @@ -[submodule ".local/share/zsh-plugins/zsh-syntax-highlighting"] - path = .local/share/zsh-plugins/zsh-syntax-highlighting - url = https://github.com/zsh-users/zsh-syntax-highlighting/ -[submodule ".local/share/zsh-plugins/git-prompt.zsh"] - path = .local/share/zsh-plugins/git-prompt.zsh - url = https://github.com/woefe/git-prompt.zsh +[submodule ".local/share/tmux-plugins/tpm"] + path = .local/share/tmux-plugins/tpm + url = https://github.com/tmux-plugins/tpm diff --git a/.local/share/zsh-plugins/git-prompt.zsh b/.local/share/zsh-plugins/git-prompt.zsh deleted file mode 160000 index 55f40bd..0000000 --- a/.local/share/zsh-plugins/git-prompt.zsh +++ /dev/null @@ -1 +0,0 @@ -Subproject commit 55f40bdfb287122ea50c1c01ef056ca7dac175e5 diff --git a/.local/share/zsh-plugins/zsh-syntax-highlighting b/.local/share/zsh-plugins/zsh-syntax-highlighting deleted file mode 160000 index bb27265..0000000 --- a/.local/share/zsh-plugins/zsh-syntax-highlighting +++ /dev/null @@ -1 +0,0 @@ -Subproject commit bb27265aeeb0a22fb77f1275118a5edba260ec47 diff --git a/.zkbd/xterm-256color-:0 b/.zkbd/xterm-256color-:0 deleted file mode 100644 index 0eff172..0000000 --- a/.zkbd/xterm-256color-:0 +++ /dev/null @@ -1,26 +0,0 @@ -typeset -g -A key - -key[F1]='OP' -key[F2]='^[OQ' -key[F3]='^[OR' -key[F4]='^[OS' -key[F5]='^[[15~' -key[F6]='^[[17~' -key[F7]='^[[18~' -key[F8]='^[[19~' -key[F9]='^[[20~' -key[F10]='^[[21~' -key[F11]='''' -key[F12]='^[[24~' -key[Backspace]='^?' -key[Insert]='^[[2~' -key[Home]='''' -key[PageUp]='''' -key[Delete]='^[[3~' -key[End]='''' -key[PageDown]='''' -key[Up]='^[[A' -key[Left]='^[[D' -key[Down]='^[[B' -key[Right]='^[[C' -key[Menu]='''' diff --git a/.zprofile b/.zprofile deleted file mode 100644 index 56542d7..0000000 --- a/.zprofile +++ /dev/null @@ -1,4 +0,0 @@ -export PATH="${$(find ~/.local/bin -type d -printf %p:)%%:}:$PATH" - -# default apps -export EDITOR="/usr/bin/nvim" diff --git a/.zshrc b/.zshrc deleted file mode 100644 index 0a5f993..0000000 --- a/.zshrc +++ /dev/null @@ -1,74 +0,0 @@ -# ls colors -eval "$(dircolors -b)" -# history -HISTSIZE=10000000 -SAVEHIST=10000000 -HISTFILE="$HOME/.cache/zsh_history" -setopt inc_append_history -setopt extended_history -setopt hist_find_no_dups - -# change word-style -autoload -U select-word-style -select-word-style b - -# options -setopt extendedglob -setopt AUTO_PUSHD - -# keybinds -bindkey -e -bindkey '^[[Z' reverse-menu-complete -bindkey "^[[1;3C" forward-word -bindkey "^[[1;5C" forward-word -bindkey "^[[1;3D" backward-word -bindkey "^[[1;5D" backward-word - -# completions -autoload -Uz compinit && compinit -zstyle ':completion:*' menu select -zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' -zstyle ':completion:*' list-colors "${(s.:.)LS_COLORS}:ma=48;5;8;38;5;15" - -# prompt -autoload -U colors && colors -PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b " -RPROMPT='$(gitprompt)' - -# ls aliases -alias ls="lsd --color=auto" -alias l="ls -lh" -alias la="ls -lah" -alias ll="ls -lh" -alias tree="ls --tree" - -# aliases -alias dt="git --git-dir=$HOME/.dotfiles/git --work-tree=$HOME" -alias rz="exec zsh" -alias bat="batcat" -alias ..="cd .." -alias ...="cd ..." - - -# theming -ZSH_THEME_GIT_PROMPT_PREFIX="%{$fg_bold[red]%}[" -ZSH_THEME_GIT_PROMPT_SUFFIX="%{$fg_bold[red]%}]" -ZSH_THEME_GIT_PROMPT_SEPARATOR=" " -ZSH_THEME_GIT_PROMPT_DETACHED="%{$fg_bold[cyan]%}:" -ZSH_THEME_GIT_PROMPT_BRANCH="%{$fg_bold[magenta]%}" -ZSH_THEME_GIT_PROMPT_UPSTREAM_SYMBOL="%{$fg_bold[yellow]%}⟳ " -ZSH_THEME_GIT_PROMPT_UPSTREAM_NO_TRACKING="%{$fg_bold[red]%}!" -ZSH_THEME_GIT_PROMPT_UPSTREAM_PREFIX="%{$fg[red]%}(%{$fg[yellow]%}" -ZSH_THEME_GIT_PROMPT_UPSTREAM_SUFFIX="%{$fg[red]%})" -ZSH_THEME_GIT_PROMPT_BEHIND="↓" -ZSH_THEME_GIT_PROMPT_AHEAD="↑" -ZSH_THEME_GIT_PROMPT_UNMERGED="%{$fg[red]%}x" -ZSH_THEME_GIT_PROMPT_STAGED="%{$fg[green]%}*" -ZSH_THEME_GIT_PROMPT_UNSTAGED="%{$fg[red]%}+" -ZSH_THEME_GIT_PROMPT_UNTRACKED="…" -ZSH_THEME_GIT_PROMPT_STASHED="%{$fg[blue]%}s" -ZSH_THEME_GIT_PROMPT_CLEAN="%{$fg_bold[green]%}v" - -# plugins -source "$HOME/.local/share/zsh-plugins/git-prompt.zsh/git-prompt.zsh" -# source "$HOME/.local/share/zsh-plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" # don't like it, makes my terminal feel sluggish