feat(work) misc env tweaks to support new work setup

This commit is contained in:
Matthew Ryan Dillon 2024-10-11 05:55:19 -04:00
parent cfd7c6c13e
commit d29006be1c
9 changed files with 134 additions and 78 deletions

View file

@ -5,3 +5,4 @@
.ssh/id_rsa_personal .ssh/id_rsa_personal
.ssh/id_rsa_work.pub .ssh/id_rsa_work.pub
.ssh/id_rsa_personal.pub .ssh/id_rsa_personal.pub
work_paths.txt

View file

@ -69,6 +69,11 @@ check_paths=(
# pixi # pixi
$HOME/.pixi/bin $HOME/.pixi/bin
# homebrew
/opt/homebrew/bin
{{ join .chezmoi.sourceDir "encrypted_work_paths.txt" | include | decrypt -}}
) )
for fp in $check_paths; do for fp in $check_paths; do

View file

@ -107,4 +107,7 @@ BASE16_SHELL="$HOME/.config/base16-shell/"
{{- end }} {{- end }}
{{ if eq .hosttype "work" -}}
eval "$(/opt/homebrew/bin/brew shellenv)"
{{ end }}
eval "$(direnv hook zsh)" eval "$(direnv hook zsh)"

View file

@ -0,0 +1,42 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBubGN2Mk16cTEzdXNjbGhI
SHFSUlVYRzdvbXB0VmNJVk5GNHZSZ280U0RJCnlvbXV6RGFvTlVZd0pEWTJjZkVq
T05xM0g1dm5SekdPc0dNeklKeDRjUUUKLS0tIGJRakZORGlSUit0L3RNK1AyVVNJ
ZzkraEtjRXcxcitvTXI5QUljUnRteFUKan2uiIbA+4a6dpWKWlgNVH/WhofEy1cy
a/n2nExgFJvExjqnIry6P+kQOrb4uUsxE8vuPZzebtnrki/SWYnZezdtef6JAPyi
73yg1WTKWGLj3V3xvjrXG6cn5uyr+Jhy0Bt3Y1YHwZnRUORixJ1KbxqyFojHaOBF
sqe+lv+LC8bxoyaOFHkgxYlbZ/JD30QsKYAMX7HgKrk3HG8fkp7nvtgjXnBv+B0A
DKbayiMR5gbbuV8/Re1zMC3Eviz9dGF2zmnVo/Y2p85xabHImnq6eBChyGb74L8i
bWKyF1rebjP1Yw/X/r3oLVh34d3ZFWD2PZPrdz0ecUO7Z04SWDAcQuKbbOH6xQOL
z9zIOJ1c3K4odjIbEu1/T5a/EBQtbhJLhWjfzsnSC5XcUi5LtkDhcIav7mu58ES0
bax2tCcLhoIMdCTzgdiNR6WEk1YnRikOjFI42nlyShndEt9PIQNjbwUM0vsoa8VE
JLIZym1WDHXjwZJfUQisa7UP14ypA2cuycjpniStbf7g8BCrqGx2u5Na8Mw/0ShN
X2E1zl0Ggh55e1FpOKzRtE9RHt8eQtWPrv2K9Ru1eEGf2tLhz53Q+QYVEMtTRUOV
swWQoyYkvYCOMEJ78soi+5qOfcGH+/PsuDhWbZCarimlDgP96iFproN2wwUcotqZ
bfaXj1Q2gAo+O7dpp3KTGpRAqxNZPeof7Cct5a/72Hq2mwxnZRs5UqWA6GlTajdx
lCSKZViyfr1NIQgK/1p30bTaDvDDcP2e3tbF0pQPOjrqTjh19JFZzHd6gokkRByY
dVfQPNrRPqRwWemCnxBbroX5APyb4nrO8sJBhDBShEqFaDuXDQz9d95VayhIROG0
RGEu/ZFGTYuheKS8djQJPD7JgshWBm1D7KQ/OUu6eVpaWzXa9Yx/FTL4nKNnO1sb
+8H3K52l2I8NiqbULfy0oM2cEXArfE+eQayPp4AxIt7c3fo/n1ECH3Sgbq0rkLaY
zxShgfgHKIA+f4rqWM2OBmeBSU9gDS8bT1+Uc37HWmUyYy5SWaH4ARx9nDtzhzqv
JVWuS9T3U2EWN65jsCglRPrVK2+b53IxWPXEL9S3ozPOHuAc/+9/zLeGhi7lFoJu
p4YlamNJpyPwl7gEwgsP7fqtxDC/NR+l4Di53Gk1ja25gTqTzjKnLt8I3mhouwRz
T1nFR9PqmlANoNuxJw4roTQuX+PeHIVg5c3kFDDpr1kcn568quZ9KPuqOl66zsuu
qYl9kAh/P2f56qfq1bCv1BzK0Ioqgzg9Ocx7RzC4Cp6rgoCrCuMdRmvl68i7BX2J
Gt/wpYEnaY833AauvMioFIvvow8E0dx226nX3t2+wBGWBBghn+a+/LT8bsZsp05Q
fR0+gOOsFlD6wZxW15y/9JkWV6goaQErOKOW/cRXKMfonV2Rb5I6bHgIaL+caO8s
tMZTO5CrvEroMLrjlEY4DPZLZMpHlsw3q9K2aObSnqDXhfQN7LR9rDMRJvA3ca3b
fxqnqJbbO5bSIJAG0G2TyKFpUZ132GP2rgARHEOFSg80a6PAZVtapIXiNmRceC1N
sCUFE7tJR/yLz1T1XouuDGLkvt3Bie3iInEsmXy1wXHKRwhKVynL+ooni1P8TUaE
MFE0xMKAD4axhXhscjL5ekzECgkH34ZG4LoaLk9ZFAumXQHusZ9rmLyZyIcrL7RM
WhmGHOVjiyD+oBjN0O8Z31qk7ogA/5tcbW3/Z+kniXwipRPnlOka+KEUgvv37dnR
XZ8VwOh7Q/slHWiiV/frlHV/Q6SeoW7s5QMSa7N2Qm/0bhtJleOvopSouZ0lNuIt
sxuaHOcvBWtM9clkEdpnQXNOuZOEXWkL8vM87YtNwDtkzTAufXmhxmQZZXB7XA29
/CjlUSDydpc5UNPyqQOJ/5WWWpFHbD8ozLmiXjKuAJTDRPw7kMpGRFdwjIDy9Nn8
lf2iXxC6B+vwbTPVH6002klnjpdwPICkRtn2rDRLNmG1F7zLq5PrHGTUh86/GXiJ
G7oDH4oWyUJ1cr5p2DAdAyMS2NSZBPNU/dnxjrOtFVli/bLe22IjTAZsi+tvXFIf
msZd3z0J0EwvvpMMU5O9XICeC/2LQ5sPyUqwBv+EldAeWLQCooXjngdnDiIbi/EZ
GORztcUfrYH8Wd7i+XF83n76mhTR2HfcNqwvqmzzJRt26vtyoqUuJeHQ5jQscDa2
hAp0MFUizV2uR6w6Qtw3hIa/tdD9t0EVy8jIEbMjmcA5uqTF+HzYhuiNVs0TNuit
9+9fHLKqPZqg88pi5dYe3Ms2bQ==
-----END AGE ENCRYPTED FILE-----

