diff options
| -rw-r--r-- | .bash_profile | 23 | ||||
| -rw-r--r-- | .config/zsh/.zprofile | 10 | ||||
| -rw-r--r-- | .config/zsh/.zshrc (renamed from .bashrc) | 40 | ||||
| -rw-r--r-- | .zshenv | 8 |
4 files changed, 45 insertions, 36 deletions
diff --git a/.bash_profile b/.bash_profile deleted file mode 100644 index 9ff510d..0000000 --- a/.bash_profile +++ /dev/null @@ -1,23 +0,0 @@ -# -# ~/.bash_profile -# - -[[ -f ~/.bashrc ]] && . ~/.bashrc - -export XDG_CONFIG_HOME=$HOME/.config -export XDG_CACHE_HOME=$HOME/.cache -export XDG_DATA_HOME=$HOME/.local/share -export XDG_STATE_HOME=$HOME/.local/state -export XDG_DATA_DIRS="/usr/local/share:/usr/share" -export XDG_CONFIG_DIRS="/etc/xdg" - -export MAKEFLAGS="-j$(nproc)" -export XAUTHORITY="$XDG_RUNTIME_DIR"/Xauthority -export HISTFILE="$XDG_STATE_HOME"/bash/history -export INPUTRC="$XDG_CONFIG_HOME"/readline/inputrc -export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass -export GTK_RC_FILES="$XDG_CONFIG_HOME"/gtk-1.0/gtkrc -export GTK2_RC_FILES="$XDG_CONFIG_HOME"/gtk-2.0/gtkrc -export RANGER_LOAD_DEFAULT_RC=FALSE - -[[ $(fgconsole 2>/dev/null) == 1 ]] && exec startx "$XDG_CONFIG_HOME/X11/xinitrc" -- vt1 diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile new file mode 100644 index 0000000..d6ed4dd --- /dev/null +++ b/.config/zsh/.zprofile @@ -0,0 +1,10 @@ +export MAKEFLAGS="-j$(nproc)" +export XAUTHORITY=$XDG_RUNTIME_DIR/Xauthority +export HISTFILE=$XDG_STATE_HOME/bash/history +export INPUTRC=$XDG_CONFIG_HOME/readline/inputrc +export PASSWORD_STORE_DIR=$XDG_DATA_HOME/pass +export GTK_RC_FILES=$XDG_CONFIG_HOME/gtk-1.0/gtkrc +export GTK2_RC_FILES=$XDG_CONFIG_HOME/gtk-2.0/gtkrc +export RANGER_LOAD_DEFAULT_RC=FALSE + +[[ $(fgconsole 2>/dev/null) == 1 ]] && exec startx $XDG_CONFIG_HOME/X11/xinitrc -- vt1 diff --git a/.bashrc b/.config/zsh/.zshrc index da84c7f..803ea88 100644 --- a/.bashrc +++ b/.config/zsh/.zshrc @@ -1,12 +1,13 @@ -# If not running interactively, don't do anything -[[ $- != *i* ]] && return - -HISTCONTROL=ignoreboth +HISTFILE=$ZDOTDIR/history HISTSIZE=1000 -HISTFILESIZE=2000 +SAVEHIST=5000 +unsetopt beep -shopt -s histappend -shopt -s checkwinsize +zstyle ':completion:*' matcher-list 'm:{a-z}={A-Za-z}' +zstyle ':completion:*' menu select +autoload -Uz compinit +compinit -d $ZDOTDIR/zcompdump-$ZSH_VERSION +setopt COMPLETE_ALIASES PATH="$HOME/bin:$PATH" PATH="$HOME/.local/bin:$PATH" @@ -17,9 +18,6 @@ export EDITOR=vim export VISUAL=vim export PAGER=most -source '/usr/share/fzf/key-bindings.bash' -source '/usr/share/fzf/completion.bash' - alias q='exit' alias c='clear' alias h='history' @@ -58,8 +56,8 @@ alias cdf='config diff' alias cpl='config pull' alias cvim='GIT_DIR=$HOME/.cfg GIT_WORK_TREE=$HOME vim' -alias loadbash='source ~/.bashrc' -alias bashrc='vim ~/.bashrc' +alias loadzsh='source $XDG_CONFIG_HOME/zsh/.zshrc' +alias zshrc='vim $XDG_CONFIG_HOME/zsh/.zshrc' alias vimrc='vim ~/.vim/vimrc' alias nvimrc='cd $XDG_CONFIG_HOME/nvim;nvim .' alias i3config='vim $XDG_CONFIG_HOME/i3/config' @@ -85,4 +83,20 @@ alias nova='ssh -p 2080 192.168.0.156' alias luamake=/home/adam/Documents/github/lua-language-server/3rd/luamake/luamake -eval "$(starship init bash)" +function zvm_config() { + ZVM_VI_INSERT_ESCAPE_BINDKEY=kj +} + +function zvm_after_init() { + source '/usr/share/fzf/key-bindings.zsh' + source '/usr/share/fzf/completion.zsh' + bindkey '^ ' autosuggest-accept + bindkey '\e.' insert-last-word +} + +eval "$(starship init zsh)" + +source '/usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh' +source '/usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh' +source '/usr/share/zsh/plugins/zsh-vi-mode/zsh-vi-mode.zsh' +source '/usr/share/autojump/autojump.zsh' @@ -0,0 +1,8 @@ +export XDG_CONFIG_HOME=$HOME/.config +export XDG_CACHE_HOME=$HOME/.cache +export XDG_DATA_HOME=$HOME/.local/share +export XDG_STATE_HOME=$HOME/.local/state +export XDG_DATA_DIRS="/usr/local/share:/usr/share" +export XDG_CONFIG_DIRS="/etc/xdg" + +export ZDOTDIR=$XDG_CONFIG_HOME/zsh |