keep the shell templates together in scripts/setup

starship.toml, tmux.conf and zshrc side by side. tmux.conf and zshrc moved up out of machine-setup/. starship.toml could not have moved down to join them: the PLATFORM reads it, at src/servers/os-user-shell.ts:34, to deploy to every member's Linux account. That is a runtime path rather than an import, so moving it would have broken member provisioning silently — no build error, members simply get no starship config. So the templates collect where the shared one already had to be. Left as a marker for tomorrow rather than resolved: there are now TWO zshrc templates, this one for the owner and shell-skel/zshrc for members, while starship.toml is deliberately one file for both. Either the owner needs different shell config from a member or they should be the same file. tmux.conf has the same question waiting, since it is going into provisioning too. Noted in the zshrc header where whoever picks it up will be looking. Co-Authored-By: Claude Opus 5 (1M context) <noreply@anthropic.com>
2026-08-13 02:47:08 +00:00
parent 0da15d78a1
commit b5aa2e0387
3 changed files with 26 additions and 10 deletions
@@ -2225,11 +2225,15 @@ if ! skip; then
      esac
    fi

-    # `tmux.conf`, no leading dot. It is a TEMPLATE in the repository, not a
-    # dotfile in a home directory, and the destination is increasingly
-    # ~/.config/tmux/tmux.conf — which has no dot either. Naming the source after
-    # a path it may not be installed to is how you end up reading the wrong file.
-    if [[ -r "$SCRIPT_DIR/tmux.conf" ]]; then
+    # scripts/setup/tmux.conf, one level up — the shell templates live together
+    # beside starship.toml, which has to be there because the PLATFORM reads it
+    # too (os-user-shell.ts, for every member's Linux account). Keeping them in
+    # one directory means "where do the dotfile templates live" has one answer.
+    #
+    # No leading dot on any of them: they are templates in a repository, not
+    # dotfiles in a home directory, and tmux's destination is increasingly
+    # ~/.config/tmux/tmux.conf, which has no dot either.
+    if [[ -r "$SCRIPT_DIR/../tmux.conf" ]]; then
      # Not always ~/.tmux.conf — see tmux_config_target. tmux 3.1+ prefers
      # ~/.config/tmux/tmux.conf, so writing the old path on a machine that has
      # the new one produces a file tmux never reads and a success message that
@@ -2240,7 +2244,7 @@ if ! skip; then
        echo "     Targeting the one it actually reads: ${TMUX_TARGET}"
      fi
      install -d -m 0755 -o "$USERNAME" -g "$(user_group)" "$(dirname "$TMUX_TARGET")"
-      install_config "$SCRIPT_DIR/tmux.conf" "$TMUX_TARGET" "$USERNAME" && RC=0 || RC=$?
+      install_config "$SCRIPT_DIR/../tmux.conf" "$TMUX_TARGET" "$USERNAME" && RC=0 || RC=$?
      case $RC in
        0) ok "tmux config installed — ${TMUX_TARGET}" ;;
        1) echo "     tmux config already matches (${TMUX_TARGET})" ;;