View file

@ -0,0 +1,15 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBGejQwajloVURtT2JleVpN
TkJDK3AzSStkS00vSW5YZDFSUlFtWldMWnhzCmgvWUZXYlZDUU4raEtiK2VVbUhy
bXBkYVlqRVE0UlJrSlJ5WkF3Y3RXMlUKLS0tIEp6L0tHU09EK21IeE9wcGoxK2do
YXhHU1NWODV1dWgwWnlicjlQemc0U2cK9e6WKZdRfNVvPlQH38eruO1Svx7/xv7E
Ydgisp4Y+moSDuX3cIeTXJj8JjRsyDB4dN0ABIVI1HWoLmlYlyzNBk8Nwm4AX5PG
oMw4Lse/lWcAav7tDzXhUpieJrC7a+RiV170nXOs3r1sJ3SQviZyyNPEmynAtfE/
0pgJnldoAJ/BtH5urxkelnYQ04H45BBoKIsMMFLiiHDqjVLFpwx4lMct1MU5Cnbu
zUwZ5/kh4hELwaf+lUbuLRWOqXmUSBbJK6Uu9Jpk0uWW/15YIkpJKvT5mGT1Gw7D
ZrIpxKB2lz2yJ9sZZjCvS/BsMIXn1IdbeGTFpep74zu3XF1h0dWGWM2w6NsdFLFt
osk3BH8d+z8lOXO5BzqH8Km8tlt9QFZi9uIXWHkSfxsEMQkJW603B5FfivEbQL4V
Q4ySX1Q0NeOog3cfQWeUKoGVCReSCnfDEvAynSII/xWb+uz6FnkzjWimlfY6VGVc
dTIiF5ct4+ZgKYfplygNQz9U6ZQUzLX3UkupOlqm3n2XdfEYSYFF9hDjFouOALLn
xHIKPFXrOO4/qbYt/w4=
-----END AGE ENCRYPTED FILE-----

