diff --git a/README.md b/README.md
index ca4ed85..bac81f3 100644
--- a/README.md
+++ b/README.md
@@ -24,4 +24,5 @@ stow -t ~ urxvt
 stow -t ~ newsboat
 stow -t ~ sublime
 stow -t ~ bash
+stow -t ~ vim
 ~~~
diff --git a/bash/.bashrc b/bash/.bashrc
index 0a3134f..13bfcd8 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -158,6 +158,12 @@ PS1='[\u@\h \W$(__git_ps1 " (%s)")]\$ '
 #Disable CapsLock
 setxkbmap -option ctrl:nocaps
 
+#Powerline
+powerline-daemon -q
+POWERLINE_BASH_CONTINUATION=1
+POWERLINE_BASH_SELECT=1
+. /usr/lib/python3.6/site-packages/powerline/bindings/bash/powerline.sh
+
 #Disable some CTRL for VIM commands
 bind -r '\C-s'
 stty -ixon
diff --git a/vim/.vimrc b/vim/.vimrc
new file mode 100644
index 0000000..9376b48
--- /dev/null
+++ b/vim/.vimrc
@@ -0,0 +1,19 @@
+syntax on
+
+set clipboard=unnamed
+set smartindent
+set shiftwidth=2
+set tabstop=2
+set number
+set autoread
+
+let g:powerline_pycmd="py3"
+
+filetype indent on
+
+:nmap <c-s> :w<CR>
+:imap <c-s> <Esc>:w<CR>a
+nnoremap <F7> :tabp<CR>
+nnoremap <F8> :tabn<CR>
+
+au BufWinEnter * set number