diff options
| -rw-r--r-- | zprofile | 13 | ||||
| -rw-r--r-- | zsh/completion.zsh | 0 | ||||
| -rw-r--r-- | zsh/functions.zsh | 0 | ||||
| -rw-r--r-- | zsh/fzf.zsh | 13 | ||||
| -rw-r--r-- | zsh/keybindings.zsh | 1 | ||||
| -rw-r--r-- | zsh/setopt.zsh | 2 | ||||
| -rw-r--r-- | zsh/wsl.zsh | 1 | ||||
| -rwxr-xr-x | zshrc | 7 |
8 files changed, 9 insertions, 28 deletions
@@ -1,10 +1,11 @@ # Exports -export ZSH="${HOME}/.oh-my-zsh" -export ZSH_CUSTOM="${HOME}/.oh-my-zsh/custom" -export PATH="${HOME}/.local/bin:${HOME}/.dotnet/tools:$PATH" +export PATH="$PATH:${HOME}/.local/bin" +export PATH="$PATH:${HOME}/.dotnet/tools" + +export ZSH_BASE="${HOME}/dotfiles" +export FZF_BASE="${HOME}/dotfiles/fzf" # Directory hashtable -hash -d .=${HOME}/dotfiles +hash -d .=${ZSH_BASE} hash -d s=${HOME}/Sync -hash -d d=${HOME}/docker -hash -d w=/mnt/c/Users/$USER
\ No newline at end of file +hash -d d=${HOME}/docker
\ No newline at end of file diff --git a/zsh/completion.zsh b/zsh/completion.zsh deleted file mode 100644 index e69de29..0000000 --- a/zsh/completion.zsh +++ /dev/null diff --git a/zsh/functions.zsh b/zsh/functions.zsh deleted file mode 100644 index e69de29..0000000 --- a/zsh/functions.zsh +++ /dev/null diff --git a/zsh/fzf.zsh b/zsh/fzf.zsh deleted file mode 100644 index d664c13..0000000 --- a/zsh/fzf.zsh +++ /dev/null @@ -1,13 +0,0 @@ -# Setup fzf -# --------- -if [[ ! "$PATH" == *${HOME}/dotfiles/fzf/bin* ]]; then - export PATH="${PATH:+${PATH}:}${HOME}/dotfiles/fzf/bin" -fi - -# Auto-completion -# --------------- -[[ $- == *i* ]] && source "${HOME}/dotfiles/fzf/shell/completion.zsh" 2> /dev/null - -# Key bindings -# ------------ -source "${HOME}/dotfiles/fzf/shell/key-bindings.zsh" diff --git a/zsh/keybindings.zsh b/zsh/keybindings.zsh index 0dcaa25..3b80098 100644 --- a/zsh/keybindings.zsh +++ b/zsh/keybindings.zsh @@ -45,7 +45,6 @@ function r-cut() { (( ${+aliases[cb]} )) && printf "$CUTBUFFER" | cb } -# Keybinds for key kcap seq mode widget ( sleft kLFT $'\e[1;2D' select backward-char sright kRIT $'\e[1;2C' select forward-char diff --git a/zsh/setopt.zsh b/zsh/setopt.zsh index 5eccf1b..1704722 100644 --- a/zsh/setopt.zsh +++ b/zsh/setopt.zsh @@ -1,11 +1,9 @@ typeset -A ZSH_HIGHLIGHT_STYLES ZSH_HIGHLIGHT_STYLES[path]='fg=cyan' -ZSH_THEME="powerlevel10k/powerlevel10k" HYPHEN_INSENSITIVE="true" DISABLE_UPDATE_PROMPT="true" DISABLE_AUTO_TITLE="true" -ZSH_CUSTOM_AUTOUPDATE_QUIET=true setopt HIST_IGNORE_ALL_DUPS setopt NO_BEEP setopt MENU_COMPLETE
\ No newline at end of file diff --git a/zsh/wsl.zsh b/zsh/wsl.zsh index 7e7715b..5a8c10f 100644 --- a/zsh/wsl.zsh +++ b/zsh/wsl.zsh @@ -1,4 +1,5 @@ export PATH="${HOME}/.local/bin.win:$PATH" +hash -d w=/mnt/c/Users/$USER alias cb=clip.exe function winget() { @@ -1,17 +1,12 @@ [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]] && source "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" -ZSH_BASE=$HOME/dotfiles # Base directory for ZSH configuration - [ -n "${WSL_DISTRO_NAME+1}" ] && source $ZSH_BASE/zsh/wsl.zsh source $ZSH_BASE/zsh/setopt.zsh -source $ZSH_BASE/zsh/completion.zsh source $ZSH_BASE/zsh/prompt.zsh source $ZSH_BASE/zsh/aliases.zsh -source $ZSH_BASE/zsh/functions.zsh -source $ZSH_BASE/zsh/fzf.zsh source $ZSH_BASE/zsh/keybindings.zsh -source $ZSH_BASE/antigen/antigen.zsh # Load Antigen +source $ZSH_BASE/antigen/antigen.zsh antigen use oh-my-zsh antigen bundle git |