Merge forge.o9.re:olivier/dotfiles

.zshrc

@@ -68,7 +68,11 @@ ZSH_THEME="powerlevel10k/powerlevel10k"
 # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/
 # Example format: plugins=(rails git textmate ruby lighthouse)
 # Add wisely, as too many plugins slow down shell startup.
+<<<<<<< HEAD
 plugins=(git httpie ng npm nvm pass pip pyenv sudo virtualenvwrapper wd)
+=======
+plugins=(git httpie ng npm nvm pass pip pyenv sudo wd)
+>>>>>>> 3be7111b37ae91585798c3e046fc8cf9f9cceb0e
 
 source $ZSH/oh-my-zsh.sh
 
@@ -83,8 +87,8 @@ export BROWSER=elinks
 export SSH_ASKPASS=qt4-ssh-askpass
 export AUTEUR="Olivier DOSSMANN"
 export DEFAULT_USER="od"
-export WORKON_HOME=~/.virtualenvs
-source /usr/bin/virtualenvwrapper.sh
+export PYTHONWARNINGS="ignore::DeprecationWarning"
+export FLASK_SKIP_DOTENV=1
 
 # You may need to manually set your language environment
 export LANG=fr_FR.UTF-8
@@ -111,6 +115,8 @@ setopt transient_rprompt
 # alias zshconfig="mate ~/.zshrc"
 # alias ohmyzsh="mate ~/.oh-my-zsh"
 alias e="${EDITOR}"
+alias r="${EDITOR} -R"
+alias sm="sublime_merge"
 alias vi="${EDITOR}"
 alias mem='free -mt'
 alias df='df -hT'
@@ -159,12 +165,16 @@ if [ ! $SSH_AGENT_PID ]; then
   fi;
 fi;
 
-# Launch nvm possibilities (for javascript environment)
+# Desktop specificities for development
 case $HOST in
   lueur | baloo | sam)
     :
     ;;
   *)
+    # nvm (for JS environment)
     source /usr/share/nvm/init-nvm.sh
+    # Virtualenv (for Python development)
+    export WORKON_HOME=~/.virtualenvs
+    source /usr/bin/virtualenvwrapper.sh
     ;;
 esac