From 2e9e6dc76fa537c010e740e0e4d2287b8f9832a8 Mon Sep 17 00:00:00 2001
From: VectorKappa <piotrpatalong@gmail.com>
Date: Mon, 22 Apr 2024 15:27:31 +0200
Subject: [PATCH] Minor editorconfig changes + new gpg key

---
 common/.editorconfig | 23 +++++++++++++++++++++++
 common/.gitconfig    |  8 ++++----
 2 files changed, 27 insertions(+), 4 deletions(-)

diff --git a/common/.editorconfig b/common/.editorconfig
index bec7553..5b21d50 100644
--- a/common/.editorconfig
+++ b/common/.editorconfig
@@ -6,3 +6,26 @@ indent_style = tab
 end_of_line = lf
 insert_final_newline = true
 trim_trailing_whitespace = true
+
+# Matches multiple files with brace expansion notation
+# Set default charset
+[*.{js,py}]
+charset = utf-8
+
+[*.{c,h}pp]
+indent_style = space
+indent_size = 2
+
+# 4 space indentation
+[*.py]
+indent_style = space
+indent_size = 4
+
+# Tab indentation (no size specified)
+[Makefile]
+indent_style = tab
+
+# Matches the exact files either package.json or .travis.yml
+[{package.json,.travis.yml}]
+indent_style = space
+indent_size = 2
diff --git a/common/.gitconfig b/common/.gitconfig
index 2c66b7e..837a547 100644
--- a/common/.gitconfig
+++ b/common/.gitconfig
@@ -155,7 +155,7 @@
 
     #OTHER
     #Finds a filename in the git repository. Gives absolute location (from the git root).
-    find = !sh -c 'git ls-tree -r --name-only HEAD | grep --color $1' - 
+    find = !sh -c 'git ls-tree -r --name-only HEAD | grep --color $1' -
 
     #Deletes all branches that were safely merged into the master. All other are skipped (no worries).
     #on osx xargs does not have -r argument, so it fail. If you remove -r, it will run at least once, making this not safe operation
@@ -225,7 +225,7 @@
     sprzatajwszystkokurwa = !sh -c 'git clean -x' && git reset --hard
     wyjebzrobionekurwa = !sh -c 'git branch --merged' | grep -v "\\*" | grep -v master | grep -v dev | xargs -n 1 git branch -d
     majonez = !sh -c 'branch="$(git rev-parse --abbrev-ref HEAD)" && git checkout master && git pull && git branch -d "$branch"'
-    
+
     dodajkurwa = add
     takkurwa = commit
     sciagajkurwa = pull
@@ -236,7 +236,7 @@
     pchajkurwayolo = push --force
     sorrykurwa = commit --amend -m
     spierdolwszystko = merge
-    
+
     cofnijwchuj = reset HEAD~100
     wypierdolwchuj = reset HEAD~100 --hard
     acomitamkurwa = push origin --force
@@ -250,7 +250,7 @@
 [user]
 	name = VectorKappa
 	email = piotrpatalong@gmail.com
-	signingkey = 0917E6568B3A9A02
+	signingkey = 32DCE8467E7FBD4F
 [mergetool]
 	keepBackup = true
 [init]