View file

@ -0,0 +1,16 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBzY1QwVXhoa1IvUGM4d2lr
aFJXb29LSVBwTDM3d0xCeHdIa0RRZE5XY1RZCkI1ZFkrY2lCSHY0dG1kaThCTkZ3
U0F4ZDhwWDZLNWdzY2l2Zk45dVZvVlEKLS0tIFJDUG1oWnA0WFQxZXFBUFhVbE9o
dGFWN0VVL1I3Z3pHdWRjVE93M3BTNE0KjnuD9ElEH28PcosxYPPGR+bd31JwMXqk
8lzpU7zKVlCZOCD57sn0rvvIRvoPaNC2sg9oqO4GleuqkYnfaZ8UMlBwCpOf0av9
zMKZyefDvr9dkdMsge4ES+Ifmv2OdcKtAk3rSVi92Do2LBmWgaukO99gLpWnw+Qw
T+FkrBIjP6noNLashxa1QWzkvZa9OE56kJ1O2hRKMm/dSVYYB+0aSk7sloToUTWN
v29lwnOamz1XtGiWI3xF3pJVmcNxQx2P+T6Q+JAt84vru+amk39MoMO7lTLgWYSw
vnzoiPzvU/S5amttUtbq/u2yQHCFAM+eSsRnsSjbV/K5HqFbpp06cikDDpxdZ3tJ
OTXqtrBGb6N1aVPb78qSvF+D/UC4Habohoxua5MlZ1mZjuRVm3Nqom/DTH+s+xGJ
uQ6T28yYNWCQc/2yTxRTghIUvKqDJvJdsGhOH6bP9FdwdfDF13RW53MGe1HuRcVn
8IlEC6yrxpcBg7eBAleCwzhIbZXm7c681rct/aZ8wcliMfqqgGzcyK/4niKRq7or
H+VYfpT43NLBRa1NIciv1Y94WsPllgQn0GGj/KHxxuXg2Rb+TF1VKb5UpZESVcXa
fFQt6UZCyoI=
-----END AGE ENCRYPTED FILE-----

View file

@ -0,0 +1,7 @@
-----BEGIN AGE ENCRYPTED FILE-----
YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSByV0J4aGFoR3hDSTJvNVp2
a1F1NzJmaERoYWwycStJeC9OS0tLaUp0aXpvCjhndzJrQmhRaWo4STRzdWtYTE94
Y0V4UHJ5UHlwaXZJOVJXSjdhMktvUWcKLS0tIDRtUHptRjYzT0RHQVJxT2RBbXNa
OUwxak52ZVhQL2psSUlpRVhHdzUxZjgKtcrEfrCDzTmLFhPNcnJ/PBMoiIxF0KAE
B2lhLyJ6+0OVTHMM6byVr+JnjnIXoA35537EUkQZ+A==
-----END AGE ENCRYPTED FILE-----

View file

