From b82de0988eb056ca2bbe33474279a5822e651493 Mon Sep 17 00:00:00 2001
From: Henrik Bakken <bakken.henrik@gmail.com>
Date: Wed, 7 Oct 2026 22:50:18 +0200
Subject: [PATCH] gitconfig fixes - secure credentials

---
 CONFIG/sway/config |  3 +++
 HOME/.gitconfig    | 40 +++++++++++++++-------------------------
 endos.py           |  2 ++
 3 files changed, 20 insertions(+), 25 deletions(-)

diff --git a/CONFIG/sway/config b/CONFIG/sway/config
index 26f9cee..d87d5b3 100644
--- a/CONFIG/sway/config
+++ b/CONFIG/sway/config
@@ -285,6 +285,9 @@ bindsym $mod+m mode "$mode_monitor"
 # Auth with polkit-gnome
 exec /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1
 
+# Keyring
+exec gnome-keyring-daemon --start --components=secrets
+
 # Import environment variables for user systemd service manager
 exec systemctl --user import-environment DISPLAY WAYLAND_DISPLAY SWAYSOCK XDG_CURRENT_DESKTOP
 
diff --git a/HOME/.gitconfig b/HOME/.gitconfig
index bec2e9a..cb67545 100644
--- a/HOME/.gitconfig
+++ b/HOME/.gitconfig
@@ -1,7 +1,7 @@
 [core]
     filemode = false
-    pager = delta --diff-so-fancy
-    autorcrlf = true
+    pager = delta
+    autocrlf = input
     editor = nvim
 [user]
     name = Henrik Bakken
@@ -13,8 +13,10 @@
     required = true
 [interactive]
     diffFilter = delta --color-only
-; [merge]
-;     conflictstyle = diff3
+
+[merge]
+    conflictstyle = zdiff3
+
 [delta]
     navigate = true
     light = false
@@ -29,16 +31,14 @@
     plus-non-emph-style  = bold green
     plus-emph-style  = bold reverse green
 [delta "interactive"]
-    keep-plus-minus-markers = false[delta "decorations"]
+    keep-plus-minus-markers = false
+[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
 [init]
     defaultBranch = main
-
-# better defaults
-# https://blog.gitbutler.com/how-git-core-devs-configure-git/
 [column]
     ui = auto
 [branch]
@@ -57,6 +57,8 @@
     prune = true
     pruneTags = true
     all = true
+[pull]
+    rebase = true
 [help]
     autocorrect = prompt
 [rebase]
@@ -64,24 +66,12 @@
     autoStash = true
     updateRefs = true
 
-# Improved colors for the highlighted bits
-# https://github.com/so-fancy/diff-so-fancy
+[rerere]
+    enabled = true
+    autoupdate = true
 [color]
     ui = true
-    [color "diff-highlight"]
-    oldNormal = red bold
-    oldHighlight = red bold 52
-    newNormal = green bold
-    newHighlight = green bold 22
-[color "diff"]
-    meta = 11
-    frag = magenta bold
-    func = 146 bold
-    commit = yellow bold
-    old = red bold
-    new = green bold
-    whitespace = red reverse
 [safe]
-	directory = /tmp
+    directory = /tmp
 [credential]
-	helper = store
+    helper = /usr/lib/git-core/git-credential-libsecret
diff --git a/endos.py b/endos.py
index 57d4521..9a0dfaa 100755
--- a/endos.py
+++ b/endos.py
@@ -67,6 +67,8 @@ installmap = dict(
         "git-lfs",
         "lazygit",
         "bat",
+        "gnome-keyring",  # for git credentials
+        "seahorse",  # keyring ui
     ),
     readers=(
         "sioyek",