diff --git a/.gitignore b/.gitignore
index 3f8fe262f8..35c4552089 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,32 @@
+# General files for the project
 pkg/*
 *.pyc
 bin/*
 .project
 /.bin
 /_test/secrets/*.json
+
+# OSX leaves these everywhere on SMB shares
+._*
+
+# OSX trash
+.DS_Store
+
+# Files generated by JetBrains IDEs, e.g. IntelliJ IDEA
+.idea/
+*.iml
+
+# Vscode files
+.vscode
+
+# Emacs save files
+*~
+\#*\#
+.\#*
+
+# Vim-related files
+[._]*.s[a-w][a-z]
+[._]s[a-w][a-z]
+*.un~
+Session.vim
+.netrwhist