diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl index df9adb2..112e475 100644 --- a/dot_gitconfig.tmpl +++ b/dot_gitconfig.tmpl @@ -15,18 +15,21 @@ [difftool "nvimdiff"] cmd = "nvim -d \"$LOCAL\" \"$REMOTE\"" + [url "https://"] insteadOf = git:// [core] pager = delta hooksPath = /dev/null + excludesfile = /Users/alice/.gitignore_global [interactive] diffFilter = delta --color-only [pull] ff = only + [init] defaultBranch = main diff --git a/dot_gitignore_global b/dot_gitignore_global index 7a6353d..0b66349 100644 --- a/dot_gitignore_global +++ b/dot_gitignore_global @@ -1 +1,2 @@ .envrc +*._local.* diff --git a/dot_ssh/private_keys/private_github-private.pub b/dot_ssh/private_keys/private_github-private.pub deleted file mode 100644 index 5cc8503..0000000 --- a/dot_ssh/private_keys/private_github-private.pub +++ /dev/null @@ -1 +0,0 @@ -ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFaIAP/ZJ7+7jeR44e1yIJjfQAB6MN351LDKJAXVF62P \ No newline at end of file diff --git a/dot_ssh/private_keys/private_github-private.pub.tmpl b/dot_ssh/private_keys/private_github-private.pub.tmpl new file mode 100644 index 0000000..75099ac --- /dev/null +++ b/dot_ssh/private_keys/private_github-private.pub.tmpl @@ -0,0 +1,6 @@ +{{- if eq .work false }} +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIFaIAP/ZJ7+7jeR44e1yIJjfQAB6MN351LDKJAXVF62P +{{- end }} +{{- if eq .work true }} +ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAILAzuPy7D/54GxMq9Zhz0CUjaDnEQ6RkQ/yqVYl7U55k +{{- end }}