diff --git a/.arcconfig b/.arcconfig
index 76e4bdb..97b14f4 100644
--- a/.arcconfig
+++ b/.arcconfig
@@ -1,3 +1,3 @@
 {
-    "phabricator.uri": "https://issuetracker.revi.xyz"
+  "phabricator.uri": "https://issuetracker.revi.xyz"
 }
diff --git a/.arclint b/.arclint
index 3c6546a..a810ced 100644
--- a/.arclint
+++ b/.arclint
@@ -7,16 +7,13 @@
     "chmod": {
       "type": "chmod"
     },
-    "filename": {
-      "type": "filename"
-    },
     "json": {
       "type": "json",
       "include": [
         "(^\\.arcconfig$)",
         "(^\\.arclint$)",
         "(^\\.arcunit$)",
-        "(^\\.json$)"
+        "(\\.json$)"
       ]
     },
     "merge-conflict": {
@@ -30,7 +27,13 @@
     },
     "text": {
       "type": "text",
-      "text.max-line-length": 80
+      "text.max-line-length": 80,
+      "severity": {
+        "1": "advice",
+        "2": "advice",
+        "3": "advice",
+        "5": "disabled"
+      }
     }
   }
 }
diff --git a/.editorconfig b/.editorconfig
index a523ae1..6c712a4 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -1,40 +1,13 @@
 # EditorConfig is awesome: https://EditorConfig.org
+# Copyright (C) 2024 Hong Yongmin <https://revi.xyz>
+# SPDX-License-Identifier: Apache-2.0
 
 root = true
 
 [*]
-end_of_line = lf
 charset = utf-8
-indent_size = tab
-indent_style = tab
+end_of_line = lf
+indent_size = 2
+indent_style = space
 insert_final_newline = true
-tab_width = 4
 trim_trailing_whitespace = true
-
-[*.md]
-indent_size = 2
-indent_style = space
-
-# Tabs may not be valid YAML
-# @see https://yaml.org/spec/1.2/spec.html#id2777534
-[*.{sh,yml,yaml}]
-indent_size = 2
-indent_style = space
-
-# yaml-lint configuration
-# YAML files should be indented with spaces, which .yamllint is
-[.yamllint]
-indent_size = 2
-indent_style = space
-
-[default.git*]
-indent_size = 2
-indent_style = space
-
-[.{arc,git}*]
-indent_size = 2
-indent_style = space
-
-[.git/**]
-indent_size = 2
-indent_style = space
diff --git a/.gitaliases b/.gitaliases
index 25a6b73..fc75864 100644
--- a/.gitaliases
+++ b/.gitaliases
@@ -1,38 +1,38 @@
-# Copyright (C) 2017 Hong Yongmin <https://revi.xyz> 
+# Copyright (C) 2017 Hong Yongmin <https://revi.xyz>
 # SPDX-License-Identifier: Apache-2.0
 [alias]
-  co = checkout
-  cm = commit -s
-  st = status
-  br = branch -v
-  fa = fetch --all
-  graph = log --pretty=format:\"%h %s\" --graph
-  fo = fetch origin
 # some project uses `master` and some uses `main` for the default.
 # since their first two letters are both ma, use the last char.
-  usync = !echo 'ERROR: use usyncr for master, and usyncn for main.'
-  usyncr = rebase upstream/master
-  usyncn = rebase upstream/main
-  osync = !echo 'ERROR: use osyncr for master, and osyncm for main.'
-  osyncr = rebase origin/master
-  osyncm = rebase origin/main
-  aal = add *
-  po= !echo 'ERROR: use por for master, and pon for main.'
-  por = push origin master
-  pon = push origin main
-  amend = commit --amend
-  amends = commit --amend -s
-  cmt = commit -S -s
-  amendss = commit --amend -S -s
-  acmt = commit -a -S -s
   acm = commit -a -s
-  fup = fetch upstream
-  com = !echo 'ERROR: use cor for master, and con for main.'
-  comr = checkout master
-  comn = checkout main
-  pog = push origin
+  aal = add *
+  amend = commit --amend
+  amendss = commit --amend -S -s
+  amends = commit --amend -s
+  br = branch -v
+  brd = branch -d
+  brD = branch -D
   cob = checkout -b
+  co = checkout
+  com = !echo 'ERROR: use cor for master, and con for main.'
+  comn = checkout main
+  comr = checkout master
+  cm = commit -s
+  cmt = commit -S -s
   count = count-objects -vH
+  fa = fetch --all
+  fup = fetch upstream
+  fo = fetch origin
+  graph = log --pretty=format:\"%h %s\" --graph
+  osync = !echo 'ERROR: use osyncr for master, and osyncm for main.'
+  osyncn = rebase origin/main
+  osyncr = rebase origin/master
+  po= !echo 'ERROR: use por for master, and pon for main.'
+  pon = push origin main
+  por = push origin master
+  st = status
+  usync = !echo 'ERROR: use usyncr for master, and usyncn for main.'
+  usyncn = rebase upstream/main
+  usyncr = rebase upstream/master
 # below are non-git command, signified via `!` in the comment
 # https://issuetracker.revi.xyz/u/gitalias
   arcd = !arc diff
diff --git a/.gitmodules b/.gitmodules
deleted file mode 100644
index e69de29..0000000
diff --git a/default.gitconfig b/default.gitconfig
index 0b3eb63..9286c62 100644
--- a/default.gitconfig
+++ b/default.gitconfig
@@ -1,16 +1,14 @@
-# Copyright (C) 2016 Hong Yongmin <https://revi.xyz> 
+# Copyright (C) 2016 Hong Yongmin <https://revi.xyz>
 # SPDX-License-Identifier: Apache-2.0
 [user]
   name = Yongmin Hong
   email = revi@omglol.email
   signingkey = EA100E94
-[gitreview]
-  username = revi
+[commit]
+  gpgSign = true
 [core]
   editor = nano
   quotepath = false
-[include]
-  path = ~/.gitaliases
 [credential]
   helper = 'store'
 [diff]
@@ -22,6 +20,16 @@
   smudge = git-lfs smudge -- %f
   process = git-lfs filter-process
   required = true
+[gitreview]
+  username = revi
+[include]
+  path = ~/.gitaliases
+[init]
+  defaultBranch = master
+[pretty]
+  show = fuller
+[rerere]
+  enabled = true
 [sendemail]
   from = 'Yongmin Hong <revi@omglol.email>'
   smtpserver = smtp.fastmail.com
@@ -29,9 +37,5 @@
   smtpencryption = ssl
   smtpserverport = 465
   smtpAuth = 'PLAIN'
-[init]
-  defaultBranch = master
 [tag]
   forceSignAnnotated = true
-[rerere]
-  enabled = true