Compare commits

..

8 Commits

Author SHA1 Message Date
daniil-berg 7166d9196a fix(shell): bind arrows directly for bash history search
The macro form `"\e[A": "\C-x\C-p\C-e"` ran history-search-backward then
end-of-line to mimic zsh's cursor-at-end. But history-search-* takes its
prefix from start-of-line to point, and `\C-e` moves point to the end, so
the next Up searched for the whole recalled line, found nothing, and left
Up/Down dead after one press. Bind arrows straight to the search functions;
pure readline has no history-search-end widget, so cursor lands at the
prefix boundary.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-07-09 15:07:12 +02:00
daniil-berg 61de00137c shell: jump cursor to line end on bash history search
history-search-* leaves the cursor at the prefix boundary, not the end,
unlike zsh's history-search-end widget. Bind the search functions to
throwaway keys and map the arrows to a macro that runs the search then
end-of-line, so prefix recall lands the cursor at EOL like zsh.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-29 12:10:51 +02:00
daniil-berg ad5a6c98ea shell: centralize history config and create history dir
Move HISTFILE/HISTSIZE/SAVEHIST/HISTFILESIZE/HISTCONTROL into the shared
shell/exports as env vars; each shell ignores the other's name-specific
ones. Dedup that can't be an env var stays per-shell: HISTCONTROL=ignoreboth
for bash, setopt hist_ignore_all_dups/hist_ignore_space for zsh.

Also mkdir -p the HISTFILE parent in shell/interactive, so a fresh host
doesn't silently drop history when ~/.cache/shell is absent.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-29 11:49:55 +02:00
daniil-berg 634f4950f0 Add README 2026-06-29 11:27:50 +02:00
daniil-berg 5002a409f9 shell: bash readline prefix history search via XDG inputrc
Add $INPUTRC pointing at ~/.config/readline/inputrc and ship that file
with history-search Up/Down bindings (cursor to end), mirroring zsh's
history-beginning-search-end. zsh ignores readline, so this is bash-side
only. Includes /etc/inputrc to keep distro defaults.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-29 11:26:58 +02:00
daniil-berg 9262c9795a unify zsh+bash shell config; fix zsh startup
Support either shell as the login shell via stow selection (merges the
bashed branch in). shell/ holds shared POSIX env + interactive config;
each shell loads its own rc natively.

- zsh: add .zshenv (sets ZDOTDIR+env early), rename rc -> .zshrc, add
  login-only .zprofile (pyenv --path)
- bash: add ~/.bash_profile + ~/.bashrc stubs, .config/bash/{rc,prompt}
- shell: profile is POSIX env-only (no zsh-rc source); path rewritten
  POSIX + idempotent (flat ~/.local/bin, no subdir recursion); new
  interactive sources aliases/functions + pyenv shims