@@ -1,100 +0,0 @@
-########## TPM AUTO-INSTALL + SESSION PERSISTENCE ##########
-
-# Auto-install TPM if missing
-if-shell '[ ! -d ~/.tmux/plugins/tpm ]' \
-  'run-shell "git clone https://github.com/tmux-plugins/tpm ~/.tmux/plugins/tpm"'
-
-# Plugin list
-set -g @plugin 'tmux-plugins/tpm'
-
-# remap prefix from 'C-b' to 'C-a'
-unbind C-b
-set-option -g prefix C-a
-bind-key C-a send-prefix
-
-set -g base-index 1
-
-# split panes using | and -
-unbind '"'
-unbind %
-bind | split-window -h
-bind - split-window -v
-
-# reload config file (change file location to your the tmux.conf you want to use)
-unbind r
-bind r source-file ~/.tmux.conf \; display-message "Config reloaded!" \; refresh-client -S
-
-# switch panes using Alt-arrow without prefix
-bind -n M-Left select-pane -L
-bind -n M-Right select-pane -R
-bind -n M-Up select-pane -U
-bind -n M-Down select-pane -D
-# switch panes using Alt-HJKL without prefix
-bind -n M-h select-pane -L
-bind -n M-l select-pane -R
-bind -n M-k select-pane -U
-bind -n M-j select-pane -D
-
-# Enable mouse control (clickable windows, panes, resizable panes)
-
-# don't rename windows automatically
-set-option -g allow-rename off
-
-######################
-### DESIGN CHANGES ###
-######################
-
-# loud or quiet?
-set -g visual-activity off
-set -g visual-bell off
-set -g visual-silence off
-setw -g monitor-activity off
-set -g bell-action none
-
-#  modes
-setw -g clock-mode-colour colour12
-setw -g mode-style 'fg=colour1 bg=colour18 bold'
-
-# panes
-set -g pane-border-style 'fg=colour19 bg=colour0'
-set -g pane-active-border-style 'bg=colour0 fg=colour9'
-
-# statusbar
-set -g status-position bottom
-set -g status-justify left
-set -g status-style 'bg=colour2 fg=colour23'
-# set -g status-left '#[fg=white,bg=black,bold] pastilhas #[default]'
-set -g status-left '#[fg=#ffffff,bg=#000000,bold] #{USER}@#H     #[default]'
-# set -g status-left-length 20
-set -g status-right '#[fg=#ffffff,bg=colour1] %d/%m #[fg=#ffffff,bg=colour8] %H:%M:%S '
-set -g status-right-length 50
-set -g status-left-length 20
-
-setw -g window-status-current-style 'fg=colour1 bg=colour19 bold'
-setw -g window-status-current-format ' #I#[fg=colour249]:#[fg=colour255]#W#[fg=colour249]#F '
-
-setw -g window-status-style 'fg=colour9 bg=colour18'
-setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F '
-
-setw -g window-status-bell-style 'fg=colour255 bg=colour1 bold'
-# ...existing code...
-# messages
-set -g message-style 'fg=#ffffff bg=red bold'
-# Change the font color for the exit pane confirmation message
-set -g message-command-style 'fg=#ffffff bg=red bold'
-
-# ...existing code...
-
-# messages
-# set -g message-style 'fg=colour232 bg=colour16 bold'
-
-##########################
-### END DESIGN CHANGES ###
-##########################
-
-##########################
-### EASY MOUSE SCROLL  ###
-##########################
-
-set -g mouse on
-set -ga terminal-overrides ',*256color*:smcup@:rmcup@'
@@ -1,34 +0,0 @@
-# Officer — the owner's shell configuration.
-#
-# EMPTY ON PURPOSE, for now. Created 2026-08-13 so there is somewhere to put the
-# things the owner actually wants, and it is not wired into the Shell section yet.
-#
-# ── What this replaces, and the decision still to make ──
-#
-# The Shell section does not install a .zshrc today. It APPENDS four
-# marker-wrapped blocks to whatever is already there — `starship`, `agent`,
-# `aliases` and `editor` — via `append_once`, which recognises its own work so a
-# second run does not duplicate it. That was the right call for a machine whose
-# .zshrc already belongs to somebody.
-#
-# Installing a whole file is a different promise, and the two do not compose: a
-# template that gets installed AND appended to ends up with the same lines twice,
-# once from the file and once from a block. So when this is wired in, the four
-# append_once blocks either move INTO this file or stay out of it — not both.
-#
-# `install_config` already handles the careful half: it writes only when the
-# destination is missing or still byte-for-byte the template, and offers a diff
-# otherwise, so an owner's own edits are never overwritten.
-#
-# ── Naming ──
-#
-# `zshrc`, no leading dot. It is a template in a repository, not a dotfile in a
-# home directory — the same reason tmux.conf lost its dot beside it. The member
-# equivalent, src/servers/shell-skel/zshrc, has been spelled that way all along.
-#
-# ── The one thing worth keeping when this is filled in ──
-#
-# shell-skel/zshrc depends on nothing but zsh: starship, eza, nvim and bun are
-# each used only if present, so the same file works on a minimal VPS and on a
-# fully equipped workstation. Worth holding to here, since this file will be read
-# on machines that have had none of the optional sections run.