summaryrefslogtreecommitdiff
path: root/.zsh
diff options
context:
space:
mode:
authorUrbain Vaes <urbain@vaes.uk>2015-10-17 13:25:12 +0100
committerUrbain Vaes <urbain@vaes.uk>2015-10-17 13:25:12 +0100
commita3fb85b5fe94faa3e9f45614e457f65ab51da13d (patch)
tree4f569cb6277d3ecf5ef6053621de0bf8ce13c2fc /.zsh
parentfa84e6da047bf51da4de866a008c21d2bbbdf380 (diff)
parente25f466c2bfedd2811919b4574c5a21bb68b448d (diff)
Merge of origin and master
Diffstat (limited to '.zsh')
-rw-r--r--.zsh/aliases3
-rw-r--r--.zsh/plugins8
-rw-r--r--.zsh/zshrc1
3 files changed, 3 insertions, 9 deletions
diff --git a/.zsh/aliases b/.zsh/aliases
index 28cd4dd..d3d8b2a 100644
--- a/.zsh/aliases
+++ b/.zsh/aliases
@@ -28,9 +28,10 @@ alias mail='offlineimap -u quiet &'
alias mc='make clean'
alias mca='make clean-all'
alias n='nvim'
-alias ns="$EDITOR -S Session.vim"
alias pushs='git push --recurse-submodules=check'
alias v='vim'
+alias vims="vim -S Session.vim"
+alias vimtex='vim -S Session.vim --servername SYNC'
alias x='sh ~/.xmodmap'
alias youtube='mpsyt'
alias notes='vim ~/dotfiles/.notes/Notes'
diff --git a/.zsh/plugins b/.zsh/plugins
index bccb010..88750f9 100644
--- a/.zsh/plugins
+++ b/.zsh/plugins
@@ -27,7 +27,6 @@ if ! zgen saved; then
# My plugins
zgen load uvaes/fzf-marks
- zgen load uvaes/grm
# Other plugins
zgen load rupa/z
@@ -44,7 +43,7 @@ fi
# Autosuggestion
{
- # Environment variables for plugins
+ # Environment variables for plugin
AUTOSUGGESTION_HIGHLIGHT_COLOR='fg=6'
zle-line-init() {
@@ -54,8 +53,3 @@ fi
bindkey '^y' autosuggest-execute-suggestion
}
-
-# GRM
-{
- REPOFILE=/home/urbain/.grmrc
-}
diff --git a/.zsh/zshrc b/.zsh/zshrc
index b7a6c33..f08eee4 100644
--- a/.zsh/zshrc
+++ b/.zsh/zshrc
@@ -46,5 +46,4 @@ if [[ -n ${TMUX} && -n ${commands[tmux]} ]];then
esac
fi
-
[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh