7 files changed, 44 insertions, 173 deletions

diff --git a/.gitconfig##h.lowe b/.config/git/config
index 75c718f..3ad8b1a 100644
--- a/.gitconfig##h.lowe
+++ b/.config/git/config
@@ -1,11 +1,10 @@
-[user]
-    name = Yigit Sever
-    email = yigit@ceng.metu.edu.tr
-    signingkey = 29515969
+[include]
+    path = ./gitconfig.local
 [core]
     autocrlf = input
     safecrlf = true
-    excludesfile = ~/.cvsignore
+    excludesfile = ~/.config/git/ignore
+    pager = delta
 [alias]
     co = checkout
     ci = commit
@@ -17,10 +16,34 @@
     hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
     sl = log --oneline --decorate -20
     sla = log --oneline --decorate --graph --all -20
-    branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
+    branches = "for-each-ref --sort=-committerdate --format='%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)' refs/remotes"
     dft = difftool
 [credential]
     helper = cache --timeout=3600
+[commit]
+    gpgsign = true
+    verbose = true
+[pull]
+    ff = only
+[push]
+    default = simple
+[merge]
+    conflictStyle = zdiff3
+[rebase]
+    autoSquash = true
+[rerere]
+    enabled = true
+[help]
+    autoCorrect = prompt
+[init]
+    defaultBranch = main
+[diff]
+    tool = difftastic
+    algorithm = histogram
+[sendemail]
+    smtpserver = /usr/bin/msmtp
+    smtpserveroption = -a
+    smtpserveroption = ceng_argor
 [color]
     ui = true
 [color "diff-highlight"]
@@ -35,18 +58,6 @@
     old = red bold
     new = green bold
     whitespace = red reverse
-[commit]
-    gpgsign = true
-[sendemail]
-    smtpserver = /usr/bin/msmtp
-    smtpserveroption = -a
-    smtpserveroption = ceng_argor
-[pull]
-    ff = only
-[init]
-    defaultBranch = main
-[diff]
-    tool = difftastic
 [difftool]
     prompt = false
 [difftool "difftastic"]
@@ -58,7 +69,7 @@
     reflog = delta
     show = delta
 [interactive]
-    diffFilter = delta --color-only
+    diffFilter = delta --color-only --features=interactive
 [delta]
     features = line-numbers decorations side-by-side
     plus-style = syntax "#003800"
diff --git a/.cvsignore b/.config/git/ignore
index 82affbf..116f8e7 100644
--- a/.cvsignore
+++ b/.config/git/ignore
@@ -1,3 +1,5 @@
+.DS_Store
+.idea
 tags
 rusty-tags.vi
 *.svg
diff --git a/.config/yadm/alt/.config/git/gitconfig.local##h.lowe b/.config/yadm/alt/.config/git/gitconfig.local##h.lowe
new file mode 100644
index 0000000..b89436c
--- /dev/null
+++ b/.config/yadm/alt/.config/git/gitconfig.local##h.lowe
@@ -0,0 +1,4 @@
+[user]
+    name = Yigit Sever
+    email = yigit@ceng.metu.edu.tr
+    signingkey = 29515969
diff --git a/.config/yadm/alt/.config/git/gitconfig.local##h.maus b/.config/yadm/alt/.config/git/gitconfig.local##h.maus
new file mode 100644
index 0000000..719ec3b
--- /dev/null
+++ b/.config/yadm/alt/.config/git/gitconfig.local##h.maus
@@ -0,0 +1,4 @@
+[user]
+    name = Yigit Sever
+    email = yigit@ceng.metu.edu.tr
+    signingkey = B87B63C533C38A88
diff --git a/.config/yadm/alt/.config/git/gitconfig.local##h.qualle b/.config/yadm/alt/.config/git/gitconfig.local##h.qualle
new file mode 100644
index 0000000..b89436c
--- /dev/null
+++ b/.config/yadm/alt/.config/git/gitconfig.local##h.qualle
@@ -0,0 +1,4 @@
+[user]
+    name = Yigit Sever
+    email = yigit@ceng.metu.edu.tr
+    signingkey = 29515969
diff --git a/.gitconfig##h.luchs b/.gitconfig##h.luchs
deleted file mode 100644
index 292431f..0000000
--- a/.gitconfig##h.luchs
+++ /dev/null
@@ -1,77 +0,0 @@
-[user]
-    name = Yigit Sever
-    email = yigit@yigitsever.com
-    signingkey = 1FCC8C71
-[core]
-    autocrlf = input
-    safecrlf = true
-    excludesfile = ~/.cvsignore
-[alias]
-    co = checkout
-    ci = commit
-    st = status
-    br = branch
-    type = cat-file -t
-    dump = cat-file -p
-    adog = log --all --decorate --oneline --graph
-    hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
-    sl = log --oneline --decorate -20
-    sla = log --oneline --decorate --graph --all -20
-    branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
-    dft = difftool
-[credential]
-    helper = cache --timeout=3600
-[color]
-    ui = true
-[color "diff-highlight"]
-    oldNormal = red bold
-    oldHighlight = red bold 52
-    newNormal = green bold
-    newHighlight = green bold 22
-[color "diff"]
-    meta = yellow
-    frag = magenta bold
-    commit = yellow bold
-    old = red bold
-    new = green bold
-    whitespace = red reverse
-[commit]
-    gpgsign = true
-[sendemail]
-    smtpserver = /usr/bin/msmtp
-    smtpserveroption = -a
-    smtpserveroption = ceng_argor
-[pull]
-    ff = only
-[init]
-    defaultBranch = main
-[diff]
-    tool = difftastic
-[difftool]
-    prompt = false
-[difftool "difftastic"]
-    cmd = difft "$LOCAL" "$REMOTE"
-[pager]
-    difftool = true
-    diff = delta
-    log = delta
-    reflog = delta
-    show = delta
-[interactive]
-    diffFilter = delta --color-only
-[delta]
-    features = line-numbers decorations side-by-side
-    plus-style = syntax "#003800"
-    minus-style = syntax "#3f0001"
-[delta "decorations"]
-    commit-decoration-style = bold yellow box ul
-    file-style = bold yellow ul
-    file-decoration-style = none
-    hunk-header-decoration-style = cyan box ul
-[delta "line-numbers"]
-    line-numbers-left-style = cyan
-    line-numbers-right-style = cyan
-    line-numbers-minus-style = 124
-    line-numbers-plus-style = 28
-[credential "https://git.overleaf.com"]
-    helper = !pass overleaf/git
diff --git a/.gitconfig##h.maus b/.gitconfig##h.maus
deleted file mode 100644
index f691e48..0000000
--- a/.gitconfig##h.maus
+++ /dev/null
@@ -1,77 +0,0 @@
-[user]
-    name = Yigit Sever
-    email = yigit@ceng.metu.edu.tr
-    signingkey = B87B63C533C38A88
-[core]
-    autocrlf = input
-    safecrlf = true
-    excludesfile = ~/.cvsignore
-[alias]
-    co = checkout
-    ci = commit
-    st = status
-    br = branch
-    type = cat-file -t
-    dump = cat-file -p
-    adog = log --all --decorate --oneline --graph
-    hist = log --pretty=format:'%h %ad | %s%d [%an]' --graph --date=short
-    sl = log --oneline --decorate -20
-    sla = log --oneline --decorate --graph --all -20
-    branches = for-each-ref --sort=-committerdate --format=\"%(color:blue)%(authordate:relative)\t%(color:red)%(authorname)\t%(color:white)%(color:bold)%(refname:short)\" refs/remotes
-    dft = difftool
-[credential]
-    helper = cache --timeout=3600
-[color]
-    ui = true
-[color "diff-highlight"]
-    oldNormal = red bold
-    oldHighlight = red bold 52
-    newNormal = green bold
-    newHighlight = green bold 22
-[color "diff"]
-    meta = yellow
-    frag = magenta bold
-    commit = yellow bold
-    old = red bold
-    new = green bold
-    whitespace = red reverse
-[commit]
-    gpgsign = true
-[sendemail]
-    smtpserver = /usr/bin/msmtp
-    smtpserveroption = -a
-    smtpserveroption = ceng_argor
-[pull]
-    ff = only
-[init]
-    defaultBranch = main
-[diff]
-    tool = difftastic
-[difftool]
-    prompt = false
-[difftool "difftastic"]
-    cmd = difft "$LOCAL" "$REMOTE"
-[pager]
-    difftool = true
-    diff = delta
-    log = delta
-    reflog = delta
-    show = delta
-[interactive]
-    diffFilter = delta --color-only
-[delta]
-    features = line-numbers decorations side-by-side
-    plus-style = syntax "#003800"
-    minus-style = syntax "#3f0001"
-[delta "decorations"]
-    commit-decoration-style = bold yellow box ul
-    file-style = bold yellow ul
-    file-decoration-style = none
-    hunk-header-decoration-style = cyan box ul
-[delta "line-numbers"]
-    line-numbers-left-style = cyan
-    line-numbers-right-style = cyan
-    line-numbers-minus-style = 124
-    line-numbers-plus-style = 28
-[credential "https://git.overleaf.com"]
-    helper = !pass overleaf/git