diff --git a/.gitignore b/.gitignore
index ca52de5..c72dddc 100644
--- a/.gitignore
+++ b/.gitignore
@@ -13,8 +13,23 @@
 !LICENSE.md
 !CHANGELOG.md
 
+# And it's plugin
+!user/
+user/*
+!user/plugins/
+user/plugins/*
+!user/plugins/infinity-squared-settings/
+
 # But specifically ignore these things
 public/config.php
-public/.DS_Store
 public/custom.css
 public/phpqrcode/cache/*
+
+# Various OS generated files
+.DS_Store
+.DS_Store?
+._*
+.Spotlight-V100
+.Trashes
+ehthumbs.db
+Thumbs.db