From 50468835311da76aa80fdeae0a7d01c944af3ff7 Mon Sep 17 00:00:00 2001
From: Ryan <fauxpark@gmail.com>
Date: Fri, 2 Jul 2021 16:08:34 +1000
Subject: [PATCH] Cleanup gitignore (#13390)

---
 .gitignore                                    | 93 ++++++++++---------
 .../keymaps/ishtob/{rule.mk => rules.mk}      |  0
 .../that_canadian/{Makefile => rules.mk}      |  0
 .../keymaps/tusing/{Makefile => rules.mk}     |  0
 4 files changed, 50 insertions(+), 43 deletions(-)
 rename keyboards/planck/keymaps/ishtob/{rule.mk => rules.mk} (100%)
 mode change 100755 => 100644
 rename keyboards/preonic/keymaps/that_canadian/{Makefile => rules.mk} (100%)
 rename keyboards/wilba_tech/zeal60/keymaps/tusing/{Makefile => rules.mk} (100%)

diff --git a/.gitignore b/.gitignore
index adc5d9da6a7..b30b87ba11a 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,36 +1,33 @@
-.history/
-.dep
-*.o
-*.bin
-*.eep
+# Junk files
+*.bak
+*.swp
+*~
+.DS_Store
+
+# Build artifacts
+.clang_complete
+.build/
 *.elf
-*.hex
-*.uf2
-*.qmk
-!util/bootloader.hex
-!quantum/tools/eeprom_reset.hex
 *.log
 *.lss
 *.lst
 *.map
+*.o
+*.stackdump
 *.sym
-*.swp
-tags
-*~
+
+# QMK-specific
 api_data/v1
-build/
-.build/
-*.bak
-.vagrant/
-quantum/version.h
-.idea/
-CMakeLists.txt
-cmake-build-debug
-.clang_complete
 doxygen/
-.DS_Store
-/util/wsl_downloaded
-/util/win_downloaded
+quantum/version.h
+!quantum/tools/eeprom_reset.hex
+*.bin
+*.eep
+*.hex
+*.qmk
+*.uf2
+
+# Old-style QMK Makefiles
 /keyboards/*/Makefile
 /keyboards/*/*/Makefile
 /keyboards/*/*/*/Makefile
@@ -43,39 +40,49 @@ doxygen/
 /keyboards/*/*/*/*/*/keymaps/Makefile
 
 # Eclipse/PyCharm/Other IDE Settings
-.cproject
-.project
-.settings/
-.idea
 *.iml
 .browse.VC.db*
-*.stackdump
+.cproject
+.idea
+.idea/
+.project
+.settings/
+.vagrant/
+
+# ?
+.dep
+.history/
+build/
+cmake-build-debug
+CMakeLists.txt
+
 # Let these ones be user specific, since we have so many different configurations
 *.code-workspace
-.vscode/c_cpp_properties.json
-.vscode/launch.json
-.vscode/tasks.json
-.vscode/last.sql
-.vscode/temp.sql
-.vscode/ipch/
 .stfolder
 .tags
+.vscode/c_cpp_properties.json
+.vscode/ipch/
+.vscode/last.sql
+.vscode/launch.json
+.vscode/tasks.json
+.vscode/temp.sql
+tags
 
-# ignore image files
-*.png
+# Ignore image files
 *.gif
 *.jpg
+*.png
 
-# things travis sees
-secrets.tar
-id_rsa_*
+# Things Travis sees
 /.vs
+id_rsa_*
+secrets.tar
 
-# python things
+# Python things
 __pycache__
 .python-version
 
-# prerequisites for updating ChibiOS
+# Prerequisites for updating ChibiOS
 /util/fmpp*
 
 # Allow to exist but don't include it in the repo
diff --git a/keyboards/planck/keymaps/ishtob/rule.mk b/keyboards/planck/keymaps/ishtob/rules.mk
old mode 100755
new mode 100644
similarity index 100%
rename from keyboards/planck/keymaps/ishtob/rule.mk
rename to keyboards/planck/keymaps/ishtob/rules.mk
diff --git a/keyboards/preonic/keymaps/that_canadian/Makefile b/keyboards/preonic/keymaps/that_canadian/rules.mk
similarity index 100%
rename from keyboards/preonic/keymaps/that_canadian/Makefile
rename to keyboards/preonic/keymaps/that_canadian/rules.mk
diff --git a/keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile b/keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk
similarity index 100%
rename from keyboards/wilba_tech/zeal60/keymaps/tusing/Makefile
rename to keyboards/wilba_tech/zeal60/keymaps/tusing/rules.mk