Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension


Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion .github/workflows/test.yml
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
2 changes: 2 additions & 0 deletions dot_config/1Password/ssh/agent.toml
Original file line number Diff line number Diff line change
@@ -0,0 +1,2 @@
[[ssh-keys]]
vault = "Dotfiles"
32 changes: 2 additions & 30 deletions dot_config/zsh/split/aliases.zsh
Original file line number Diff line number Diff line change
@@ -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'
19 changes: 0 additions & 19 deletions dot_config/zsh/split/options.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -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
40 changes: 40 additions & 0 deletions dot_config/zsh/split/plugins.zsh
Original file line number Diff line number Diff line change
Expand Up @@ -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
# =============================================================================
Expand Down
3 changes: 2 additions & 1 deletion dot_local/share/devbox/global/default/devbox.json
Original file line number Diff line number Diff line change
Expand Up @@ -31,7 +31,8 @@
"gitleaks@latest",
"glow@latest",
"tree-sitter@latest",
"uv@latest"
"uv@latest",
"deno@latest"
],
"shell": {
"init_hook": []
Expand Down
48 changes: 48 additions & 0 deletions dot_local/share/devbox/global/default/devbox.lock
Original file line number Diff line number Diff line change
Expand Up @@ -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",
Expand Down
1 change: 1 addition & 0 deletions private_dot_ssh/config.tmpl
Original file line number Diff line number Diff line change
Expand Up @@ -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
Expand Down
Loading