diff --git a/.chezmoiscripts/run_onchange_darwin-install-packages.sh.tmpl b/.chezmoiscripts/run_onchange_darwin-install-packages.sh.tmpl index b167ee2..ebfbd61 100644 --- a/.chezmoiscripts/run_onchange_darwin-install-packages.sh.tmpl +++ b/.chezmoiscripts/run_onchange_darwin-install-packages.sh.tmpl @@ -14,4 +14,4 @@ brew {{ . | quote }} cask {{ . | quote }} {{ end -}} EOF -{{ end -}} \ No newline at end of file +{{ end -}} diff --git a/.chezmoiscripts/run_onchange_set_mac_os_defaults.sh b/.chezmoiscripts/run_onchange_set_mac_os_defaults.sh index 203bd61..d342204 100644 --- a/.chezmoiscripts/run_onchange_set_mac_os_defaults.sh +++ b/.chezmoiscripts/run_onchange_set_mac_os_defaults.sh @@ -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 @@ -115,4 +115,4 @@ tell application "Terminal" end tell APPLESCRIPT -echo "Completed configuring MacOS. Restart required for some changes" \ No newline at end of file +echo "Completed configuring MacOS. Restart required for some changes" diff --git a/.vscode/settings.json b/.vscode/settings.json index 70fd40d..2fe4553 100644 --- a/.vscode/settings.json +++ b/.vscode/settings.json @@ -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" + } } diff --git a/dot_config/starship.toml b/dot_config/starship.toml index dc4b3ca..ea5b7d7 100644 --- a/dot_config/starship.toml +++ b/dot_config/starship.toml @@ -310,4 +310,4 @@ format = '\[[$symbol($version)]($style)\]' format = '\[[$symbol($version)]($style)\]' [zig] -format = '\[[$symbol($version)]($style)\]' \ No newline at end of file +format = '\[[$symbol($version)]($style)\]' diff --git a/dot_gitconfig.tmpl b/dot_gitconfig.tmpl index 2ff14b5..ce1f785 100644 --- a/dot_gitconfig.tmpl +++ b/dot_gitconfig.tmpl @@ -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 diff --git a/private_dot_gnupg/private_executable_gpg-agent.conf b/private_dot_gnupg/private_executable_gpg-agent.conf index 0ac99e6..646e6c8 100644 --- a/private_dot_gnupg/private_executable_gpg-agent.conf +++ b/private_dot_gnupg/private_executable_gpg-agent.conf @@ -1 +1 @@ -pinentry-program /opt/homebrew/bin/pinentry-mac \ No newline at end of file +pinentry-program /opt/homebrew/bin/pinentry-mac diff --git a/private_dot_ssh/config.tmpl b/private_dot_ssh/config.tmpl index 12bc1f0..51c0290 100644 --- a/private_dot_ssh/config.tmpl +++ b/private_dot_ssh/config.tmpl @@ -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 }}