diff --git a/config/git/gitconfig.linux b/config/git/gitconfig.linux index 2f6e338..7e81001 100644 --- a/config/git/gitconfig.linux +++ b/config/git/gitconfig.linux @@ -8,17 +8,21 @@ [commit] gpgsign = true - + [color] ui = true + [push] autoSetupRemote = true + [pull] rebase = false + [filter "lfs"] process = git-lfs filter-process required = true clean = git-lfs clean -- %f smudge = git-lfs smudge -- %f + [init] defaultBranch = main diff --git a/config/git/gitconfig.macos b/config/git/gitconfig.macos index e9635ab..80ce9c9 100644 --- a/config/git/gitconfig.macos +++ b/config/git/gitconfig.macos @@ -6,9 +6,6 @@ [gpg] format = ssh -[gpg "ssh"] - program = /Applications/1Password.app/Contents/MacOS/op-ssh-sign - [commit] gpgsign = true \ No newline at end of file diff --git a/config/git/gitconfig.wsl b/config/git/gitconfig.wsl deleted file mode 100644 index 0060301..0000000 --- a/config/git/gitconfig.wsl +++ /dev/null @@ -1,25 +0,0 @@ -[user] - signingkey = ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIM+sKpcREOUjwMMSzEWAso6830wbOi8kUxqpuXWw5gHr - email = menno@vleeuwen.me - name = Menno van Leeuwen -[gpg] - format = ssh -[gpg "ssh"] - program = "/mnt/c/Users/menno/AppData/Local/1Password/app/8/op-ssh-sign-wsl" -[commit] - gpgsign = true -[color] - ui = true -[push] - autoSetupRemote = true -[pull] - rebase = false -[filter "lfs"] - process = git-lfs filter-process - required = true - clean = git-lfs clean -- %f - smudge = git-lfs smudge -- %f -[safe] - directory = * -[credential] - helper = manager diff --git a/config/ssh/config b/config/ssh/config index f505f4b..d4376ff 100644 --- a/config/ssh/config +++ b/config/ssh/config @@ -1,4 +1,7 @@ Host * IdentityFile ~/dotfiles/secrets/ssh_keys/mennos-2025.pem + IdentityAgent ~/.1password/agent.sock + AddKeysToAgent yes + ForwardAgent yes Include ~/.ssh/config.d/*.conf