diff --git a/.aliases b/.aliases
index ed90fa2..bbf611e 100644
--- a/.aliases
+++ b/.aliases
@@ -34,3 +34,6 @@ alias gctls='gcloud compute tpus list'
 alias gctstart='gcloud compute tpus start'
 alias gctstop='gcloud compute tpus stop'
 alias code='code-oss'
+alias tf-docker='docker run --runtime=nvidia -it --rm -p 8888:8888 -v $PWD:/tf/local andrei/dev'
+alias conda-activate='source /opt/anaconda/bin/activate'
+alias conda-deactivete='source /opt/anaconda/bin/deactivate'
diff --git a/.vimrc b/.vimrc
index a323e59..d5b0e29 100644
--- a/.vimrc
+++ b/.vimrc
@@ -30,6 +30,8 @@ call vundle#begin()
 
 	Plugin 'dylanaraps/fff.vim'
 
+	Plugin 'mattn/emmet-vim'
+
 	" All of your Plugins must be added before the following line
 call vundle#end()            " required
 filetype plugin indent on    " required
diff --git a/.zshrc b/.zshrc
index 206fadf..c54c4a3 100644
--- a/.zshrc
+++ b/.zshrc
@@ -73,7 +73,7 @@ source $ZSH/oh-my-zsh.sh
 
 # Preferred editor for local and remote sessions
 # if [[ -n $SSH_CONNECTION ]]; then
-#   export EDITOR='vim'
+   export EDITOR='vim'
 # else
 #   export EDITOR='mvim'
 # fi