summaryrefslogtreecommitdiff
path: root/zshrc
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-08-08 17:42:24 +0200
committerUrbain Vaes <urbain@vaes.uk>2015-08-08 17:42:24 +0200
commitb8a9b07b741cddbf6e0476e70c94aa186d62b6ae (patch)
treeb3b0ca783d8591cf284aa4d5c53ec71dbcb425a9 /zshrc
parent62dfde5e0c106e1466cf8353fbc766efb0e9ecc1 (diff)
Separate zsh aliases and plugins
Diffstat (limited to 'zshrc')
-rw-r--r--zshrc188
1 files changed, 33 insertions, 155 deletions
diff --git a/zshrc b/zshrc
index 0cfa521..dae16bf 100644
--- a/zshrc
+++ b/zshrc
@@ -1,140 +1,26 @@
-# Load zgen
-source "/home/urbain/.zgen/zgen.zsh"
+ZSH_PLUGINS="$HOME/.zsh/zsh-plugins"
+ZSH_ALIASES="$HOME/.zsh/zsh-aliases"
+ZSH_TMP="$HOME/.zsh/zsh-tmp"
-if ! zgen saved; then
+# Source configurations
+source $ZSH_PLUGINS
+source $ZSH_ALIASES
+source $ZSH_TMP
- echo "Creating a zgen save"
-
- # Load oh-my-zsh framework
- zgen oh-my-zsh
-
- # Oh-my-zsh plugins
- zgen oh-my-zsh plugins/git
- zgen oh-my-zsh plugins/vi-mode
- zgen oh-my-zsh plugins/ubuntu
- zgen oh-my-zsh plugins/tmux
- zgen oh-my-zsh plugins/themes
-
- # zsh-users plugins
- zgen load zsh-users/zsh-completions src
- zgen load zsh-users/zsh-syntax-highlighting
-
- # Appearance
- zgen oh-my-zsh themes/eastwood
-
- # My plugins
- zgen load uvaes/fzf-marks
- zgen load uvaes/grm
-
- # Other plugins
- zgen load rupa/z
- zgen load djui/alias-tips
- zgen load tarruda/zsh-autosuggestions
- zgen load Tarrasch/zsh-autoenv
- zgen load joel-porquet/zsh-dircolors-solarized
-
- # Save all to init script
- zgen save
-fi
-
-# Custom key bindings for widgets
+# Custom key bindings for built-in widgets
bindkey -a 'k' history-beginning-search-backward
bindkey -a 'j' history-beginning-search-forward
bindkey '^P' history-beginning-search-backward
bindkey '^N' history-beginning-search-forward
-bindkey '^y' autosuggest-execute-suggestion
-# Environment variables for plugins
-AUTOSUGGESTION_HIGHLIGHT_COLOR='fg=6'
-REPOFILE=/home/urbain/dotfiles/repos.zsh
-
-# Autosuggestion
-zle-line-init() {
- zle autosuggest-start
-}
-zle -N zle-line-init
-
-# Repofile
-
-# User configuration
-export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
-export PATH="$PATH:/home/urbain/.local/bin"
+# Paths of executables
+export PATH="/usr/local/sbin:/usr/local/bin:/usr/sbin:\
+ /usr/bin:/sbin:/bin:/usr/games:/usr/local/games:\
+ /home/urbain/bin"
# Editor
export EDITOR=/usr/bin/nvim
-# Apps for filetypes
-alias -s vim=$EDITOR
-alias -s cpp=$EDITOR
-alias -s c=$EDITOR
-alias -s tex=$EDITOR
-alias -s pdf=zathura
-
-# Directories
-alias books='cd ~/Dropbox/phd/books'
-alias cdd='cd ~/dotfiles'
-alias papers='cd ~/Dropbox/phd/papers'
-alias report='cd ~/Dropbox/phd/reports/9\ months'
-alias u='cd ~/Dropbox/phd'
-alias uc='cd ~/Dropbox/phd/programs'
-alias ul='cd ~/Dropbox/phd/literature'
-alias up='cd ~/Dropbox/phd/presentations'
-alias ur='cd ~/Dropbox/phd/reports'
-
-# Commands
-alias a='vifm'
-alias c='clear'
-alias ca='printf "\ec"'
-alias commit='git commit -a -m'
-alias g='git'
-alias install='sudo apt-get install'
-alias m='mutt'
-alias mail='offlineimap -u quiet &'
-alias mc='make clean'
-alias mca='make clean-all'
-alias n='nvim'
-alias ns="$EDITOR -S Session.vim"
-alias pull='git pull origin master'
-alias push='git push origin master'
-alias pushs='git push --recurse-submodules=check'
-alias update='sudo apt-get update'
-alias upgrade='sudo apt-get upgrade'
-alias v='vim'
-alias x='sh ~/.xmodmap'
-alias youtube=mpsyt
-
-# Configuration
-alias em="$EDITOR ~/.mutt/muttrc"
-alias en="$EDITOR ~/.nvimrc"
-alias eo="$EDITOR ~/.offlineimaprc"
-alias et="$EDITOR ~/.tmux.conf"
-alias ev="$EDITOR ~/.vimrc"
-alias evi="$EDITOR ~/.vifm/vifmrc"
-alias ex="$EDITOR ~/.xmodmap"
-alias ez="$EDITOR ~/.zshrc"
-alias eza="$EDITOR ~/.zathurarc"
-
-# Tmux
-alias son="tmux set -g status on"
-alias soff="tmux set -g status off"
-
-
-# Crontab jobs
-crontab ~/.crontab
-
-
-fancy-ctrl-z () {
- if [[ $#BUFFER -eq 0 ]]; then
- BUFFER="fg"
- zle accept-line
- else
- zle push-input
- zle clear-screen
- fi
-}
-zle -N fancy-ctrl-z
-bindkey '^Z' fancy-ctrl-z
-
fshow() {
git log --graph --color=always \
--format="%C(auto)%h%d %s %C(black)%C(bold)%cr" "$@" |
@@ -144,8 +30,22 @@ fshow() {
xargs -I % sh -c "git show --color=always % | less -R"'
}
+function colo {
+
+# Change colors for current session
+$HOME/.bin/recolor.sh < ~/.Xresources/Xresources.$1
+
+# Load Xresources file for future sessions
+xrdb ~/.Xresources/Xresources.$1
+# Change environment variable
+export COLORSCHEME=light
+# Change default environment variable for future sessions
+sed -i --follow-symlinks "s/^export COLORSCHEME=.*$/export COLORSCHEME=$1/g" ~/dotfiles/zshrc
+}
+
+# Fix tmux colors
if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then
case $(tmux showenv TERM 2>/dev/null) in
*256color) ;&
@@ -156,27 +56,15 @@ if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then
esac
fi
+# Export GPG-agent related
+if [[ -f "${HOME}/.gpg-agent-info" ]]; then
+ source /home/urbain/.gpg-agent-info
+ export GPG_AGENT_INFO
+ export SSH_AUTH_SOCK
+fi
-# Colors
-# export TERM=xterm-256color
-export COLORSCHEME=light
-
-function colo {
-
- # Change colors for current session
- $HOME/.bin/recolor.sh < ~/.Xresources/Xresources.$1
-
- # Load Xresources file for future sessions
- xrdb ~/.Xresources/Xresources.$1
-
- # Change environment variable
- export COLORSCHEME=$1
-
- # Change default environment variable for future sessions
- sed -i --follow-symlinks "s/^export COLORSCHEME=.*$/export COLORSCHEME=$1/g" ~/dotfiles/zshrc
-}
-# Fix tmux colors
+# Tmux colors fix
if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then
case $(tmux showenv TERM 2>/dev/null) in
*256color) ;&
@@ -187,14 +75,4 @@ if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then
esac
fi
-
-# Z
-unalias z 2> /dev/null
-z() {
- if [[ -z "$*" ]]; then
- cd "$(_z -l 2>&1 | fzf-tmux +s --tac | sed 's/^[0-9,.]* *//')"
- else
- _z "$@"
- fi
-}
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh