summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAdam <adam.moloney.stuck@gmail.com>2021-12-04 15:43:19 +0100
committeradamstuck <adam.moloney.stuck@gmail.com>2021-12-04 18:08:48 +0100
commit47fe2ede669c5a52f0b42273146f41ebed59a9c8 (patch)
treea60e09f4b1e9d4f7166fd4635e75886503b63a44
parent8b7a0c465be22a9d5dc7fbcb7391c3f4c6295b80 (diff)
Switched from bash to zsh
-rw-r--r--.bash_profile22
-rw-r--r--.config/zsh/.zprofile10
-rw-r--r--.config/zsh/.zshrc (renamed from .bashrc)40
-rw-r--r--.zshenv8
4 files changed, 45 insertions, 35 deletions
diff --git a/.bash_profile b/.bash_profile
deleted file mode 100644
index 808aa38..0000000
--- a/.bash_profile
+++ /dev/null
@@ -1,22 +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 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 f9bb5ea..38c190f 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'
@@ -84,4 +82,20 @@ alias pc='ssh -p 2080 192.168.0.151'
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'
diff --git a/.zshenv b/.zshenv
new file mode 100644
index 0000000..65be1ac
--- /dev/null
+++ b/.zshenv
@@ -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