Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -14,4 +14,4 @@ brew {{ . | quote }}
cask {{ . | quote }}
{{ end -}}
EOF
{{ end -}}
{{ end -}}
4 changes: 2 additions & 2 deletions .chezmoiscripts/run_onchange_set_mac_os_defaults.sh
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@ defaults write com.apple.finder OpenWindowForNewRemovableDisk -bool true

# Dock
defaults write com.apple.dock "orientation" -string "left"
defaults write com.apple.dock "tilesize" -int "30"
defaults write com.apple.dock "tilesize" -int "30"
defaults write com.apple.dock "autohide" -bool "true"

killall Dock
Expand Down Expand Up @@ -115,4 +115,4 @@ tell application "Terminal"
end tell
APPLESCRIPT

echo "Completed configuring MacOS. Restart required for some changes"
echo "Completed configuring MacOS. Restart required for some changes"
10 changes: 5 additions & 5 deletions .vscode/settings.json
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
{
"files.associations": {
"*.sh.tmpl": "shellscript",
"dot_zshrc.tmpl": "shellscript",
"dot_gitconfig.tmpl": "properties"
}
"files.associations": {
"*.sh.tmpl": "shellscript",
"dot_zshrc.tmpl": "shellscript",
"dot_gitconfig.tmpl": "properties"
}
}
2 changes: 1 addition & 1 deletion dot_config/starship.toml
Original file line number Diff line number Diff line change
Expand Up @@ -310,4 +310,4 @@ format = '\[[$symbol($version)]($style)\]'
format = '\[[$symbol($version)]($style)\]'

[zig]
format = '\[[$symbol($version)]($style)\]'
format = '\[[$symbol($version)]($style)\]'
72 changes: 36 additions & 36 deletions dot_gitconfig.tmpl
Original file line number Diff line number Diff line change
@@ -1,73 +1,73 @@
{{ if hasPrefix "LIBP" .chezmoi.hostname }}
[http]
sslCAInfo = /Users/Shared/.certificates/zscaler.pem
sslCAInfo = /Users/Shared/.certificates/zscaler.pem
{{ end }}

[user]
name = Christopher Snyder
{{ if hasPrefix "LIBP" .chezmoi.hostname }}
email = Christopher.Snyder@libertymutual.com
signingkey = D5AFFC6BFD33D9DE
{{ else }}
email = cellulararrest@gmail.com
signingkey = 355E056BD813F0EEA3E3303488162C1A8CEFAEE4
{{ end }}
name = Christopher Snyder
{{ if hasPrefix "LIBP" .chezmoi.hostname }}
email = Christopher.Snyder@libertymutual.com
signingkey = D5AFFC6BFD33D9DE
{{ else }}
email = cellulararrest@gmail.com
signingkey = 355E056BD813F0EEA3E3303488162C1A8CEFAEE4
{{ end }}

[merge]
tool = vscode
conflictstyle = diff3
tool = vscode
conflictstyle = diff3

[mergetool "p4mergetool"]
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$LOCAL $PWD/$REMOTE $PWD/$MERGED
trustExitCode = false
cmd = /Applications/p4merge.app/Contents/Resources/launchp4merge $PWD/$BASE $PWD/$LOCAL $PWD/$REMOTE $PWD/$MERGED
trustExitCode = false

[mergetool]
keepBackup = false
keepBackup = false

[core]
editor = nvim
pager = delta
editor = nvim
pager = delta

[interactive]
diffFilter = delta --color-only
diffFilter = delta --color-only

[delta]
navigate = true
side-by-side = true
syntax-theme = TwoDark
navigate = true
side-by-side = true
syntax-theme = TwoDark

[color]
ui = true
ui = true

[diff]
colorMoved = default
tool = vscode
colorMoved = default
tool = vscode

[alias]
last-branches = "!sh -c 'git for-each-ref --sort=\"-committerdate\" --format=\"%(committerdate)%09%(refname)\" refs/heads | sed -e \"s-refs/heads/--\"' | less"
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"
last-branches = "!sh -c 'git for-each-ref --sort=\"-committerdate\" --format=\"%(committerdate)%09%(refname)\" refs/heads | sed -e \"s-refs/heads/--\"' | less"
find-merge = "!sh -c 'commit=$0 && branch=${1:-HEAD} && (git rev-list $commit..$branch --ancestry-path | cat -n; git rev-list $commit..$branch --first-parent | cat -n) | sort -k2 -s | uniq -f1 -d | sort -n | tail -1 | cut -f2'"
show-merge = "!sh -c 'merge=$(git find-merge $0 $1) && [ -n \"$merge\" ] && git show $merge'"

[gpg]
program = {{ lookPath "gpg" }}
program = {{ lookPath "gpg" }}

[commit]
gpgsign = true
gpgsign = true

[url "http://github.com/"]
insteadOf = ssh://git@github.com/
insteadOf = ssh://git@github.com/

[url "https://github.com/"]
insteadOf = git://github.com/
insteadOf = git://github.com/

[mergetool "vscode"]
cmd = "code --wait "
cmd = "code --wait "

[difftool "vscode"]
cmd = "code --wait --diff "
cmd = "code --wait --diff "

[filter "lfs"]
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
process = git-lfs filter-process
required = true
clean = git-lfs clean -- %f
smudge = git-lfs smudge -- %f
2 changes: 1 addition & 1 deletion private_dot_gnupg/private_executable_gpg-agent.conf
Original file line number Diff line number Diff line change
@@ -1 +1 @@
pinentry-program /opt/homebrew/bin/pinentry-mac
pinentry-program /opt/homebrew/bin/pinentry-mac
43 changes: 20 additions & 23 deletions private_dot_ssh/config.tmpl
Original file line number Diff line number Diff line change
@@ -1,35 +1,32 @@
Host tower.local
HostName tower.local
User root
IdentityFile ~/.ssh/id_personal
AddKeysToAgent yes
HostName tower.local
User root
IdentityFile ~/.ssh/id_personal
AddKeysToAgent yes

# The `githubhome` alias allows me to present a different ssh key
# for personal respositories and work repositories. Work ssh key is
# for personal respositories and work repositories. Work ssh key is
# presented by default and personal repositories have their remote
# set to `git@githubhome`
{{ if hasPrefix "LIBP" .chezmoi.hostname }}

{{ if hasPrefix "LIBP" .chezmoi.hostname -}}
Host "githubhome"
PreferredAuthentications publickey
User git
IdentityFile ~/.ssh/id_personal
HostName github.com
AddKeysToAgent yes
{{ end }}
PreferredAuthentications publickey
User git
IdentityFile ~/.ssh/id_personal
HostName github.com
AddKeysToAgent yes

{{ end -}}
# Default GitHub configuration
Host github.com
PreferredAuthentications publickey
User git
AddKeysToAgent yes
PreferredAuthentications publickey
User git
AddKeysToAgent yes

# Specifies that ssh should only use the identity keys configured in the
# ssh_config files, even if ssh-agent offers more identities.
# Specifies that ssh should only use the identity keys configured in the
# ssh_config files, even if ssh-agent offers more identities.
# https://www.ssh.com/academy/ssh/config
Host *
IdentitiesOnly yes
{{ if hasPrefix "LIBP" .chezmoi.hostname }}
IdentityFile ~/.ssh/id_ed25519
{{ else }}
IdentityFile ~/.ssh/id_personal
{{ end }}
IdentitiesOnly yes
IdentityFile {{ if hasPrefix "LIBP" .chezmoi.hostname }}~/.ssh/id_ed25519{{ else }}~/.ssh/id_personal{{ end }}
Loading