Compare commits

..

2 Commits

Author SHA1 Message Date
dissimulo 5bed5f7746 gitconfig: use absolute include path for .gitconfig.user
Close stale issues / stale (push) Has been cancelled
The previous `[include] path = .gitconfig.user` was resolved relative to
the config file being read, which — because `~/.gitconfig` is a symlink
to `~/.yadr/git/gitconfig` — meant git looked for the user-identity
override at `~/.yadr/git/.gitconfig.user` instead of the conventional
`~/.gitconfig.user`. Switch to an absolute path so the include picks up
the homedir file regardless of symlink layout.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-27 07:41:12 -07:00
dissimulo 59a5c0bbf8 install.sh: merge PERSONAL_DIRS contents instead of wholesale replace
The previous deploy_one() did `mv $HOME/<dir> $BACKUP_DIR/<dir>` then
`cp -a $YADR_DIR/<dir> $HOME/<dir>` for every entry in PERSONAL_DIRS.
For dirs the repo only partially populates (notably .local — repo only
tracks .local/bin/), this swept away unrelated user data: the most
recent re-bootstrap moved ~/.local/share/fonts/ (Intel One Mono, Open
Gorton, Roboto Mono, GALLAUDET, code128) into the timestamped backup,
making them appear missing.

Rework deploy logic:
- deploy_file: copies one file/symlink, backing up only the conflicting
  destination (if any). Idempotent via paths_equivalent() so re-runs
  with no changes produce no output and no spurious backups.
- deploy_dir: walks the repo's tree for that dir and deploys each leaf
  via deploy_file. Files in $HOME the repo doesn't know about are left
  untouched. Subdirs are mkdir'd as needed.

Also: track the personal fonts at .local/share/fonts/ so they redeploy
on every install, and run fc-cache -f at the end so apps see them
without a logout/login.

