From 49866e4206817862ca14ca93c5c6d106cf157323 Mon Sep 17 00:00:00 2001 From: Matthew Ryan Dillon Date: Sat, 5 Apr 2025 17:01:27 -0400 Subject: [PATCH] WIP: expand jj immutable revisions (closes #4) --- home/.chezmoiignore.tmpl | 10 ++++----- home/dot_zshrc.tmpl | 2 -- home/encrypted_dot_work_packages.age | 9 ++++++++ ...paths.age => encrypted_dot_work_paths.age} | 0 home/encrypted_work_packages.age | 21 ------------------- .../private_jj/config.toml.tmpl | 3 ++- home/run_once_01install-packages.sh.tmpl | 14 +++++++++---- 7 files changed, 25 insertions(+), 34 deletions(-) create mode 100644 home/encrypted_dot_work_packages.age rename home/{encrypted_work_paths.age => encrypted_dot_work_paths.age} (100%) delete mode 100644 home/encrypted_work_packages.age diff --git a/home/.chezmoiignore.tmpl b/home/.chezmoiignore.tmpl index 5bc532e..7aa096d 100644 --- a/home/.chezmoiignore.tmpl +++ b/home/.chezmoiignore.tmpl @@ -1,8 +1,6 @@ -{{- if ne .hosttype "work" }} -.zshklaviyo -{{- end }} -{{- if ne .hosttype "personal" }} +{{- if eq .hosttype "work" }} .zshprivate {{- end }} -work_paths -work_packages +{{- if eq .hosttype "personal" }} +.zshklaviyo +{{- end }} diff --git a/home/dot_zshrc.tmpl b/home/dot_zshrc.tmpl index 6e6b126..77a3c55 100644 --- a/home/dot_zshrc.tmpl +++ b/home/dot_zshrc.tmpl @@ -62,14 +62,12 @@ done alias devlog="cd ~/projects/personal/devlog && hx logs/$(date '+%Y-%m-%d').gmi && cd -" -{{ if eq .hosttype "work" "personal" -}} eval "$(/opt/homebrew/bin/brew shellenv)" eval "$(direnv hook zsh)" eval "$(jj util completion zsh)" export NVM_DIR="$HOME/.nvm" [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh" [ -s "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" ] && \. "/opt/homebrew/opt/nvm/etc/bash_completion.d/nvm" -{{ end }} function reldate() { date -v "${1}" "+%Y-%m-%d" diff --git a/home/encrypted_dot_work_packages.age b/home/encrypted_dot_work_packages.age new file mode 100644 index 0000000..3245fe4 --- /dev/null +++ b/home/encrypted_dot_work_packages.age @@ -0,0 +1,9 @@ +-----BEGIN AGE ENCRYPTED FILE----- +YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB0R1ZRL1VJVW5URzZoZXJC +Wm1XcjVzeE5rdXBVVFJ4RmpVS3FqVE5LRmtjCjVia29aeklXUkRWWWpKY2hGRlJh +cWlRTlIyNlZqbUNoTmhaNzFoOWc2czQKLS0tIDUwTFJZVlcxVjRzOVV0QUJBdEZV +Mm5SamhSYlgvZUgxd1NlcFhRd2R3MDgKHuVfpKp1BQBx1xXur5x8N8Ohli0rYY6+ +MmmKTDdYvuZKDqGrI+EpQw0yywLyUgeWfDUx5OSx1Z9PKMAU1+KYGAWB0WLYXafT +51UZSNj835YVZUChLKwLhthKg8KTl6h4FxE4K/88iHVOlRyVhuUAkZfGlGpL21uC +XgKaOnt/i5IFeGj459sR0io2m0sjCcZJA/3F1SBkVch3Lw1Xx4GrPmKq +-----END AGE ENCRYPTED FILE----- diff --git a/home/encrypted_work_paths.age b/home/encrypted_dot_work_paths.age similarity index 100% rename from home/encrypted_work_paths.age rename to home/encrypted_dot_work_paths.age diff --git a/home/encrypted_work_packages.age b/home/encrypted_work_packages.age deleted file mode 100644 index 6581433..0000000 --- a/home/encrypted_work_packages.age +++ /dev/null @@ -1,21 +0,0 @@ ------BEGIN AGE ENCRYPTED FILE----- -YWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBQQS9VY252K3R1ak16YXY4 -cEZvUk1OVERHZzBSM2VRVkIxbG00UEk4bW1nCnJVSVg2RVpYTGhNSWVWMW91N3ZX -TmdSTFdyNEhuMmFOdGt4NENURUZGU2MKLS0tIEpNTWI2YWROcmdlaEQ0MnFIL2Rp -TTZoWnBuSDF4T1lBb285UC9CbllUMUUKBUx9kY7qD0CjcH0rVrniED9orkg84C2T -TqQ1ERCvbNoxIyg4lHRUaJ/yzQ59MJYryum72ReK5kcTCsy/YhWHb1pK651P6KGm -kPz4BVaEDCqD61JscCSk92r8Z/0syrb6JZ7WDKfD23IdPy75kfCuwnh5JRutmTqu -xK6nzNV6WmIoXqvR2LsIO/CcnnKoqWlI60hzq2O4uzxP4pFyHZKJS6uSvTlRSk3w -oUan7bEAZdZ49Fx7JPMi4KWht/zT0PqVda7D0ZUwYOaOmvxOSZ31oO+3fET/0Xf9 -pOYYAvvIKq9kC4WSJGFDtBXEJ2sD8g+HI+NhfiowsOCH4SU6QqiwK7G9MJpb+bVd -w7ABmiod28oz34Va85tP9E9eHHK4jJFy9FpyTVp83QKzAnU6/wFOrtBltlVOe7fJ -XvMfSXWFxzwTa6qrLsxSJMRx97qRVsCJM1AcYwfp8pgcVhahi1OncNhsb8Y7VBlW -iO7CbvhJMfSQeqjzsqBPHmP+RX2ujR6oC+OTT6NulqZg9x1raWmLhhrgohuaL56U -D2gPbvtwhrlGAUf8miipvjRiA8NBZUT/mqw4uEJ5zEagoINM43nqQUTDTE3iumWl -Cd6cCEePV1kqGfr8Dar+Y6NTFgj5WQ7xz8K+xAOhEqcQUx+eT+T8agAeip3VIySc -/M8BHOxA7aapyqaVUW2lvcj/iJ6nzT2JNEUrDPCIEzAfjBGHJIQKChdeO8ZQb3fE -R7cKDv8bEgC64cmnCETID74MVzefTQCKBPVeCcVSHgOp+0PLHzT5BWZ378oWO2o/ -O+lJhTsqK7Mo0tOY7OKoBwU23BILrZhu0AOZ++FQ5lZZtruf3n/VnhfLfn0a82n2 -TPTBw7jSSM1TWgMPe4vSfmcOADUTwpvXz1je3rDs2Si5ej4Xw1ZA6exK946KjQeC -6xADwUCP2k6APt2kNkbnEB+9sMUH8tuBqgRxAAKrNOi3BtvU ------END AGE ENCRYPTED FILE----- 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"] diff --git a/home/run_once_01install-packages.sh.tmpl b/home/run_once_01install-packages.sh.tmpl index 37b7b2e..a236a78 100644 --- a/home/run_once_01install-packages.sh.tmpl +++ b/home/run_once_01install-packages.sh.tmpl @@ -2,22 +2,22 @@ set -e -{{ if eq .hosttype "personal" -}} /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)" eval "$(/opt/homebrew/bin/brew shellenv)" brew install \ + age \ bzip2 \ cmus \ curl \ direnv \ fzf \ + gh \ git \ git-delta \ glow \ helix \ jj \ kitty \ - neovim \ nvm \ ripgrep \ sqlite \ @@ -28,8 +28,10 @@ brew install \ yazi \ zellij \ zk \ - zlib \ - zsh + zlib + +brew install --cask \ + kap export NVM_DIR="$HOME/.nvm" [ -s "/opt/homebrew/opt/nvm/nvm.sh" ] && \. "/opt/homebrew/opt/nvm/nvm.sh" @@ -39,6 +41,10 @@ nvm use 22 curl -LsSf https://astral.sh/uv/install.sh | sh uv tool install --force --python python3.12 aider-chat@latest +{{ if eq .hosttype "personal" -}} +brew install \ + mingw64 \ + pandoc {{ else if eq .hosttype "work" -}} {{ join .chezmoi.sourceDir "encrypted_work_packages.age" | include | decrypt -}} {{ end }}