@ -1,6 +1,6 @@
# vim:fileencoding=utf-8:foldmethod=marker # vim:fileencoding=utf-8:foldmethod=marker
#: Fonts {{{ #: Fonts
#: kitty has very powerful font management. You can configure #: kitty has very powerful font management. You can configure
#: individual font faces and even specify special fonts for particular #: individual font faces and even specify special fonts for particular
@ -246,9 +246,7 @@ font_size 15.0
#: problem try setting text_fg_override_threshold to 0 to see if this #: problem try setting text_fg_override_threshold to 0 to see if this
#: is the cause of the problem. #: is the cause of the problem.
#: }}} #: Cursor customization
#: Cursor customization {{{
# cursor #cccccc # cursor #cccccc
@ -307,9 +305,7 @@ font_size 15.0
#: Stop blinking cursor after the specified number of seconds of #: Stop blinking cursor after the specified number of seconds of
#: keyboard inactivity. Set to zero to never stop blinking. #: keyboard inactivity. Set to zero to never stop blinking.
#: }}} #: Scrollback
#: Scrollback {{{
# scrollback_lines 2000 # scrollback_lines 2000
@ -384,9 +380,7 @@ font_size 15.0
#: platforms such as macOS and Wayland. Use negative numbers to change #: platforms such as macOS and Wayland. Use negative numbers to change
#: scroll direction. #: scroll direction.
#: }}} #: Mouse
#: Mouse {{{
# mouse_hide_wait 3.0 # mouse_hide_wait 3.0
@ -540,7 +534,7 @@ font_size 15.0
#: The default shape of the mouse pointer when dragging across text. #: The default shape of the mouse pointer when dragging across text.
#: Mouse actions {{{ #: Mouse actions
#: Mouse buttons can be mapped to perform arbitrary actions. The #: Mouse buttons can be mapped to perform arbitrary actions. The
#: syntax is: #: syntax is:
@ -696,11 +690,7 @@ font_size 15.0
#:: Requires shell integration #:: Requires shell integration
#:: <https://sw.kovidgoyal.net/kitty/shell-integration/> to work. #:: <https://sw.kovidgoyal.net/kitty/shell-integration/> to work.
#: }}} #: Performance tuning
#: }}}
#: Performance tuning {{{
# repaint_delay 10 # repaint_delay 10
@ -730,9 +720,7 @@ font_size 15.0
#: monitor. With a very high speed mouse/high keyboard repeat rate, #: monitor. With a very high speed mouse/high keyboard repeat rate,
#: you may notice some slight input latency. If so, set this to no. #: you may notice some slight input latency. If so, set this to no.
#: }}} #: Terminal bell
#: Terminal bell {{{
# enable_audio_bell yes # enable_audio_bell yes
@ -787,9 +775,7 @@ font_size 15.0
#: be removed if Linux ever provides desktop-agnostic support for #: be removed if Linux ever provides desktop-agnostic support for
#: setting system sound themes. #: setting system sound themes.
#: }}} #: Window layout
#: Window layout {{{
# remember_window_size yes # remember_window_size yes
# initial_window_width 640 # initial_window_width 640
@ -984,9 +970,7 @@ font_size 15.0
#: want confirmation when closing individual windows, you can map the #: want confirmation when closing individual windows, you can map the
#: close_window_with_confirmation action. #: close_window_with_confirmation action.
#: }}} #: Tab bar
#: Tab bar {{{
# tab_bar_edge bottom # tab_bar_edge bottom
@ -1149,9 +1133,7 @@ font_size 15.0
#: margins the default color is chosen to match the background color #: margins the default color is chosen to match the background color
#: of the neighboring tab. #: of the neighboring tab.
#: }}} #: Color scheme
#: Color scheme {{{
# foreground #dddddd # foreground #dddddd
# background #000000 # background #000000
@ -1248,7 +1230,7 @@ font_size 15.0
#: to be used unchanged. Note that these colors can be overridden by #: to be used unchanged. Note that these colors can be overridden by
#: the program running in the terminal. #: the program running in the terminal.
#: The color table {{{ #: The color table
#: The 256 terminal colors. There are 8 basic colors, each color has a #: The 256 terminal colors. There are 8 basic colors, each color has a
#: dull and bright version, for the first 16 colors. You can set the #: dull and bright version, for the first 16 colors. You can set the
@ -1318,13 +1300,9 @@ font_size 15.0
#: Color for marks of type 3 (violet) #: Color for marks of type 3 (violet)
#: }}} #: Advanced
#: }}} shell .
#: Advanced {{{
# shell .
#: The shell program to execute. The default value of . means to use #: The shell program to execute. The default value of . means to use
#: whatever shell is set as the default shell for the current user. #: whatever shell is set as the default shell for the current user.
@ -1677,9 +1655,7 @@ clipboard_control write-clipboard write-primary no-append
#: an "Actions" menu in the macOS global menubar. Sub-menus can be #: an "Actions" menu in the macOS global menubar. Sub-menus can be
#: created by adding more levels separated by the :: characters. #: created by adding more levels separated by the :: characters.
#: }}} #: OS specific tweaks
#: OS specific tweaks {{{
# wayland_titlebar_color system # wayland_titlebar_color system
@ -1801,9 +1777,7 @@ macos_option_as_alt yes
#: Changing this option by reloading the config is not supported, it #: Changing this option by reloading the config is not supported, it
#: will not have any effect. #: will not have any effect.
#: }}} #: Keyboard shortcuts
#: Keyboard shortcuts {{{
#: Keys are identified simply by their lowercase Unicode characters. #: Keys are identified simply by their lowercase Unicode characters.
#: For example: a for the A key, [ for the left square bracket key, #: For example: a for the A key, [ for the left square bracket key,
@ -1869,7 +1843,7 @@ macos_option_as_alt yes
#: cause all invocations of the hints kitten to have the --hints- #: cause all invocations of the hints kitten to have the --hints-
#: offset=0 option applied. #: offset=0 option applied.
#: Clipboard {{{ #: Clipboard
#: Copy to clipboard #: Copy to clipboard
@ -1909,9 +1883,7 @@ macos_option_as_alt yes
#:: map kitty_mod+y new_window less @selection #:: map kitty_mod+y new_window less @selection
#: }}} #: Scrolling
#: Scrolling {{{
#: Scroll line up #: Scroll line up
@ -2001,9 +1973,7 @@ macos_option_as_alt yes
#:: Requires shell integration #:: Requires shell integration
#:: <https://sw.kovidgoyal.net/kitty/shell-integration/> to work. #:: <https://sw.kovidgoyal.net/kitty/shell-integration/> to work.
#: }}} #: Window management
#: Window management {{{
#: New window #: New window
@ -2140,9 +2110,7 @@ macos_option_as_alt yes
#:: Works like focus_visible_window above, but swaps the window. #:: Works like focus_visible_window above, but swaps the window.
#: }}} #: Tab management
#: Tab management {{{
#: Next tab #: Next tab
@ -2197,9 +2165,7 @@ macos_option_as_alt yes
#: rather than at the end of the tabs list, use:: #: rather than at the end of the tabs list, use::
#: map ctrl+t new_tab !neighbor [optional cmd to run] #: map ctrl+t new_tab !neighbor [optional cmd to run]
#: }}} #: Layout management
#: Layout management {{{
#: Next layout #: Next layout
@ -2221,9 +2187,7 @@ macos_option_as_alt yes
#: stack layout:: #: stack layout::
#: map ctrl+alt+z toggle_layout stack #: map ctrl+alt+z toggle_layout stack
#: }}} #: Font sizes
#: Font sizes {{{
#: You can change the font size for all top-level kitty OS windows at #: You can change the font size for all top-level kitty OS windows at
#: a time or only the current one. #: a time or only the current one.
@ -2258,9 +2222,7 @@ macos_option_as_alt yes
#: size:: #: size::
#: map kitty_mod+f6 change_font_size current 10.0 #: map kitty_mod+f6 change_font_size current 10.0
#: }}} #: Select and act on visible text
#: Select and act on visible text {{{
#: Use the hints kitten to select text and either pass it to an #: Use the hints kitten to select text and either pass it to an
#: external program or insert it into the terminal or copy it to the #: external program or insert it into the terminal or copy it to the
@ -2326,9 +2288,7 @@ macos_option_as_alt yes
#: The hints kitten has many more modes of operation that you can map #: The hints kitten has many more modes of operation that you can map
#: to different shortcuts. For a full description see hints kitten #: to different shortcuts. For a full description see hints kitten
#: <https://sw.kovidgoyal.net/kitty/kittens/hints/>. #: <https://sw.kovidgoyal.net/kitty/kittens/hints/>.
#: }}} #: Miscellaneous
#: Miscellaneous {{{
#: Show documentation #: Show documentation
@ -2524,6 +2484,3 @@ macos_option_as_alt yes
# map cmd+q quit # map cmd+q quit
#: }}}
#: }}}

View file

@ -16,7 +16,7 @@ sudo apt install \
zsh \ zsh \
-y -y
{{ else if eq .chezmoi.os "darwin" -}} {{ else if eq .hosttype "personal" -}}
sudo port install \ sudo port install \
cmus \ cmus \
curl \ curl \
@ -52,15 +52,25 @@ sudo apt install \
{{ end }} {{ end }}
{{ if eq .hosttype "work" -}} {{ if eq .hosttype "work" -}}
sudo port install \ /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
1password-cli \ eval "$(/opt/homebrew/bin/brew shellenv)"
docker-credential-helper-ecr \ brew install \
gh \ cmus \
jq \ curl \
k9s \ direnv \
kind \ fzf \
libmemcached \ git \
saml2aws \ git-delta \
shfmt \ helix \
stern jj \
kitty \
ripgrep \
tmux \
tree \
watch \
wget \
xz \
zellij \
zk \
zsh
{{ end }} {{ end }}