diff --git a/.gitignore b/.gitignore
index c178dbab..25776f8d 100644
--- a/.gitignore
+++ b/.gitignore
@@ -10,3 +10,24 @@ recordings
 *.swp
 *~
 noVNC-*.tgz
+
+# IDE FILES #
+######################
+
+/.idea/dataSources
+/.idea/dictionaries
+/.idea/dataSources.local.xml
+/.idea/dataSources.xml
+/.idea/workspace.xml
+/.idea/shelf
+/.vscode
+
+# OS generated files #
+######################
+.history
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+.directory