Add lazygit on wsl

Change merge and diff tool for git on workstation
2026-05-30 15:39:58 +00:00 · 2026-05-28 15:05:25 +02:00 · 2026-05-28 14:54:07 +02:00
2 changed files with 9 additions and 2 deletions
--- a/ansible/inventory/group_vars/workstation_dev_wsl.yml
+++ b/ansible/inventory/group_vars/workstation_dev_wsl.yml
@@ -3,6 +3,7 @@ enabled_services:
  - docker

 workstation_dev_wsl_packages:
+  - lazygit
  - pinentry-curses
  - python3-pip
 workstation_dev_wsl_excluded_packages:
--- a/ansible/templates/workstation/.gitconfig.j2
+++ b/ansible/templates/workstation/.gitconfig.j2
@@ -24,13 +24,19 @@

 [merge]
  conflictstyle = diff3
-  tool = meld
+  tool = vscode

 [mergetool]
  prompt = false

+[mergetool "vscode"]
+  cmd = code --reuse-window --wait $MERGED
+
 [diff]
-  tool = meld
+  tool = vscode
+
+[difftool "vscode"]
+  cmd = code --reuse-window --wait --diff $LOCAL $REMOTE

 [color]
  ui = always
Author	SHA1	Message	Date
Fabio Scotto di Santolo	d8ba674df7	Add lazygit on wsl	2026-05-28 15:05:25 +02:00
Fabio Scotto di Santolo	7327bab7f2	Change merge and diff tool for git on workstation	2026-05-28 14:54:07 +02:00