From 8510af21d01fbe2d56751dd96b61276c7ab53977 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Lo=C3=AFc=20Gremaud?= <loic.gremaud@arcanite.ch>
Date: Thu, 6 Aug 2020 18:09:35 +0200
Subject: [PATCH] Update tmux conf, django alias for runserver, custom commands

---
 tmux.conf      | 8 ++++----
 vimrc          | 2 ++
 zsh/alias.sh   | 7 ++++---
 zsh/generic.sh | 3 ++-
 4 files changed, 12 insertions(+), 8 deletions(-)

diff --git a/tmux.conf b/tmux.conf
index 18cc330..44a5a69 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -4,10 +4,10 @@ set-option -g prefix C-a
 bind-key C-a send-prefix
 
 # split panes
-bind | split-window -h
-bind - split-window -v
-bind s split-window -h -p 20
-bind v split-window -v -p 20
+bind | split-window -h -c "#{pane_current_path}"
+bind - split-window -v -c "#{pane_current_path}"
+bind s split-window -h -p 20 -c "#{pane_current_path}"
+bind v split-window -v -p 20 -c "#{pane_current_path}"
 
 # switch panes
 bind -n M-w select-pane -U
diff --git a/vimrc b/vimrc
index 51aa716..2c19ed6 100644
--- a/vimrc
+++ b/vimrc
@@ -288,6 +288,8 @@ Plug 'https://github.com/ap/vim-css-color'
 
 Plug 'https://github.com/vifm/vifm.vim'
 
+Plug 'https://github.com/gregsexton/gitv', {'on': ['Gitv']}
+
 call plug#end()
 
 set clipboard=unnamedplus
diff --git a/zsh/alias.sh b/zsh/alias.sh
index b2f32f6..a83ba0c 100644
--- a/zsh/alias.sh
+++ b/zsh/alias.sh
@@ -5,18 +5,19 @@ alias lla='ls -al'
 alias mux='tmuxinator'
 
 alias pm='python manage.py'
+alias pmt='clear && pm test'
 alias sp='python manage.py shell_plus'
 alias mkmg='python manage.py makemigrations'
 alias mg='python manage.py migrate'
 alias gp='git push'
-alias rs='python manage.py runserver'
-alias rs2='python manage.py runserver 127.0.0.2'
 alias ga!='git commit --amend --no-edit --date now'
 
+rs() {python manage.py runserver 127.0.0."$1":"$2"}
+
 cheat() { curl cheat.sh/"$1" }
 cda() { conda activate "$@" }
 cdd() { conda deactivate "$@" }
-cdc() { conda create --name "$@" python=3.5 pip }
+cdc() { conda create --name "$@" python=3.6 pip }
 cdi() { conda info --envs "$@" }
 ca() { pygmentize -g "$@" }
 grepf() { grep -rnw ./ -e "$@"}
diff --git a/zsh/generic.sh b/zsh/generic.sh
index dacf0f3..29f7e67 100644
--- a/zsh/generic.sh
+++ b/zsh/generic.sh
@@ -18,8 +18,9 @@ fi
 unset __conda_setup
 #<<< conda initialize <<<
 
-export PATH=$HOME/Documents/Arcanite/git_ci_runner:$PATH
+export PATH=$HOME/custom_commands:$PATH
 export NB_MINIONS=4
+export VAGRANT_TYPE='abacus-abahost'
 export VISUAL=nvim
 export EDITOR=nvim