- drop dead shell/.zprofile symlink; move ZDOTDIR out of exports

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
2026-06-26 17:47:48 +02:00
daniil-berg a6a3d3a759 better zsh file setup 2022-02-17 10:35:01 +01:00
daniil-berg f526d17524 pyenv stuff 2022-02-17 10:31:59 +01:00
13 changed files with 301 additions and 16 deletions
+23
View File
@@ -0,0 +1,23 @@
# dotfiles
Designed around [GNU stow][gnu stow manual].
For `zsh` or `bash` (or both). Include `shell/` always.
## Install
```sh
git clone <repo> ~/.dotfiles
cd ~/.dotfiles
stow shell zsh # or: stow shell bash
```
## Update
```sh
cd ~/.dotfiles
git pull
stow -R shell zsh # restow this host's packages
```
[gnu stow manual]: https://www.gnu.org/software/stow/manual/stow.html
+8
View File
@@ -0,0 +1,8 @@
#!/usr/bin/env bash
# Bash login shell. Everything a non-login shell gets lives in ~/.bashrc, so
# source it, then add login-only bits.
[ -r ~/.bashrc ] && . ~/.bashrc
# pyenv shims dir (login only); PYENV_ROOT comes from ~/.config/shell/exports.
command -v pyenv >/dev/null 2>&1 && eval "$(pyenv init --path)"
+7
View File
@@ -0,0 +1,7 @@
#!/usr/bin/env bash
# Loaded by every interactive bash, and by login bash via ~/.bash_profile.
# Source env first (idempotent — covers non-login interactive shells that bash
# would otherwise start without it), then the real interactive config.
[ -r ~/.profile ] && . ~/.profile
[ -r ~/.config/bash/rc ] && . ~/.config/bash/rc
+123
View File
@@ -0,0 +1,123 @@
#!/usr/bin/env bash
# Source: https://github.com/mathiasbynens/dotfiles/
# Shell prompt based on the Solarized Dark theme.
# Screenshot: http://i.imgur.com/EkEtphC.png
# Heavily inspired by @necolass prompt: https://github.com/necolas/dotfiles
# iTerm → Profiles → Text → use 13pt Monaco with 1.1 vertical spacing.
# If not running interactively, don't do anything
[[ $- != *i* ]] && return
if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
export TERM='gnome-256color';
elif infocmp xterm-256color >/dev/null 2>&1; then
export TERM='xterm-256color';
fi;
prompt_git() {
local s='';
local branchName='';
# Check if the current directory is in a Git repository.
git rev-parse --is-inside-work-tree &>/dev/null || return;
# Check for what branch were on.
# Get the short symbolic ref. If HEAD isnt a symbolic ref, get a
# tracking remote branch or tag. Otherwise, get the
# short SHA for the latest commit, or give up.
branchName="$(git symbolic-ref --quiet --short HEAD 2> /dev/null || \
git describe --all --exact-match HEAD 2> /dev/null || \
git rev-parse --short HEAD 2> /dev/null || \
echo '(unknown)')";
# Early exit for Chromium & Blink repo, as the dirty check takes too long.
# Thanks, @paulirish!
# https://github.com/paulirish/dotfiles/blob/dd33151f/.bash_prompt#L110-L123
repoUrl="$(git config --get remote.origin.url)";
if grep -q 'chromium/src.git' <<< "${repoUrl}"; then
s+='*';
else
# Check for uncommitted changes in the index.
if ! $(git diff --quiet --ignore-submodules --cached); then
s+='+';
fi;
# Check for unstaged changes.
if ! $(git diff-files --quiet --ignore-submodules --); then
s+='!';
fi;
# Check for untracked files.
if [ -n "$(git ls-files --others --exclude-standard)" ]; then
s+='?';
fi;
# Check for stashed files.
if $(git rev-parse --verify refs/stash &>/dev/null); then
s+='$';
fi;
fi;
[ -n "${s}" ] && s=" [${s}]";
echo -e "${1}${branchName}${2}${s}";
}
if tput setaf 1 &> /dev/null; then
tput sgr0; # reset colors
bold=$(tput bold);
reset=$(tput sgr0);
# Solarized colors, taken from http://git.io/solarized-colors.
black=$(tput setaf 0);
blue=$(tput setaf 33);
cyan=$(tput setaf 37);
green=$(tput setaf 64);
orange=$(tput setaf 166);
purple=$(tput setaf 125);
red=$(tput setaf 124);
violet=$(tput setaf 61);
white=$(tput setaf 15);
yellow=$(tput setaf 136);
else
bold='';
reset="\e[0m";
black="\e[1;30m";
blue="\e[1;34m";
cyan="\e[1;36m";
green="\e[1;32m";
orange="\e[1;33m";
purple="\e[1;35m";
red="\e[1;31m";
violet="\e[1;35m";
white="\e[1;37m";
yellow="\e[1;33m";
fi;
# Highlight the user name when logged in as root.
if [[ "${USER}" == "root" ]]; then
userStyle="${red}";
else
userStyle="${orange}";
fi;
# Highlight the hostname when connected via SSH.
if [[ "${SSH_TTY}" ]]; then
hostStyle="${bold}${red}";
else
hostStyle="${yellow}";
fi;
# Set the terminal title and prompt.
PS1="\[\033]0;\W\007\]"; # working directory base name
PS1+="\[${bold}\]\n"; # newline
PS1+="\[${userStyle}\]\u"; # username
PS1+="\[${white}\] at ";
PS1+="\[${hostStyle}\]\h"; # host
PS1+="\[${white}\] in ";
PS1+="\[${green}\]\w"; # working directory full path
PS1+="\$(prompt_git \"\[${white}\] on \[${violet}\]\" \"\[${blue}\]\")"; # Git repository details
PS1+="\n";
PS1+="\[${white}\]\$ \[${reset}\]"; # `$` (and reset color)
export PS1;
PS2="\[${yellow}\]→ \[${reset}\]";
export PS2;
+46
View File
@@ -0,0 +1,46 @@
#!/usr/bin/env bash
# Mostly copied from: https://github.com/mathiasbynens/dotfiles/
# Shared interactive config (aliases, functions, pyenv shims):
[ -r ~/.config/shell/interactive ] && source ~/.config/shell/interactive
# Bash-specific:
[ -f ~/.config/bash/prompt ] && source ~/.config/bash/prompt
# Case-insensitive globbing (used in pathname expansion)
shopt -s nocaseglob;
# Append to the Bash history file, rather than overwriting it.
# (HISTFILE/HISTSIZE/HISTFILESIZE/HISTCONTROL come from ~/.config/shell/exports.)
shopt -s histappend;
# Autocorrect typos in path names when using `cd`
shopt -s cdspell;
# Enable some Bash 4 features when possible:
# * `autocd`, e.g. `**/qux` will enter `./foo/bar/baz/qux`
# * Recursive globbing, e.g. `echo **/*.txt`
for option in autocd globstar; do
shopt -s "$option" 2> /dev/null;
done;
# Add tab completion for many Bash commands
if which brew &> /dev/null && [ -r "$(brew --prefix)/etc/profile.d/bash_completion.sh" ]; then
# Ensure existing Homebrew v1 completions continue to work
export BASH_COMPLETION_COMPAT_DIR="$(brew --prefix)/etc/bash_completion.d";
source "$(brew --prefix)/etc/profile.d/bash_completion.sh";
elif [ -f /etc/bash_completion ]; then
source /etc/bash_completion;
fi;
# Enable tab completion for `g` by marking it as an alias for `git`
if type _git &> /dev/null; then
complete -o default -o nospace -F _git g;
fi;
# Add tab completion for SSH hostnames based on ~/.ssh/config, ignoring wildcards
[ -e "$HOME/.ssh/config" ] && complete -o "default" -o "nospace" -W "$(grep "^Host" ~/.ssh/config | grep -v "[?*]" | cut -d " " -f2- | tr ' ' '\n')" scp sftp ssh;
# Add tab completion for `defaults read|write NSGlobalDomain`
# You could just use `-g` instead, but I like being explicit
complete -W "NSGlobalDomain" defaults;
+20
View File
@@ -0,0 +1,20 @@
# Readline config (bash line editing + any readline program: python, psql...).
# Set via $INPUTRC; see shell/exports. zsh ignores this (uses ZLE); its
# equivalent prefix-search bindings live in zsh/.zshrc.
#
# Pull in distro defaults; a custom INPUTRC otherwise replaces them entirely.
$include /etc/inputrc
# zsh-style prefix history search: type a prefix, Up/Down walk matching
# history entries. Empty prefix = previous/next.
#
# Bind arrows straight to the search functions. Do NOT wrap in a macro that
# appends end-of-line (\C-e) to mimic zsh's cursor-at-end: \C-e moves point to
# the line end, and history-search-* takes its prefix from start-of-line to
# point -- so the next press searches for the whole recalled line, finds
# nothing, and Up/Down go dead. Pure readline has no history-search-end widget;
# cursor lands at the prefix boundary, which is readline's intended behavior.
"\e[A": history-search-backward
"\e[B": history-search-forward
"\eOA": history-search-backward
"\eOB": history-search-forward
+16 -4
View File
@@ -7,8 +7,14 @@ export XDG_CACHE_HOME="$HOME/.cache"
# Default editor
export EDITOR='vim'
# Shell history file
# Shell history (env vars both shells read; each ignores the other's by name —
# zsh uses SAVEHIST, bash uses HISTFILESIZE/HISTCONTROL. zsh dedup is a setopt,
# not an env var, so it stays in .zshrc).
export HISTFILE="${XDG_CACHE_HOME:-$HOME/.cache}/shell/history"
export HISTSIZE=1000000 # commands kept in memory (both shells)
export SAVEHIST=1000000 # zsh: lines written to $HISTFILE
export HISTFILESIZE=1000000 # bash: lines written to $HISTFILE
export HISTCONTROL=ignoreboth # bash: drop dups + space-prefixed
# Global git config file
export GIT_CONFIG_GLOBAL="${XDG_CONFIG_HOME:-$HOME/.config}/git/config"
@@ -24,11 +30,17 @@ export PYTHONSTARTUP="${XDG_CONFIG_HOME:-$HOME/.config}/python/startup"
# Custom Python history file
export PYTHON_HISTFILE="${XDG_CACHE_HOME:-$HOME/.cache}/python/history"
# Pyenv root:
[ -x "$(command -v pyenv)" ] && export PYENV_ROOT="$HOME/.pyenv"
# PostgreSQL config file
export PSQLRC="${XDG_CONFIG_HOME:-$HOME/.config}/psql/rc"
[ -x "$(command -v psql)" ] && export PSQLRC="${XDG_CONFIG_HOME:-$HOME/.config}/psql/rc"
# Wget config file
export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/rc"
# ZSH directory
export ZDOTDIR="${XDG_CONFIG_HOME:-$HOME/.config}/zsh"
# Readline config file (bash line editing + any readline program)
export INPUTRC="${XDG_CONFIG_HOME:-$HOME/.config}/readline/inputrc"
# NOTE: ZDOTDIR lives in ~/.zshenv, not here. It must be set before zsh reads
# any rc file, and this file is sourced too late for that.
+16
View File
@@ -0,0 +1,16 @@
#!/bin/sh
# Shared interactive shell config. Sourced by both zsh ($ZDOTDIR/.zshrc) and
# bash (~/.config/bash/rc). Only ever loaded by zsh/bash, so brace expansion is
# fine here (unlike the POSIX `profile`).
for _file in "${XDG_CONFIG_HOME:-$HOME/.config}"/shell/{aliases,functions,extra}; do
[ -r "$_file" ] && . "$_file"
done
unset _file
# Ensure the history dir exists; neither shell mkdir's it, so without this
# $HISTFILE writes fail silently on a fresh host.
[ -n "$HISTFILE" ] && mkdir -p "$(dirname "$HISTFILE")"
# pyenv interactive shims (pyenv init - autodetects the running shell):
command -v pyenv >/dev/null 2>&1 && eval "$(pyenv init -)"
+6 -2
View File
@@ -1,4 +1,8 @@
#!/bin/sh
# Adds `~/.local/bin` to $PATH
export PATH="$PATH:${$(find ~/.local/bin -type d -printf %p:)%%:}"
# Prepend ~/.local/bin to $PATH (POSIX, idempotent — safe to source twice).
case ":$PATH:" in
*":$HOME/.local/bin:"*) ;;
*) [ -d "$HOME/.local/bin" ] && PATH="$HOME/.local/bin:$PATH" ;;
esac
export PATH
+11 -7
View File
@@ -1,9 +1,13 @@
#!/bin/sh
# Load the shell dotfiles, and then some:
# * ~/.path can be used to extend `$PATH`.
# * ~/.extra can be used for other settings you dont want to commit.
for file in ~/.config/shell/{path,exports,aliases,functions,extra}; do
[ -r "$file" ] && [ -f "$file" ] && source "$file";
done;
unset file;
# POSIX login environment. Sourced directly by a /bin/sh login (display
# managers, plain sh) and indirectly by bash via ~/.bashrc. Env only — no
# brace expansion (dash doesn't expand it), no shell-specific rc.
#
# Interactive config (aliases, functions, prompt) is loaded by each shell's
# own rc via ~/.config/shell/interactive, not here.
for _name in path exports; do
_file="${XDG_CONFIG_HOME:-$HOME/.config}/shell/$_name"
[ -r "$_file" ] && . "$_file"
done
unset _name _file
+5
View File
@@ -0,0 +1,5 @@
#!/bin/sh
# zsh login shell only. PATH-level init that belongs to login (pyenv shims dir).
# PYENV_ROOT is exported earlier in ~/.config/shell/exports.
command -v pyenv >/dev/null 2>&1 && eval "$(pyenv init --path)"
+7 -3
View File
@@ -1,6 +1,10 @@
# Luke's config for the Zoomer Shell
# Source (mainly): https://github.com/LukeSmithxyz/voidrice/
# Shared interactive config (aliases, functions, pyenv shims):
[ -r "${XDG_CONFIG_HOME:-$HOME/.config}/shell/interactive" ] && \
. "${XDG_CONFIG_HOME:-$HOME/.config}/shell/interactive"
# Enable colors and change prompt:
autoload -U colors && colors # Load colors
PS1="%B%{$fg[red]%}[%{$fg[yellow]%}%n%{$fg[green]%}@%{$fg[blue]%}%M %{$fg[magenta]%}%~%{$fg[red]%}]%{$reset_color%}$%b "
@@ -8,9 +12,9 @@ setopt autocd # Automatically cd into typed directory.
stty stop undef # Disable ctrl-s to freeze terminal.
setopt interactive_comments
# History in cache directory:
HISTSIZE=10000000
SAVEHIST=10000000
# HISTFILE/HISTSIZE/SAVEHIST come from ~/.config/shell/exports (shared).
# Dedup is a setopt, not an env var (bash's HISTCONTROL=ignoreboth equivalent):
setopt hist_ignore_all_dups hist_ignore_space
# Basic auto/tab complete:
autoload -U compinit
+13
View File
@@ -0,0 +1,13 @@
#!/bin/sh
# Read first by zsh for EVERY shell (login or not), so this is the only place
# ZDOTDIR can be set early enough to redirect where zsh looks for its rc files.
export XDG_CONFIG_HOME="${XDG_CONFIG_HOME:-$HOME/.config}"
export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
# Shared POSIX environment (idempotent):
for _name in path exports; do
_file="$XDG_CONFIG_HOME/shell/$_name"
[ -r "$_file" ] && . "$_file"
done
unset _name _file