diff --git a/.gitignore b/.gitignore
index 83d689255c1a6ca609436b5e938cd4cd2f7b1b43..89e2504c2075cba958a853609860f0c38e96590f 100644
--- a/.gitignore
+++ b/.gitignore
@@ -2,8 +2,19 @@
 __pycache__/
 *.py[cod]
 *$py.class
-*.swp
-*.swo
+
+# Vim stuff
+[._]*.s[a-v][a-z]
+[._]*.sw[a-p]
+[._]s[a-rt-v][a-z]
+[._]ss[a-gi-z]
+[._]sw[a-p]
+Session.vim
+Sessionx.vim
+.netrwhist
+*~
+tags
+[._]*.un~
 
 # C extensions
 *.so
@@ -98,6 +109,7 @@ src/config/start.tw
 node_modules
 package-lock.json
 package.json
+yarn.lock
 
 # typescript
 tsconfig.json
@@ -109,6 +121,13 @@ tsconfig.json
 # WebStorm
 .idea
 
+# backup
+*.bak
+*.gho
+*.ori
+*.orig
+*.tmp
+
 # misc
 fc-pregmod
 *.outline