diff --git a/home/.chezmoiignore.tmpl b/home/.chezmoiignore.tmpl index f6162ed..7aa096d 100644 --- a/home/.chezmoiignore.tmpl +++ b/home/.chezmoiignore.tmpl @@ -2,9 +2,5 @@ .zshprivate {{- end }} {{- if eq .hosttype "personal" }} -.apprc -.s2a_login -.work_packages -.work_paths .zshklaviyo {{- end }} diff --git a/home/dot_zshenv.tmpl b/home/dot_zshenv.tmpl index af506c5..086bd76 100644 --- a/home/dot_zshenv.tmpl +++ b/home/dot_zshenv.tmpl @@ -69,7 +69,7 @@ check_paths=( # uv $HOME/.local/bin - {{ join .chezmoi.sourceDir "encrypted_dot_work_paths.age" | include | decrypt -}} + {{ join .chezmoi.sourceDir "encrypted_work_paths.age" | include | decrypt -}} ) for fp in $check_paths; do diff --git a/home/private_Library/private_Application Support/private_jj/config.toml.tmpl b/home/private_Library/private_Application Support/private_jj/config.toml.tmpl index 02ea816..4e4978b 100644 --- a/home/private_Library/private_Application Support/private_jj/config.toml.tmpl +++ b/home/private_Library/private_Application Support/private_jj/config.toml.tmpl @@ -7,7 +7,8 @@ push-bookmark-prefix = "{{ .github_personal }}_jj_" private-commits = "description(glob:'private:*') | bookmarks('merge')" [revset-aliases] -'stack()' = 'main..@' +"stack()" = "trunk()..@" +"immutable_heads()" = "builtin_immutable_heads() | (trunk().. & ~mine())" [ui] default-command = ["log"]