From 8cddeda98a412fb87d003c8534b37753d76e92ee Mon Sep 17 00:00:00 2001
From: exu <mrc@frm01.net>
Date: Fri, 29 Nov 2024 08:18:37 +0100
Subject: [PATCH] Move gitconfig to xdg path

---
 .../files/{.gitconfig => .config/git/config}    |  2 +-
 roles/config/files/.ssh/config                  |  1 +
 roles/config/tasks/main.yml                     | 11 ++---------
 roles/config/templates/.ssh/config.j2           | 17 -----------------
 4 files changed, 4 insertions(+), 27 deletions(-)
 rename roles/config/files/{.gitconfig => .config/git/config} (97%)
 create mode 100644 roles/config/files/.ssh/config
 delete mode 100644 roles/config/templates/.ssh/config.j2

diff --git a/roles/config/files/.gitconfig b/roles/config/files/.config/git/config
similarity index 97%
rename from roles/config/files/.gitconfig
rename to roles/config/files/.config/git/config
index 4eada1ea..9c8ae332 100755
--- a/roles/config/files/.gitconfig
+++ b/roles/config/files/.config/git/config
@@ -29,4 +29,4 @@
     latest = !sh -c 'git describe --tags $(git rev-list --tags --max-count=1) | xargs git checkout' -
 # conditonal config
 [includeIf "gitdir:**gitprojects/occ/**"]
-    path = ~/.gitconfig-occ
+    path = ~/.config/git/occ
diff --git a/roles/config/files/.ssh/config b/roles/config/files/.ssh/config
new file mode 100644
index 00000000..07ff3a5e
--- /dev/null
+++ b/roles/config/files/.ssh/config
@@ -0,0 +1 @@
+AddKeysToAgent yes
diff --git a/roles/config/tasks/main.yml b/roles/config/tasks/main.yml
index e5fab6c7..5241d80b 100644
--- a/roles/config/tasks/main.yml
+++ b/roles/config/tasks/main.yml
@@ -30,6 +30,7 @@
   loop:
     - "~/.emacs.d"
     - "~/scripts"
+    - "~/.gitconfig"
   tags: config
 
 - name: Copy new files and directories
@@ -42,21 +43,13 @@
     - ".config"
     - ".face"
     - ".fonts"
-    - ".gitconfig"
     - ".gtkrc-2.0"
     - ".local"
+    - ".ssh"
     - ".themes"
     - "scripts"
   tags: config
 
-- name: Copy new templated files
-  ansible.builtin.template:
-    src: "{{ item }}"
-    dest: "~/"
-  loop:
-    - ".ssh/config.j2"
-  tags: config
-
 - name: Copy new files and directories (root)
   ansible.posix.synchronize:
     src: "{{ item }}"
diff --git a/roles/config/templates/.ssh/config.j2 b/roles/config/templates/.ssh/config.j2
deleted file mode 100644
index af59d1d7..00000000
--- a/roles/config/templates/.ssh/config.j2
+++ /dev/null
@@ -1,17 +0,0 @@
-AddKeysToAgent yes
-
-Host gitlab.com
-	IdentityFile /home/exu/.ssh/id_ed25519_git
-
-Host github.com
-	IdentityFile /home/exu/.ssh/id_ed25519_git
-
-Host gitea.exu.li
-	IdentityFile /home/exu/.ssh/id_ed25519_git
-
-Host aur.archlinux.org
-	IdentityFile /home/exu/.ssh/id_ed25519_git
-
-Host git.open-circle.ch
-	IdentityFile /home/exu/.ssh/id_ed25519_git
-	AddressFamily inet