[ZSH] Add atuin history with cwd, own Ctrl-R
Co-Authored-By: Claude Opus 5.5 <noreply@anthropic.com>
This commit is contained in:
1 parent
e9a0636d27
commit
015027ed3b
5 files changed
+21
-3
No files matched your search
@@ -0,0 +1,7 @@
|
|||||||
|
## Overrides only; all defaults: `atuin default-config`
|
||||||
|
|
||||||
|
## brew/pacman handle updates; no version check against api.atuin.sh
|
||||||
|
update_check = false
|
||||||
|
|
||||||
|
## Enter puts the command on the prompt for editing (like fzf) instead of running it
|
||||||
|
enter_accept = false
|
||||||
@@ -21,7 +21,7 @@ Practical rule: **edit the `.example` source, not the generated symlink target.*
|
|||||||
|
|
||||||
## Component architecture
|
## Component architecture
|
||||||
|
|
||||||
- **zsh** (`zsh/.zshrc`): Powerlevel10k instant prompt + [antidote](https://github.com/mattmc3/antidote) plugin manager (plugin list in `zsh/.zsh_plugins.txt`). `.zshrc` sources optional layered configs if present: `.powerline_config`, `.user_config`, `.virtual_env_config.zsh`, `.mac_config.zsh`, `.local_config`. `update_dotfiles()` auto-`git pull`s this repo in the background on every shell start. Machine-local overrides belong in `.local_config` (not committed).
|
- **zsh** (`zsh/.zshrc`): Powerlevel10k instant prompt + [antidote](https://github.com/mattmc3/antidote) plugin manager (plugin list in `zsh/.zsh_plugins.txt`). `.zshrc` sources optional layered configs if present: `.powerline_config`, `.user_config`, `.virtual_env_config.zsh`, `.mac_config.zsh`, `.local_config`. `update_dotfiles()` auto-`git pull`s this repo in the background on every shell start. Machine-local overrides belong in `.local_config` (not committed). [atuin](https://github.com/atuinsh/atuin) records history with cwd/exit code and owns Ctrl-R (over fzf); its config is `.config/atuin/config.toml` via `ATUIN_CONFIG_DIR`, data stays in `~/.atuin`.
|
||||||
- **nvim** (`nvim/init.vim`): [vim-plug](https://github.com/junegunn/vim-plug), auto-bootstrapped on first launch (`:PlugInstall`). Python provider points at the `~/python-envs/neovim` virtualenv on Apple Silicon. `colors/` holds a large bundled colorscheme collection.
|
- **nvim** (`nvim/init.vim`): [vim-plug](https://github.com/junegunn/vim-plug), auto-bootstrapped on first launch (`:PlugInstall`). Python provider points at the `~/python-envs/neovim` virtualenv on Apple Silicon. `colors/` holds a large bundled colorscheme collection.
|
||||||
- **tmux** (`tmux/.tmux.conf`): TPM-style `plugins/`. `tmux/tmux_attach.sh` is an attach helper. On macOS, `.mac_config` binds `prefix+P` to `tmux/op_password_paste.zsh` (pastes a 1Password password into the pane, e.g. remote sudo; needs the `op` CLI with app integration).
|
- **tmux** (`tmux/.tmux.conf`): TPM-style `plugins/`. `tmux/tmux_attach.sh` is an attach helper. On macOS, `.mac_config` binds `prefix+P` to `tmux/op_password_paste.zsh` (pastes a 1Password password into the pane, e.g. remote sudo; needs the `op` CLI with app integration).
|
||||||
- **alacritty** (`.config/alacritty/`): active theme selected via the `import = [...]` line in `alacritty.toml`.
|
- **alacritty** (`.config/alacritty/`): active theme selected via the `import = [...]` line in `alacritty.toml`.
|
||||||
|
|||||||
+1
-1
@@ -9,7 +9,7 @@ set -e
|
|||||||
|
|
||||||
sudo pacman --needed -Sy archlinux-keyring --noconfirm
|
sudo pacman --needed -Sy archlinux-keyring --noconfirm
|
||||||
sudo pacman --needed -Syu --noconfirm
|
sudo pacman --needed -Syu --noconfirm
|
||||||
sudo pacman --needed -Sy base-devel gnome neovim zsh tmux openssh alacritty powerline-fonts otf-firamono-nerd prettier python-pip python-pynvim --noconfirm
|
sudo pacman --needed -Sy base-devel gnome neovim zsh tmux openssh alacritty powerline-fonts otf-firamono-nerd prettier python-pip python-pynvim atuin --noconfirm
|
||||||
|
|
||||||
./clone_and_link.sh
|
./clone_and_link.sh
|
||||||
./copy_fonts_arch.sh
|
./copy_fonts_arch.sh
|
||||||
|
|||||||
+1
-1
@@ -6,7 +6,7 @@
|
|||||||
# Distributed under terms of the MIT license.
|
# Distributed under terms of the MIT license.
|
||||||
#
|
#
|
||||||
|
|
||||||
brew install neovim tmux coreutils cmake golang jq npm prettier virtualenvwrapper fzf git-delta skills
|
brew install neovim tmux coreutils cmake golang jq npm prettier virtualenvwrapper fzf atuin git-delta skills
|
||||||
brew install --cask font-fira-mono-nerd-font 1password-cli
|
brew install --cask font-fira-mono-nerd-font 1password-cli
|
||||||
./install_alacritty_mac.sh
|
./install_alacritty_mac.sh
|
||||||
BREW_PREFIX="$(brew --prefix)"
|
BREW_PREFIX="$(brew --prefix)"
|
||||||
|
|||||||
+11
@@ -62,6 +62,17 @@ VI_MODE_SET_CURSOR=true
|
|||||||
source $REPLY
|
source $REPLY
|
||||||
_zst_mark fzf
|
_zst_mark fzf
|
||||||
|
|
||||||
|
# atuin: history with cwd/exit code; after fzf so its Ctrl-R wins. Keeps up-arrow
|
||||||
|
# and ? (no Atuin AI).
|
||||||
|
if (( $+commands[atuin] )); then
|
||||||
|
export ATUIN_CONFIG_DIR=~/dotfiles/.config/atuin
|
||||||
|
_zsh_cached atuin.zsh ${commands[atuin]:A} $ATUIN_CONFIG_DIR/config.toml \
|
||||||
|
-- atuin init zsh --disable-up-arrow --disable-ai && source $REPLY
|
||||||
|
# no `atuin search` spawn per keystroke (autosuggest runs synchronously)
|
||||||
|
ZSH_AUTOSUGGEST_STRATEGY=(${ZSH_AUTOSUGGEST_STRATEGY:#atuin})
|
||||||
|
fi
|
||||||
|
_zst_mark atuin
|
||||||
|
|
||||||
[[ -f ~/.zsh/.mac_config.zsh ]] && source ~/.zsh/.mac_config.zsh
|
[[ -f ~/.zsh/.mac_config.zsh ]] && source ~/.zsh/.mac_config.zsh
|
||||||
_zst_mark mac-config
|
_zst_mark mac-config
|
||||||
# deps: go binary and `go env -w` files (macOS, Linux)
|
# deps: go binary and `go env -w` files (macOS, Linux)
|
||||||
|
|||||||
Reference in new issue
Block a user