diff --git a/.gitignore b/.gitignore
index fc68a0b..ee8d3b1 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,4 +1,13 @@
 .pio
 *~
 *credential.h
+# -*- mode: gitignore; -*-
+*~
+\#*\#
+/.emacs.desktop
+/.emacs.desktop.lock
+*.elc
+auto-save-list
+tramp
+.\#*
 
diff --git a/samd/.gitignore b/samd/.gitignore
deleted file mode 100644
index 03f4a3c..0000000
--- a/samd/.gitignore
+++ /dev/null
@@ -1 +0,0 @@
-.pio