fscotto/infra
1
0
Fork 0
mirror of https://github.com/fscotto/infra.git synced 2026-05-30 15:39:58 +00:00
Code Issues Packages Projects Releases Wiki Activity

Compare commits

base: fscotto:e6467017d9858d18e0d15db48a22a03df00067ce
Branches Tags
fscotto:main fscotto:feature/migrate-wayland fscotto:feature/noctalia-ayu
...
compare: fscotto:d8ba674df78dcb75b9647b5f68b5470a3648ba13
Branches Tags
fscotto:main fscotto:feature/migrate-wayland fscotto:feature/noctalia-ayu

2 Commits
e6467017d9 ... d8ba674df7

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
2 changed files with 9 additions and 2 deletions
Expand all files Collapse all files

1
ansible/inventory/group_vars/workstation_dev_wsl.yml
View File

@@ -3,6 +3,7 @@ enabled_services:
- docker - docker
workstation_dev_wsl_packages: workstation_dev_wsl_packages:
- lazygit
- pinentry-curses - pinentry-curses
- python3-pip - python3-pip
workstation_dev_wsl_excluded_packages: workstation_dev_wsl_excluded_packages:

10
ansible/templates/workstation/.gitconfig.j2
View File

@@ -24,13 +24,19 @@
[merge] [merge]
conflictstyle = diff3 conflictstyle = diff3
tool = meld tool = vscode
[mergetool] [mergetool]
prompt = false prompt = false
[mergetool "vscode"]
cmd = code --reuse-window --wait $MERGED
[diff] [diff]
tool = meld tool = vscode
[difftool "vscode"]
cmd = code --reuse-window --wait --diff $LOCAL $REMOTE
[color] [color]
ui = always ui = always