Update submodules and add zoxide and aliases to zsh

diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index 0b13ced..c847f8e 100644 (file)
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -7,4 +7,5 @@ alias \
         yarn="yarn --use-yarnrc $XDG_CONFIG_HOME/yarn/config"
 
 alias cfg="/usr/bin/git --git-dir=$HOME/dev/dot --work-tree=$HOME"
+alias cfge="GIT_DIR=$HOME/dev/dot GIT_WORK_TREE=$HOME nvim"
 alias bat="bat --theme=Dracula"

diff --git a/.config/zsh/.zshenv b/.config/zsh/.zshenv
index e7834b4..c612c6d 100644 (file)
--- a/.config/zsh/.zshenv
+++ b/.config/zsh/.zshenv
@@ -6,9 +6,9 @@ export XDG_DATA_HOME="$HOME"/.local/share
 export XDG_CACHE_HOME="$HOME"/.cache
 
 # Default programs
-export EDITOR="vim"
-export VISUAL="vim"
-export TERMINAL="st"
+export EDITOR="nvim"
+export VISUAL="nvim"
+export TERMINAL="alacritty"
 export BROWSER="qutebrowser"
 export READER="zathura"
 

diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index f57a0ca..6a423de 100644 (file)
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -82,6 +82,7 @@ zstyle ':vcs_info:git:*' formats '%b'
 # https://github.com/softmoth/zsh-vim-mode
 # . $ZDOTDIR/plugins/zsh-vim-mode.plugin.zsh
 
+eval "$(zoxide init zsh)"
 
 # GnuPG related
 GPG_TTY=$(tty)

diff --git a/zsh/.zshenv b/zsh/.zshenv
new file mode 100644 (file)
index 0000000..c612c6d
--- /dev/null
+++ b/zsh/.zshenv
@@ -0,0 +1,69 @@
+#!/bin/zsh
+
+# Here we set env variables
+export XDG_CONFIG_HOME="$HOME"/.config
+export XDG_DATA_HOME="$HOME"/.local/share
+export XDG_CACHE_HOME="$HOME"/.cache
+
+# Default programs
+export EDITOR="nvim"
+export VISUAL="nvim"
+export TERMINAL="alacritty"
+export BROWSER="qutebrowser"
+export READER="zathura"
+
+# Zsh related
+ZDOTDIR="$XDG_CONFIG_HOME"/zsh
+HISTFILE="$XDG_CACHE_HOME"/zshhistory
+HISTSIZE=10000
+SAVEHIST=10000
+
+# Go related
+export GOPATH="$XDG_DATA_HOME"/go
+
+# NPM
+export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/npm/npmrc"
+
+# Node related
+export NODE_REPL_HISTORY="XDG_DATA_HOME"/node_repl_history
+
+# Rust related
+export CARGO_HOME="$XDG_DATA_HOME"/cargo
+export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
+
+# PostgreSQL
+export PSQLRC="$XDG_CONFIG_HOME"/pg/psqlrc
+export PSQL_HISTORY="$XDG_CACHE_HOME"/pg/psql_history
+export PGPASSFILE="$XDG_CONFIG_HOME"/pg/pgpass
+export PGSERVICEFILE="XDG_CONFIG_HOME"/pg/pg_service.conf
+
+# Other programs
+export DOCKER_CONFIG="$XDG_CONFIG_HOME"/docker
+export LESSHISTFILE=-
+export WGETRC="$XDG_CONFIG_HOME"/wgetrc
+export MBSYNCRC="${XDG_CONFIG_HOME:-$HOME/.config}/mbsync/config"
+export PASSWORD_STORE_DIR="$XDG_DATA_HOME"/pass
+export ELECTRUMDIR="${XDG_DATA_HOME:-$HOME/.local/share}/electrum"
+export SUDO_ASKPASS="$HOME/.local/bin/dmenupass"
+export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0"
+export ANDROID_SDK_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/android"
+export WINEPREFIX="${XDG_DATA_HOME:-$HOME/.local/share}/wineprefixes/default"
+export KODI_DATA="${XDG_DATA_HOME:-$HOME/.local/share}/kodi"
+export NUGET_PACKAGES="${XDG_CACHE_HOME:-$HOME/.cache}/NuGetPackages"
+export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch/notmuchrc"
+export NMBGIT="${XDG_DATA_HOME:-$HOME/.local/share}/notmuch/nmbug"
+export PYLINTHOME="${XDG_CACHE_HOME:-$HOME/.cache}/pylint"
+export XAUTHORITY="${XDG_RUNTIME_DIR:-/run/user/$USER}/Xauthority"
+
+# export GNUPGHOME="${XDG_DATA_HOME:-$HOME/.local/share}/gnupg"
+
+export MANPAGER="sh -c 'col -bx | bat -l man -p'"
+
+# # PATH
+typeset -U PATH path
+PATH="$PATH:$HOME/.local/bin"
+PATH="$PATH:$CARGO_HOME/bin"
+PATH="$PATH:$XDG_DATA_HOME/npm/bin"
+PATH="$PATH:$(du "$HOME/.local/bin" | cut -f2 | paste -sd ':' -)"
+
+export PATH