From 4dd4a4ebaeee3521c41dde59e9db834c65ef4277 Mon Sep 17 00:00:00 2001 From: Ryota Ikezawa Date: Mon, 9 Mar 2026 01:28:22 +0900 Subject: [PATCH 1/2] feat(zsh): replace shell aliases with zsh-abbr and fix SSH signing MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit - Migrate git/editor/tool shortcuts from aliases to zsh-abbr session abbreviations for better shell history readability - Keep command substitutions (ls→eza, cat→bat) and safe defaults as aliases - Remove git compdef entries (unnecessary with abbr) - Add 1Password SSH agent config (agent.toml, IdentityAgent in SSH config) - Generate personal ed25519 signing key in 1Password Dotfiles vault - Add deno to devbox global packages Co-Authored-By: Claude Opus 4.6 --- dot_config/1Password/ssh/agent.toml | 2 + dot_config/zsh/split/aliases.zsh | 32 +------------ dot_config/zsh/split/options.zsh | 19 -------- dot_config/zsh/split/plugins.zsh | 40 ++++++++++++++++ .../share/devbox/global/default/devbox.json | 3 +- .../share/devbox/global/default/devbox.lock | 48 +++++++++++++++++++ private_dot_ssh/config.tmpl | 1 + 7 files changed, 95 insertions(+), 50 deletions(-) create mode 100644 dot_config/1Password/ssh/agent.toml diff --git a/dot_config/1Password/ssh/agent.toml b/dot_config/1Password/ssh/agent.toml new file mode 100644 index 0000000..420beed --- /dev/null +++ b/dot_config/1Password/ssh/agent.toml @@ -0,0 +1,2 @@ +[[ssh-keys]] +vault = "Dotfiles" diff --git a/dot_config/zsh/split/aliases.zsh b/dot_config/zsh/split/aliases.zsh index 8919b0e..5790256 100644 --- a/dot_config/zsh/split/aliases.zsh +++ b/dot_config/zsh/split/aliases.zsh @@ -1,43 +1,15 @@ # ============================================================================= -# Aliases +# Aliases (command substitutions & safe defaults) # ============================================================================= +# Abbreviations (git shortcuts, tool shortcuts) are in abbreviations.zsh alias ls='eza --icons' alias ll='eza -l --icons --git' alias la='eza -la --icons --git' alias lt='eza --tree --icons --level=2' alias cat='bat --paging=never' -alias v='nvim' -alias vi='nvim' -alias vim='nvim' -alias lg='lazygit' -alias k='kubectl' - -# Git shortcuts (with completion support) -alias g='git' -alias ga='git add' -alias gaa='git add --all' -alias gb='git branch' -alias gc='git commit' -alias gcm='git commit -m' -alias gco='git checkout' -alias gcb='git checkout -b' -alias gd='git diff' -alias gds='git diff --staged' -alias gf='git fetch' -alias gl='git log --oneline -20' -alias gp='git push' -alias gpl='git pull' -alias gs='git status -sb' -alias gst='git status' -alias gsw='git switch' -alias gswc='git switch -c' # Safe defaults alias rm='rm -i' alias cp='cp -i' alias mv='mv -i' alias mkdir='mkdir -p' - -# Quick aliases for local config -alias le='local-env edit' -alias lz='local-zsh edit' diff --git a/dot_config/zsh/split/options.zsh b/dot_config/zsh/split/options.zsh index bfebbc0..76d02cf 100644 --- a/dot_config/zsh/split/options.zsh +++ b/dot_config/zsh/split/options.zsh @@ -38,24 +38,5 @@ zinit wait lucid light-mode for \ zstyle ":completion:*" use-cache on zstyle ":completion:*" cache-path "$XDG_CACHE_HOME/zsh/zcompcache" - # Git alias completion - compdef g=git - compdef _git ga=git-add - compdef _git gaa=git-add - compdef _git gb=git-branch - compdef _git gc=git-commit - compdef _git gcm=git-commit - compdef _git gco=git-checkout - compdef _git gcb=git-checkout - compdef _git gd=git-diff - compdef _git gds=git-diff - compdef _git gf=git-fetch - compdef _git gl=git-log - compdef _git gp=git-push - compdef _git gpl=git-pull - compdef _git gs=git-status - compdef _git gst=git-status - compdef _git gsw=git-switch - compdef _git gswc=git-switch ' \ zdharma-continuum/null diff --git a/dot_config/zsh/split/plugins.zsh b/dot_config/zsh/split/plugins.zsh index 84fb127..107ec8c 100644 --- a/dot_config/zsh/split/plugins.zsh +++ b/dot_config/zsh/split/plugins.zsh @@ -28,6 +28,46 @@ zinit wait lucid light-mode for \ zinit wait lucid light-mode for \ zsh-users/zsh-history-substring-search +_zinit_setup_abbr() { + # Session abbreviations: expand on Enter, full command saved in history + # Editor + abbr -S -qq v='nvim' + abbr -S -qq vi='nvim' + abbr -S -qq vim='nvim' + + # Tools + abbr -S -qq lg='lazygit' + abbr -S -qq k='kubectl' + + # Git + abbr -S -qq g='git' + abbr -S -qq ga='git add' + abbr -S -qq gaa='git add --all' + abbr -S -qq gb='git branch' + abbr -S -qq gc='git commit' + abbr -S -qq gcm='git commit -m' + abbr -S -qq gco='git checkout' + abbr -S -qq gcb='git checkout -b' + abbr -S -qq gd='git diff' + abbr -S -qq gds='git diff --staged' + abbr -S -qq gf='git fetch' + abbr -S -qq gl='git log --oneline -20' + abbr -S -qq gp='git push' + abbr -S -qq gpl='git pull' + abbr -S -qq gs='git status -sb' + abbr -S -qq gst='git status' + abbr -S -qq gsw='git switch' + abbr -S -qq gswc='git switch -c' + + # Quick access for local config + abbr -S -qq le='local-env edit' + abbr -S -qq lz='local-zsh edit' +} + +zinit wait lucid light-mode for \ + atload"_zinit_setup_abbr" \ + olets/zsh-abbr + # ============================================================================= # Powerlevel10k prompt # ============================================================================= diff --git a/dot_local/share/devbox/global/default/devbox.json b/dot_local/share/devbox/global/default/devbox.json index 72cf8da..af9cf9b 100644 --- a/dot_local/share/devbox/global/default/devbox.json +++ b/dot_local/share/devbox/global/default/devbox.json @@ -31,7 +31,8 @@ "gitleaks@latest", "glow@latest", "tree-sitter@latest", - "uv@latest" + "uv@latest", + "deno@latest" ], "shell": { "init_hook": [] diff --git a/dot_local/share/devbox/global/default/devbox.lock b/dot_local/share/devbox/global/default/devbox.lock index e4ef735..533c7b5 100644 --- a/dot_local/share/devbox/global/default/devbox.lock +++ b/dot_local/share/devbox/global/default/devbox.lock @@ -193,6 +193,54 @@ } } }, + "deno@latest": { + "last_modified": "2026-02-23T15:40:43Z", + "resolved": "github:NixOS/nixpkgs/80d901ec0377e19ac3f7bb8c035201e2e098cc97#deno", + "source": "devbox-search", + "version": "2.6.10", + "systems": { + "aarch64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/cyz295zqxf5k309zrrp2ks26x4vi8h7b-deno-2.6.10", + "default": true + } + ], + "store_path": "/nix/store/cyz295zqxf5k309zrrp2ks26x4vi8h7b-deno-2.6.10" + }, + "aarch64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/7qg9fjmprjlx16cq4dhvscdwak5wxn36-deno-2.6.10", + "default": true + } + ], + "store_path": "/nix/store/7qg9fjmprjlx16cq4dhvscdwak5wxn36-deno-2.6.10" + }, + "x86_64-darwin": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/6wxdsf71zn0qh8r8v0525kw2whbw7mxz-deno-2.6.10", + "default": true + } + ], + "store_path": "/nix/store/6wxdsf71zn0qh8r8v0525kw2whbw7mxz-deno-2.6.10" + }, + "x86_64-linux": { + "outputs": [ + { + "name": "out", + "path": "/nix/store/qx6qwzhfxqskg87zl9igij2nbk0kclmk-deno-2.6.10", + "default": true + } + ], + "store_path": "/nix/store/qx6qwzhfxqskg87zl9igij2nbk0kclmk-deno-2.6.10" + } + } + }, "direnv@latest": { "last_modified": "2025-11-23T21:50:36Z", "resolved": "github:NixOS/nixpkgs/ee09932cedcef15aaf476f9343d1dea2cb77e261#direnv", diff --git a/private_dot_ssh/config.tmpl b/private_dot_ssh/config.tmpl index 56a2024..3f7b6f8 100644 --- a/private_dot_ssh/config.tmpl +++ b/private_dot_ssh/config.tmpl @@ -10,6 +10,7 @@ Host * AddKeysToAgent yes {{- if eq .chezmoi.os "darwin" }} UseKeychain yes + IdentityAgent "~/Library/Group Containers/2BUA8C4S2C.com.1password/t/agent.sock" {{- end }} ForwardAgent yes ForwardX11 no From d1607375ca621326785f60fa7b59ff6a871e363f Mon Sep 17 00:00:00 2001 From: Ryota Ikezawa Date: Mon, 9 Mar 2026 10:30:08 +0900 Subject: [PATCH 2/2] fix(ci): bump devbox-install-action v0.11.0 to v0.14.0 The Nix installer bundled with v0.11.0 (DeterminateSystems/nix-installer-action@10) fails with "TypeError: Invalid URL". v0.14.0 bumps it to @19 which resolves the issue. --- .github/workflows/test.yml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml index 3ccd053..f69430e 100644 --- a/.github/workflows/test.yml +++ b/.github/workflows/test.yml @@ -243,7 +243,7 @@ jobs: echo "✓ Valid JSON" - name: Install devbox - uses: jetify-com/devbox-install-action@v0.11.0 + uses: jetify-com/devbox-install-action@v0.14.0 with: enable-cache: true project-path: dot_local/share/devbox/global/default