Co-Authored-By: Claude Opus 4.7 (1M context) <noreply@anthropic.com>
2026-04-27 07:28:40 -07:00
14 changed files with 134 additions and 332 deletions
-33
View File
@@ -1,33 +0,0 @@
# Never track Claude Code per-machine state, secrets, or chat data.
#
# settings.json IS tracked (portable user prefs + permissions allowlist).
# Everything else under ~/.claude/ stays per-host: credentials, session
# logs, project memories, file-edit history, telemetry, caches.
# Auth — must NEVER be tracked
.credentials.json
# Per-machine settings overrides (by Claude Code convention)
settings.local.json
# Chat and session data
history.jsonl
sessions/
projects/
file-history/
plans/
# Caches and ephemeral state
cache/
downloads/
paste-cache/
shell-snapshots/
session-env/
backups/
telemetry/
mcp-needs-auth-cache.json
# Plugin marketplace state — known_marketplaces.json IS portable, but the
# resolved-plugin caches and the local blocklist are per-machine.
plugins/blocklist.json
plugins/marketplaces/
-58
View File
@@ -1,58 +0,0 @@
{
"permissions": {
"allow": [
"Bash(tmux source-file:*)",
"Bash(git:*)",
"Bash(curl:*)",
"Bash(sudo:*)",
"Bash(find:*)",
"Bash(ls:*)",
"Bash(cat:*)",
"Bash(systemctl:*)",
"Bash(sysctl:*)",
"Bash(crontab:*)",
"Bash(dig:*)",
"Bash(ulimit:*)",
"Bash(python3:*)",
"Bash(iptables:*)",
"Bash(ip6tables:*)",
"Bash(ufw status:*)",
"Bash(firewall-cmd:*)",
"Bash(apt list:*)",
"Bash(apt-get install:*)",
"Bash(apt-get upgrade:*)",
"Bash(dpkg:*)",
"Bash(fail2ban-client status:*)",
"Bash(fail2ban-client set:*)",
"Bash(aa-status)",
"Bash(getenforce)",
"Bash(mount)",
"Bash(netstat -tuln)",
"Bash(netstat -tlnp)",
"Bash(openssl x509:*)",
"Bash(openssl rand:*)",
"Bash(grep -v \"^$\")",
"Bash(du -sh /var/log/*)",
"Bash(lsmod)",
"Bash(xargs ls:*)",
"Bash(last:*)",
"Bash(nginx:*)",
"Bash(redis-cli:*)",
"Bash(rkhunter:*)",
"Bash(aideinit)",
"Bash(npm --version)",
"Bash(ruby --version)",
"Bash(getent passwd:*)",
"Bash(sqlite3:*)",
"Read(//home/**)",
"Read(//opt/**)",
"Read(//etc/nginx/sites-enabled/**)",
"Read(//etc/nginx/sites-available/**)"
],
"defaultMode": "auto"
},
"theme": "dark-daltonized",
"verbose": true,
"tui": "fullscreen",
"skipAutoPermissionPrompt": true
}
+19 -55
View File
@@ -1,69 +1,33 @@
#!/bin/bash #!/bin/bash
# #
# Print the "best" IP for the tmux status bar. # Print the "best" IP for the tmux status bar.
# # Preference: DO reserved/floating IP > public egress (ipify) > first local IP.
# Shows a directly-held public/WAN IP when the machine has one on an interface,
# otherwise its LAN/private IP. No external "what's my IP" lookup -- a NAT'd box
# shows its LAN IP, never the gateway's egress. Works the same everywhere: a box
# with a public IP on a NIC (incl. a cloud droplet's eth0) shows that WAN IP; a
# NAT'd box shows its LAN IP. The VPN overlay is added separately by tmux-net via
# tmux-vpn-ip and is untouched here.
# #
set -u set -u
# This machine's own non-loopback IPv4 addresses, one per line. VPN tunnels are META="http://169.254.169.254/metadata/v1"
# excluded (tmux-net surfaces the VPN address separately as the ⇡ segment). CURL="curl -sf --connect-timeout 1 --max-time 2"
list_ipv4() {
if command -v ip >/dev/null 2>&1; then is_digitalocean() {
ip -4 -o addr show scope global 2>/dev/null \ [ -r /sys/class/dmi/id/sys_vendor ] \
| awk '$2 !~ /^(tun|wg|ppp|tap)/ {print $4}' | cut -d/ -f1 && grep -qi digitalocean /sys/class/dmi/id/sys_vendor
elif hostname -I >/dev/null 2>&1; then
hostname -I 2>/dev/null | tr ' ' '\n'
else
ifconfig 2>/dev/null | awk '/inet /{print $2}'
fi | grep -E '^([0-9]{1,3}\.){3}[0-9]{1,3}$' | grep -v '^127\.'
} }
# RFC1918 / link-local / CGNAT -- not a directly-routable WAN address. do_anchor_ip() {
is_private_ipv4() { local kind active ip
case "$1" in for kind in reserved_ip floating_ip; do
10.*|192.168.*|169.254.*) return 0 ;; active=$($CURL "$META/$kind/ipv4/active" 2>/dev/null) || continue
172.1[6-9].*|172.2[0-9].*|172.3[01].*) return 0 ;; [ "$active" = "true" ] || continue
100.6[4-9].*|100.[7-9][0-9].*|100.1[01][0-9].*|100.12[0-7].*) return 0 ;; ip=$($CURL "$META/$kind/ipv4/ip_address" 2>/dev/null) || continue
*) return 1 ;; [ -n "$ip" ] && { printf '%s\n' "$ip"; return 0; }
esac done
}
# First directly-held public/WAN IP, if the machine has one on an interface.
public_ip() {
local ip
while IFS= read -r ip; do
[ -n "$ip" ] || continue
is_private_ipv4 "$ip" || { printf '%s\n' "$ip"; return 0; }
done <<EOF
$(list_ipv4)
EOF
return 1 return 1
} }
# Fallback: the machine's primary interface IP (covers macOS and odd setups). if is_digitalocean && do_anchor_ip; then
print_local_ip() { exit 0
local iface ip
if command -v ipconfig >/dev/null 2>&1; then
for iface in en0 en1 en2; do
ip=$(ipconfig getifaddr "$iface" 2>/dev/null) || true
[ -n "${ip:-}" ] && { printf '%s\n' "$ip"; return 0; }
done
fi fi
if hostname -I >/dev/null 2>&1; then
hostname -I | awk '{print $1}'
return 0
fi
ifconfig 2>/dev/null | awk '/inet /{ if ($2 != "127.0.0.1") { print $2; exit } }'
}
# A directly-held public/WAN IP if the box has one, else the LAN IP. curl -s --connect-timeout 3 https://api.ipify.org 2>/dev/null \
ip=$(public_ip || true) || hostname -I | awk '{print $1}'
[ -z "${ip:-}" ] && ip=$(print_local_ip)
printf '%s\n' "${ip:-}"
-20
View File
@@ -1,20 +0,0 @@
#!/bin/bash
#
# Emit the tmux status-bar network segment.
# No VPN: "⌂ <local_ip>"
# VPN up: "⌂ <local_ip> / ⇡ <vpn_ip>"
# Offline: "✕" (no local IP and no VPN tunnel)
#
set -u
local_ip=$("$HOME/.local/bin/tmux-ip" 2>/dev/null || true)
vpn_ip=$("$HOME/.local/bin/tmux-vpn-ip" 2>/dev/null || true)
if [ -z "${local_ip:-}" ] && [ -z "${vpn_ip:-}" ]; then
printf '\xe2\x9c\x95 \n' # ✕ no active connection (trailing space for padding)
elif [ -n "${vpn_ip:-}" ]; then
printf '\xe2\x8c\x82 %s / \xe2\x87\xa1 %s\n' "${local_ip:-}" "$vpn_ip"
else
printf '\xe2\x8c\x82 %s\n' "${local_ip:-}"
fi
-24
View File
@@ -1,24 +0,0 @@
#!/bin/bash
#
# Print the IPv4 of the first active VPN tunnel interface, if any.
# Empty output when no VPN is up.
#
# macOS: utun* Linux: tun*, wg*, ppp*
set -u
case "$(uname -s)" in
Darwin)
ifconfig 2>/dev/null | awk '
/^utun[0-9]+:/ { iface=$1; sub(":", "", iface); next }
/^[a-z]+[0-9]*:/ { iface="" }
iface != "" && $1 == "inet" { print $2; exit }
'
;;
Linux)
if command -v ip >/dev/null 2>&1; then
ip -4 -o addr show 2>/dev/null \
| awk '$2 ~ /^(tun|wg|ppp)[0-9]+/ { sub("/.*","",$4); print $4; exit }'
fi
;;
esac
+4 -17
View File
@@ -2,20 +2,7 @@
set -g bell-action any set -g bell-action any
# Default termtype. If the rcfile sets $TERM, that overrides this value. # Default termtype. If the rcfile sets $TERM, that overrides this value.
set -g default-terminal "tmux-256color" set -g default-terminal screen-256color
# Truecolor + clipboard passthrough for outer terminals that advertise RGB
# (covers xterm-*, alacritty, kitty, wezterm, iTerm, ghostty, modern Apple Terminal).
set -ga terminal-features ",xterm-256color:RGB"
set -ga terminal-features ",alacritty:RGB"
set -ga terminal-features ",kitty:RGB"
set -ga terminal-features ",wezterm:RGB"
set -ga terminal-features ",ghostty:RGB"
set -ga terminal-features ",screen-256color:RGB"
# TUI apps (Claude Code, nvim, etc.) want focus events so they can redraw
# / refresh state when the pane regains focus.
set -g focus-events on
# Keep your finger on ctrl, or don't # Keep your finger on ctrl, or don't
bind-key ^D detach-client bind-key ^D detach-client
@@ -79,9 +66,9 @@ set -g pane-border-style fg=colour245
set -g pane-active-border-style fg=colour39 set -g pane-active-border-style fg=colour39
set -g message-style fg=colour16,bg=colour221,bold set -g message-style fg=colour16,bg=colour221,bold
set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]#[fg=colour245,bg=colour238,bold] #(whoami) ' set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]#[fg=colour245,bg=colour238,bold] #(whoami) '
set -g status-right '#[bold][#[nobold,fg=colour229]#h#[fg=default] / #[fg=colour229]#(~/.local/bin/tmux-net)#[fg=default,bold]]#[nobold,fg=colour255] %-I:%M%P %d-%b-%Y ' set -g status-right '#[bold][#[nobold,fg=colour229]#H#[fg=default] / #[fg=colour229]#(~/.local/bin/tmux-ip)#[fg=default,bold]]#[nobold,fg=colour255] %H:%M %d-%b-%Y '
set -g window-status-format '#[fg=colour235,bg=colour252,nobold] #{?#{==:#{window_index},1},❶,#{?#{==:#{window_index},2},❷,#{?#{==:#{window_index},3},❸,#{?#{==:#{window_index},4},❹,#{?#{==:#{window_index},5},❺,#{?#{==:#{window_index},6},❻,#{?#{==:#{window_index},7},❼,#{?#{==:#{window_index},8},❽,#{?#{==:#{window_index},9},❾,#{?#{==:#{window_index},10},❿,#{window_index}}}}}}}}}}} #{b:pane_current_path} #W ' set -g window-status-format '#[fg=colour235,bg=colour252,nobold] #(~/.local/bin/tmux-window-icon #{window_index}) #(pwd="#{pane_current_path}"; echo ${pwd####*/}) #W '
set -g window-status-current-format '#[fg=colour234,bg=colour39,bold] [#[fg=colour232,bold]#{?window_zoomed_flag,#[fg=colour228],} #{?#{==:#{window_index},1},❶,#{?#{==:#{window_index},2},❷,#{?#{==:#{window_index},3},❸,#{?#{==:#{window_index},4},❹,#{?#{==:#{window_index},5},❺,#{?#{==:#{window_index},6},❻,#{?#{==:#{window_index},7},❼,#{?#{==:#{window_index},8},❽,#{?#{==:#{window_index},9},❾,#{?#{==:#{window_index},10},❿,#{window_index}}}}}}}}}}} #{b:pane_current_path} #W #[fg=colour234,bold]] ' set -g window-status-current-format '#[fg=colour234,bg=colour39,bold] [#[fg=colour232,bold]#{?window_zoomed_flag,#[fg=colour228],} #(~/.local/bin/tmux-window-icon #{window_index}) #(pwd="#{pane_current_path}"; echo ${pwd####*/}) #W #[fg=colour234,bold]] '
set-option -g status-interval 60 set-option -g status-interval 60
# Patch for OS X pbpaste and pbcopy under tmux. # Patch for OS X pbpaste and pbcopy under tmux.
-40
View File
@@ -102,46 +102,6 @@ On top of stock YADR:
- Misc: `.rainbow_config.json` (rainbowstream), `.nanorc`, `.selected_editor`, - Misc: `.rainbow_config.json` (rainbowstream), `.nanorc`, `.selected_editor`,
`.mplayer/config`, `.jigdo-lite` `.mplayer/config`, `.jigdo-lite`
## Rainbow output (lolcat)
`zsh/lolcat.zsh` wires [lolcat](https://github.com/busyloop/lolcat) (Debian's
`/usr/games/lolcat`, busyloop's Ruby build — 24-bit truecolor) into a few shell
helpers. lolcat auto-detects a tty — it colorizes straight to the terminal but
passes text through plain when piped onward, so use `-f`/`--force` to colorize
mid-pipeline.
### Opt-in, per command
Prefix any command to rainbow its output:
```sh
lol fastfetch
lol git log --oneline
lol ls -C # -C keeps columns: a piped ls otherwise goes single-column
lolf git diff | less -R # force color so it survives down a pipeline
```
### Shortcuts
```sh
rcat file.txt # rainbow cat
rls -la # rainbow ls, columns preserved
some-cmd | rless # rainbow + pager (less -R)
```
### Session toggle
Rainbow *all* shell stdout until you turn it off:
```sh
rainbow_on # everything is rainbow now
...
rainbow_off # back to normal
```
Novelty only: it garbles full-screen/interactive programs (vim, less, htop,
fzf, ssh) and the prompt, and buffers streaming output. Doesn't touch stderr.
## Upstream ## Upstream
Base is [skwp/dotfiles][yadr] (YADR — Yet Another Dotfiles Repo). All credit Base is [skwp/dotfiles][yadr] (YADR — Yet Another Dotfiles Repo). All credit
+2 -9
View File
@@ -210,7 +210,7 @@ def install_term_theme
message = "Which theme would you like to apply to your iTerm2 profile?" message = "Which theme would you like to apply to your iTerm2 profile?"
color_scheme = ask message, iTerm_available_themes color_scheme = ask message, iTerm_available_themes
return if color_scheme.nil? || color_scheme == 'None' return if color_scheme == 'None'
color_scheme_file = File.join('iTerm2', "#{color_scheme}.itermcolors") color_scheme_file = File.join('iTerm2', "#{color_scheme}.itermcolors")
@@ -220,8 +220,6 @@ def install_term_theme
profiles << 'All' profiles << 'All'
selected = ask message, profiles selected = ask message, profiles
return if selected.nil?
if selected == 'All' if selected == 'All'
(profiles.size-1).times { |idx| apply_theme_to_iterm_profile_idx idx, color_scheme_file } (profiles.size-1).times { |idx| apply_theme_to_iterm_profile_idx idx, color_scheme_file }
else else
@@ -246,12 +244,7 @@ def ask(message, values)
puts message puts message
while true while true
values.each_with_index { |val, idx| puts " #{idx+1}. #{val}" } values.each_with_index { |val, idx| puts " #{idx+1}. #{val}" }
input = STDIN.gets selection = STDIN.gets.chomp
if input.nil?
puts "(no input available — skipping prompt)"
return nil
end
selection = input.chomp
if (Float(selection)==nil rescue true) || selection.to_i < 0 || selection.to_i > values.size+1 if (Float(selection)==nil rescue true) || selection.to_i < 0 || selection.to_i > values.size+1
puts "ERROR: Invalid selection.\n\n" puts "ERROR: Invalid selection.\n\n"
else else
-3
View File
@@ -1,8 +1,5 @@
# set your user tokens as environment variables, such as ~/.secrets # set your user tokens as environment variables, such as ~/.secrets
# See the README for examples. # See the README for examples.
[user]
name = dissimulo
email = connect+gitea@dustin-williams.com
[color] [color]
ui = true ui = true
[color "branch"] [color "branch"]
+6 -24
View File
@@ -36,7 +36,7 @@ PERSONAL_FILES=(
# untouched. This deliberately avoids wholesale-replacing $HOME/.local etc., # untouched. This deliberately avoids wholesale-replacing $HOME/.local etc.,
# which would sweep away unrelated user data (fonts, app state, ...). # which would sweep away unrelated user data (fonts, app state, ...).
PERSONAL_DIRS=( PERSONAL_DIRS=(
.fonts .irssi .nano .themes .local .mplayer .claude .fonts .irssi .nano .themes .local .mplayer
) )
have() { command -v "$1" >/dev/null 2>&1; } have() { command -v "$1" >/dev/null 2>&1; }
@@ -162,29 +162,11 @@ log "Deploying personal dotfiles"
for f in "${PERSONAL_FILES[@]}"; do deploy_file "$f"; done for f in "${PERSONAL_FILES[@]}"; do deploy_file "$f"; done
for d in "${PERSONAL_DIRS[@]}"; do deploy_dir "$d"; done for d in "${PERSONAL_DIRS[@]}"; do deploy_dir "$d"; done
# .local/bin/claude is a relative symlink to ../share/claude/versions/<version>. # .local/bin/claude is a relative symlink to ../share/claude/versions/...
# The version baked into the repo snapshot is whatever was current when this # If that target isn't present on this machine, remove the dangling link so
# was last committed; on a fresh host that exact version probably isn't # Claude Code's own installer (next step) can manage it.
# installed. Resolve as follows: if [ -L "$HOME/.local/bin/claude" ] && [ ! -e "$HOME/.local/bin/claude" ]; then
# 1. If the deployed symlink already resolves, leave it alone. rm "$HOME/.local/bin/claude"
# 2. Else, if any other Claude version is present under
# ~/.local/share/claude/versions/, repoint the symlink to the highest
# one (semver sort) so users get the latest installed binary.
# 3. Else, drop the dangling link and let Claude Code's own installer
# (next step) recreate it.
claude_link="$HOME/.local/bin/claude"
claude_versions_dir="$HOME/.local/share/claude/versions"
if [ -L "$claude_link" ] && [ ! -e "$claude_link" ]; then
latest_claude=""
if [ -d "$claude_versions_dir" ]; then
latest_claude="$(ls -1 "$claude_versions_dir" 2>/dev/null | sort -V | tail -1)"
fi
if [ -n "$latest_claude" ] && [ -e "$claude_versions_dir/$latest_claude" ]; then
ln -sfn "../share/claude/versions/$latest_claude" "$claude_link"
info "Repointed ~/.local/bin/claude -> $latest_claude (latest installed)"
else
rm "$claude_link"
fi
fi fi
# 4. Install Claude Code (Anthropic's CLI). Skip if already installed or # 4. Install Claude Code (Anthropic's CLI). Skip if already installed or
-1
View File
@@ -1 +0,0 @@
../.tmux.conf
+102
View File
@@ -0,0 +1,102 @@
# Ring the bell if any background window rang a bell
set -g bell-action any
# Default termtype. If the rcfile sets $TERM, that overrides this value.
set -g default-terminal screen-256color
# Keep your finger on ctrl, or don't
bind-key ^D detach-client
# Create splits and vertical splits
bind-key v split-window -h -p 50 -c "#{pane_current_path}"
bind-key ^V split-window -h -p 50 -c "#{pane_current_path}"
bind-key s split-window -p 50 -c "#{pane_current_path}"
bind-key ^S split-window -p 50 -c "#{pane_current_path}"
# Pane resize in all four directions using vi bindings.
# Can use these raw but I map them to shift-ctrl-<h,j,k,l> in iTerm.
bind -r H resize-pane -L 5
bind -r J resize-pane -D 5
bind -r K resize-pane -U 5
bind -r L resize-pane -R 5
# Smart pane switching with awareness of Vim splits.
# See: https://github.com/christoomey/vim-tmux-navigator
is_vim="ps -o state= -o comm= -t '#{pane_tty}' \
| grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'"
bind-key -n 'C-h' if-shell "$is_vim" 'send-keys C-h' 'select-pane -L'
bind-key -n 'C-j' if-shell "$is_vim" 'send-keys C-j' 'select-pane -D'
bind-key -n 'C-k' if-shell "$is_vim" 'send-keys C-k' 'select-pane -U'
bind-key -n 'C-l' if-shell "$is_vim" 'send-keys C-l' 'select-pane -R'
tmux_version='$(tmux -V | sed -En "s/^tmux ([0-9]+(.[0-9]+)?).*/\1/p")'
if-shell -b '[ "$(echo "$tmux_version < 3.0" | bc)" = 1 ]' \
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\' 'select-pane -l'"
if-shell -b '[ "$(echo "$tmux_version >= 3.0" | bc)" = 1 ]' \
"bind-key -n 'C-\\' if-shell \"$is_vim\" 'send-keys C-\\\\' 'select-pane -l'"
bind-key -T copy-mode-vi 'C-h' select-pane -L
bind-key -T copy-mode-vi 'C-j' select-pane -D
bind-key -T copy-mode-vi 'C-k' select-pane -U
bind-key -T copy-mode-vi 'C-l' select-pane -R
bind-key -T copy-mode-vi 'C-\' select-pane -l
# Use vi keybindings for tmux commandline input.
# Note that to get command mode you need to hit ESC twice...
set -g status-keys vi
# Use vi keybindings in copy and choice modes
setw -g mode-keys vi
# easily toggle synchronization (mnemonic: e is for echo)
# sends input to all panes in a given window.
bind e setw synchronize-panes on
bind E setw synchronize-panes off
# set first window to index 1 (not 0) to map more to the keyboard layout...
set-option -g base-index 1
set-window-option -g pane-base-index 1
set-window-option -g mouse on
# color scheme (styled as vim-powerline)
set -g status-left-length 52
set -g status-right-length 451
set -g status-style fg=white,bg=colour234
set -g pane-border-style fg=colour245
set -g pane-active-border-style fg=colour39
set -g message-style fg=colour16,bg=colour221,bold
set -g status-left '#[fg=colour235,bg=colour252,bold] ❐ #S #[fg=colour252,bg=colour238,nobold]⮀#[fg=colour245,bg=colour238,bold] #(whoami) #[fg=colour238,bg=colour234,nobold]⮀'
set -g window-status-format '#[fg=colour235,bg=colour252,bold] #I #(pwd="#{pane_current_path}"; echo ${pwd####*/}) #W '
set -g window-status-current-format '#[fg=colour234,bg=colour39]⮀#[fg=black,bg=colour39,noreverse,bold] #{?window_zoomed_flag,#[fg=colour228],} #I #(pwd="#{pane_current_path}"; echo ${pwd####*/}) #W #[fg=colour39,bg=colour234,nobold]⮀'
set-option -g status-interval 2
# Patch for OS X pbpaste and pbcopy under tmux.
set-option -g default-command "which reattach-to-user-namespace > /dev/null && reattach-to-user-namespace -l $SHELL || $SHELL"
# Screen like binding
unbind C-b
set -g prefix C-a
bind a send-prefix
# No escape time for vi mode
set -sg escape-time 0
# Screen like binding for last window
unbind l
bind C-a last-window
# Bigger history
set -g history-limit 10000
# New windows/pane in $PWD
bind c new-window -c "#{pane_current_path}"
# Fix key bindings broken in tmux 2.1
set -g assume-paste-time 0
# force a reload of the config file
unbind r
bind r source-file ~/.tmux.conf \; display "Reloaded!"
# Local config
if-shell "[ -f ~/.tmux.conf.user ]" 'source ~/.tmux.conf.user'
-13
View File
@@ -1,13 +0,0 @@
# Eagerly define `diff` as a real function instead of relying on prezto's
# autoload stub. The autoload stub emits
# "(eval):1: diff: function definition file not found"
# in non-interactive eval contexts where $fpath doesn't yet include the
# prezto utility module's functions directory. Defining a real function
# here bypasses the autoload path entirely.
function diff {
if (( $+commands[colordiff] )); then
command diff --unified "$@" | colordiff --difftype diffu
else
command diff --unified "$@"
fi
}
-33
View File
@@ -1,33 +0,0 @@
# zsh/lolcat.zsh (drunkendotfiles) — auto-sourced via ~/.zshrc: for f in ~/.yadr/zsh/*.zsh
# Rainbow-output helpers built on lolcat = Debian's busyloop Ruby build at
# /usr/games/lolcat (upstream github.com/busyloop/lolcat; 24-bit truecolor).
# It auto-detects a tty, so use -f/--force-color to colorize mid-pipeline.
# This lolcat is truecolor and auto-detects a tty: it colorizes when writing
# straight to the terminal, but passes text through UNcolored when piped onward,
# so use -f/--force to colorize in the middle of a pipeline.
# Debian ships lolcat in /usr/games; make sure it's reachable in any shell.
[[ ":$PATH:" == *":/usr/games:"* ]] || export PATH="$PATH:/usr/games"
# --- opt-in: prefix ANY command to rainbow its output on the terminal --------
# lol ls -C lol fastfetch lol git log --oneline
# (The wrapped command sees a pipe, not a tty, so some tools drop their own
# colors/columns -- e.g. use `lol ls -C` to keep ls in columns.)
lol() { "$@" | lolcat; }
# Same, but force color so it survives further down a pipeline:
# lolf git diff | less -R
lolf() { "$@" | lolcat -f; }
# --- handy rainbow shortcuts for plain-text output ---------------------------
rcat() { lolcat "$@"; } # rcat file.txt (or: some-cmd | rcat)
rls() { ls -C "$@" | lolcat; } # rainbow ls, columns preserved
rless() { lolcat -f | less -R; } # pipe into me: some-cmd | rless
# --- whole-session "rainbow everything" toggle (NOVELTY) ---------------------
# Pipes the shell's stdout through lolcat until turned off. It WILL garble
# full-screen/interactive programs (vim, less, htop, fzf, ssh) and your prompt,
# and buffers streaming output. Use it for a burst of plain command output,
# then rainbow_off. Does not affect stderr.
rainbow_on() { [[ -n $RAINBOW_PIPE ]] && return; exec 3>&1; exec > >(lolcat -f); export RAINBOW_PIPE=1; }
rainbow_off() { [[ -z $RAINBOW_PIPE ]] && return; exec 1>&3 3>&-; unset RAINBOW_PIPE; }
-1
View File
@@ -1,4 +1,3 @@
source $HOME/.zprezto/runcoms/zshrc source $HOME/.zprezto/runcoms/zshrc
for config_file ($HOME/.yadr/zsh/*.zsh) source $config_file for config_file ($HOME/.yadr/zsh/*.zsh) source $config_file
export PATH="$HOME/.local/bin:$PATH"