diff --git a/.vimrc b/.vimrc
new file mode 100644
index 0000000..8494c55
--- /dev/null
+++ b/.vimrc
@@ -0,0 +1,38 @@
+set nocompatible              " be iMproved, required
+filetype off                  " required
+
+" set the runtime path to include Vundle and initialize
+set rtp+=~/.vim/bundle/Vundle.vim
+call vundle#begin()
+" alternatively, pass a path where Vundle should install plugins
+"call vundle#begin('~/some/path/here')
+
+" let Vundle manage Vundle, required
+Plugin 'VundleVim/Vundle.vim'
+
+Plugin 'vim-airline/vim-airline'
+Plugin 'kien/ctrlp.vim'
+Plugin 'davidhalter/jedi-vim'
+Plugin 'hublot/vim-gromacs'
+Plugin 'lervag/vimtex'
+
+Plugin 'godlygeek/tabular'
+Plugin 'plasticboy/vim-markdown'
+let g:vim_markdown_folding_disabled = 1
+
+" All of your Plugins must be added before the following line
+call vundle#end()            " required
+filetype plugin indent on    " required
+" To ignore plugin indent changes, instead use:
+"filetype plugin on
+"
+" Brief help
+" :PluginList       - lists configured plugins
+" :PluginInstall    - installs plugins; append `!` to update or just :PluginUpdate
+" :PluginSearch foo - searches for foo; append `!` to refresh local cache
+" :PluginClean      - confirms removal of unused plugins; append `!` to auto-approve removal
+"
+" see :h vundle for more details or wiki for FAQ
+" Put your non-Plugin stuff after this line
+"
+syntax on
diff --git a/.zshrc b/.zshrc
index 0b256e7..d2beddc 100644
--- a/.zshrc
+++ b/.zshrc
@@ -38,6 +38,10 @@ setKeyboard() {
   setxkbmap -layout $1
 }
 
+eval $(thefuck --alias)
+# You can use whatever you want as an alias, like for Mondays:
+eval $(thefuck --alias fu)
+
 # Gromacs stuff
 # ==================================================
 swapgmx() {
@@ -96,3 +100,5 @@ export CUDA_HOME=/opt/cuda;
 PYTHONPATH="$HOME/scripts"
 PYTHONPATH="$PYTHONPATH:/opt/modeller9.19/modlib:/opt/modeller9.19/lib/x86_64-intel8/python3.3"
 export PYTHONPATH
+
+alias vim='vim --servername vim'