diff --git a/.gitignore b/.gitignore
index eb1535e41..46e91b3dd 100644
--- a/.gitignore
+++ b/.gitignore
@@ -39,3 +39,12 @@ buck-out/
 \.buckd/
 android/app/libs
 android/keystores/debug.keystore
+
+# Vim
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist
+*~
+tags