Moving common

diff --git a/.tmux.conf b/.tmux.conf
index 9126e9d94babae38ccf56644263d7e30875a91c5..95398b4d658dd74e662fcc069720cae45382c566 100644 (file)
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -6,8 +6,9 @@ set -g mouse on
 # Allows for faster key repetition
 set -s escape-time 0
 
-# multi-line shift+enter
-bind -n S-Enter send-keys C-j
+# extended keys
+set -g extended-keys on
+set -g extended-keys-format csi-u
 
 # bind new keys for splits
 bind | split-window -hc "#{pane_current_path}"

diff --git a/.zsh/common.zsh b/.zsh/common.zsh
index 13db3ce190e89055ea00e6ff2bef50cc5c4a8285..12a1c482aa3ab161a8da5cb31e75689c58ea712b 100644 (file)
--- a/.zsh/common.zsh
+++ b/.zsh/common.zsh
@@ -8,13 +8,6 @@ setopt share_history hist_ignore_all_dups hist_ignore_space hist_reduce_blanks e
 
 export LS_COLORS='di=34:ln=35:so=32:pi=33:ex=31:bd=34;46:cd=34;43'
 
-# Add Homebrew completion definitions without launching Homebrew at shell startup.
-if [[ -d /opt/homebrew/share/zsh/site-functions ]]; then
-    FPATH="/opt/homebrew/share/zsh/site-functions:${FPATH}"
-elif [[ -d /usr/local/share/zsh/site-functions ]]; then
-    FPATH="/usr/local/share/zsh/site-functions:${FPATH}"
-fi
-
 autoload -Uz compinit
 # Rebuild the completion cache only when it is more than 24 hours old.
 if [[ -n ~/.zcompdump(#qN.mh+24) ]]; then compinit; else compinit -C; fi

diff --git a/.zsh/linux.zsh b/.zsh/linux.zsh
index aa2186d6d6eaefaf77ece5f5dfc6cac669a3fc19..8e822b6d004f2b3ac31a81cf17e47c5dd4a322af 100644 (file)
--- a/.zsh/linux.zsh
+++ b/.zsh/linux.zsh
@@ -4,6 +4,9 @@ if command -v ls >/dev/null 2>&1; then
     alias ls='ls --color=auto'
 fi
 
+# Shared settings initialize completion before Linux-specific plugins load.
+source "$HOME/.zsh/common.zsh"
+
 if command -v fzf-tab >/dev/null 2>&1; then
     source "$(dirname "$(command -v fzf-tab)")/../share/fzf-tab/fzf-tab.zsh" 2>/dev/null
 fi

diff --git a/.zsh/macos.zsh b/.zsh/macos.zsh
index 06f728e91388d33bfaf81b5baa569732ce61d0e8..23f9457d6c101fdfc72c9d28e5fbd9302e6baab8 100644 (file)
--- a/.zsh/macos.zsh
+++ b/.zsh/macos.zsh
@@ -13,17 +13,28 @@ elif [[ -x /usr/local/bin/brew ]]; then
 fi
 
 if [[ -n ${HOMEBREW_PREFIX:-} ]]; then
-    # Add Homebrew's tools to the environment without running `brew shellenv`.
+    # Add Homebrew's tools and completion definitions without running Homebrew.
     export PATH="$HOMEBREW_PREFIX/bin:$HOMEBREW_PREFIX/sbin:$PATH"
     export MANPATH="$HOMEBREW_PREFIX/share/man${MANPATH:+:$MANPATH}"
     export INFOPATH="$HOMEBREW_PREFIX/share/info${INFOPATH:+:$INFOPATH}"
+    FPATH="$HOMEBREW_PREFIX/share/zsh/site-functions:${FPATH}"
+fi
+
+# fnm is installed through Homebrew on this macOS setup.
+if [[ -d "${HOMEBREW_PREFIX:-}/opt/fnm/bin" ]]; then
+    eval "$(fnm env --shell zsh)"
+fi
 
+# Load shared settings after Homebrew has added its completion definitions.
+source "$HOME/.zsh/common.zsh"
+
+# Load plugins after compinit; syntax highlighting must be the final plugin loaded.
+if [[ -n ${HOMEBREW_PREFIX:-} ]]; then
     [[ -r "$HOMEBREW_PREFIX/opt/fzf-tab/share/fzf-tab/fzf-tab.zsh" ]] && \
         source "$HOMEBREW_PREFIX/opt/fzf-tab/share/fzf-tab/fzf-tab.zsh"
     [[ -r "$HOME/.zsh/fzf-tab.zsh" ]] && source "$HOME/.zsh/fzf-tab.zsh"
     [[ -r "$HOMEBREW_PREFIX/share/zsh-autosuggestions/zsh-autosuggestions.zsh" ]] && \
         source "$HOMEBREW_PREFIX/share/zsh-autosuggestions/zsh-autosuggestions.zsh"
-    # Syntax highlighting must remain the final plugin loaded.
     [[ -r "$HOMEBREW_PREFIX/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" ]] && \
         source "$HOMEBREW_PREFIX/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
 fi

diff --git a/.zshrc b/.zshrc
index 63fc81e6cb36dfb538ea14e26dcc84b6787f2cb0..d8c807ef4fea120cd64b432d2a0978eb351976cf 100644 (file)
--- a/.zshrc
+++ b/.zshrc
@@ -1,10 +1,11 @@
-# Shared entry point
-source "$HOME/.zsh/common.zsh"
-
+# Each platform configuration loads the shared settings in the required order.
 if [[ "$OSTYPE" == darwin* ]]; then
     [[ -r "$HOME/.zsh/macos.zsh" ]] && source "$HOME/.zsh/macos.zsh"
 elif [[ "$OSTYPE" == linux* ]]; then
     [[ -r "$HOME/.zsh/linux.zsh" ]] && source "$HOME/.zsh/linux.zsh"
+else
+    # Use the shared configuration on an unrecognized platform.
+    source "$HOME/.zsh/common.zsh"
 fi
 
 # Optional machine- or work-specific settings.

diff --git a/README.md b/README.md
index 93300681b61948273ee58fe948d8bd683a6977e0..e9d1a4c161d820d054a6cfcd914cbde37992fd39 100644 (file)
--- a/README.md
+++ b/README.md
@@ -60,3 +60,5 @@ the path to the Git directory,  $HOME/.cfg/ for bare and $HOME/.cfg/.git/ for no
 - https://news.ycombinator.com/item?id=11070797
 - https://shapeshed.com/vim-netrw/#netrw---the-unloved-directory-browser
 - https://evanhahn.com/a-decade-of-dotfiles/
+- https://codeberg.org/EvanHahn/dotfiles
+