From e99783608dc247f60d1896a68cdf874c137cedb8 Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Mon, 16 Mar 2026 14:18:08 +0100 Subject: [PATCH 1/8] feat: initial commit --- git/.gitconfig | 6 ++++++ 1 file changed, 6 insertions(+) create mode 100644 git/.gitconfig diff --git a/git/.gitconfig b/git/.gitconfig new file mode 100644 index 0000000..b479337 --- /dev/null +++ b/git/.gitconfig @@ -0,0 +1,6 @@ +[user] + name = Kirill Morozov +[push] + autoSetupRemote = true +[pull] + rebase = true From 9209ba9d885cc3850bc294c6eb83967d5e445029 Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Mon, 16 Mar 2026 14:19:16 +0100 Subject: [PATCH 2/8] feat(ansible): link configs --- roles/development_machine/vars/config-links.yml | 2 ++ 1 file changed, 2 insertions(+) diff --git a/roles/development_machine/vars/config-links.yml b/roles/development_machine/vars/config-links.yml index ac4045c..dcb833b 100644 --- a/roles/development_machine/vars/config-links.yml +++ b/roles/development_machine/vars/config-links.yml @@ -2,6 +2,8 @@ development_machine_directory_mapping: - source: "{{ playbook_dir }}/alacritty" target: "{{ development_machine_xdg_config_home }}/alacritty" + - source: "{{ playbook_dir }}/git" + target: "~" - source: "{{ playbook_dir }}/neovim" target: "{{ development_machine_xdg_config_home }}/nvim" - source: "{{ playbook_dir }}/starship" From 6a41a4b8798b57479bd18ed7608a2244fd57d1aa Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Mon, 16 Mar 2026 14:23:25 +0100 Subject: [PATCH 3/8] ci: add new scope --- .github/workflows/pr.yml | 1 + 1 file changed, 1 insertion(+) diff --git a/.github/workflows/pr.yml b/.github/workflows/pr.yml index f73bbd5..8319a37 100644 --- a/.github/workflows/pr.yml +++ b/.github/workflows/pr.yml @@ -21,6 +21,7 @@ jobs: scopes: | alacritty ansible + git neovim starship task From 66b542e30b6b5ecf72673980da84446f69eb4829 Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Sat, 18 Apr 2026 11:59:50 +0200 Subject: [PATCH 4/8] feat: install git-delta --- roles/development_machine/tasks/install-macos-packages.yml | 1 + roles/development_machine/tasks/install-rpm-packages.yml | 1 + 2 files changed, 2 insertions(+) diff --git a/roles/development_machine/tasks/install-macos-packages.yml b/roles/development_machine/tasks/install-macos-packages.yml index 1cc5384..694d929 100644 --- a/roles/development_machine/tasks/install-macos-packages.yml +++ b/roles/development_machine/tasks/install-macos-packages.yml @@ -7,6 +7,7 @@ - eza - fd - fzf + - git-delta - glab - go-task - jq diff --git a/roles/development_machine/tasks/install-rpm-packages.yml b/roles/development_machine/tasks/install-rpm-packages.yml index 063ab89..82fe85e 100644 --- a/roles/development_machine/tasks/install-rpm-packages.yml +++ b/roles/development_machine/tasks/install-rpm-packages.yml @@ -63,6 +63,7 @@ - fzf - gh - git + - git-delta - glab - go-task - golang From 95f5ae3ecffc7648587c3b37101e7ca4b972a7e1 Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Sat, 18 Apr 2026 12:37:01 +0200 Subject: [PATCH 5/8] feat: configure git to use delta --- git/.gitconfig | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/git/.gitconfig b/git/.gitconfig index b479337..6d030cf 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,6 +1,14 @@ +[core] + pager = delta +[merge] + conflictStyle = zdiff3 [user] name = Kirill Morozov [push] autoSetupRemote = true [pull] rebase = true +[interactive] + diffFilter = delta --color-only +[delta] + navigate = true From 5e68ea4b6e84357978a53885460857c63c711823 Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Sat, 18 Apr 2026 12:37:35 +0200 Subject: [PATCH 6/8] feat: add credential helper for github --- git/.gitconfig | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/git/.gitconfig b/git/.gitconfig index 6d030cf..b0730ff 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -12,3 +12,7 @@ diffFilter = delta --color-only [delta] navigate = true +[credential "https://github.com"] + helper = !/opt/homebrew/bin/gh auth git-credential +[credential "https://gist.github.com"] + helper = !/opt/homebrew/bin/gh auth git-credential From 34f93c3e7b9bde940c4a870a8def12f3c861f3aa Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Thu, 7 May 2026 15:19:33 +0200 Subject: [PATCH 7/8] feat: use difftastic as difftool --- git/.gitconfig | 14 ++++++++------ .../tasks/install-macos-packages.yml | 2 +- .../tasks/install-rpm-packages.yml | 2 +- 3 files changed, 10 insertions(+), 8 deletions(-) diff --git a/git/.gitconfig b/git/.gitconfig index b0730ff..388bd40 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,17 +1,19 @@ -[core] - pager = delta +[diff] + tool = difftastic [merge] conflictStyle = zdiff3 [user] name = Kirill Morozov +[pager] + difftool = true [push] autoSetupRemote = true [pull] rebase = true -[interactive] - diffFilter = delta --color-only -[delta] - navigate = true +[difftool] + prompt = false +[difftool "difftastic"] + cmd = difft "$MERGED" "$LOCAL" "abcdef1" "100644" "$REMOTE" "abcdef2" "100644" [credential "https://github.com"] helper = !/opt/homebrew/bin/gh auth git-credential [credential "https://gist.github.com"] diff --git a/roles/development_machine/tasks/install-macos-packages.yml b/roles/development_machine/tasks/install-macos-packages.yml index 694d929..d3eb2fc 100644 --- a/roles/development_machine/tasks/install-macos-packages.yml +++ b/roles/development_machine/tasks/install-macos-packages.yml @@ -4,10 +4,10 @@ state: latest package: - btop + - difftastic - eza - fd - fzf - - git-delta - glab - go-task - jq diff --git a/roles/development_machine/tasks/install-rpm-packages.yml b/roles/development_machine/tasks/install-rpm-packages.yml index 82fe85e..047b14a 100644 --- a/roles/development_machine/tasks/install-rpm-packages.yml +++ b/roles/development_machine/tasks/install-rpm-packages.yml @@ -58,12 +58,12 @@ pkg: - alacritty - btop + - difftastic - eza - fd-find - fzf - gh - git - - git-delta - glab - go-task - golang From a63d1cea6fd61056969db22cafc2481460a5d298 Mon Sep 17 00:00:00 2001 From: Kirill Morozov Date: Tue, 12 May 2026 16:23:13 +0200 Subject: [PATCH 8/8] ci: add git labels automatically --- .github/labeler.yml | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/.github/labeler.yml b/.github/labeler.yml index e8e6e50..4622e88 100644 --- a/.github/labeler.yml +++ b/.github/labeler.yml @@ -34,6 +34,11 @@ Ansible: - roles/**/* - bootstrap.yml +Git: + - changed-files: + - any-glob-to-any-file: + - git/**/* + Neovim: - changed-files: - any-glob-to-any-file: