Merge branch 'master' of ssh://r0:30022/repos/dotfiles

3 files changed, 68 insertions, 8 deletions

diff --git a/Rexfile b/Rexfile
index 4bdb9f0..400a9f4 100644
--- a/Rexfile
+++ b/Rexfile
@@ -299,19 +299,33 @@ task 'home_tmux_rocky', sub {
         my $hostname = `hostname 2>/dev/null` // '';
         chomp $hostname;
         if ( $hostname =~ /rocky/ ) {
-            my $conf = "$HOME/.config/tmux/tmux.local.conf";
             my $line = "source-file ~/.config/tmux/tmux.rocky.conf";
+            my $local_conf = "$HOME/.config/tmux/tmux.local.conf";
+            my $main_conf  = "$HOME/.config/tmux/tmux.conf";
+
+            # Clean up stale reference from tmux.local.conf (moved to end of tmux.conf)
+            if ( -f $local_conf ) {
+                my $content = do { local $/; open my $fh, '<', $local_conf or die $!; <$fh> };
+                if ( $content =~ /\Q$line\E/ ) {
+                    $content =~ s/\n*\Q$line\E\n*/\n/;
+                    open my $fh, '>', $local_conf or die $!;
+                    print $fh $content;
+                    close $fh;
+                    Rex::Logger::info("Removed stale tmux.rocky.conf source from $local_conf");
+                }
+            }
 
-            if ( -f $conf ) {
-                my $content = do { local $/; open my $fh, '<', $conf or die $!; <$fh> };
+            # Append to the END of tmux.conf so rocky colors override shared config
+            if ( -f $main_conf ) {
+                my $content = do { local $/; open my $fh, '<', $main_conf or die $!; <$fh> };
                 if ( $content !~ /\Q$line\E/ ) {
-                    Rex::Logger::info("Appending tmux.rocky.conf source to $conf");
-                    open my $fh, '>>', $conf or die $!;
+                    Rex::Logger::info("Appending tmux.rocky.conf source to end of $main_conf");
+                    open my $fh, '>>', $main_conf or die $!;
                     print $fh "\n$line\n";
                     close $fh;
                 }
                 else {
-                    Rex::Logger::info("tmux.rocky.conf already sourced in $conf");
+                    Rex::Logger::info("tmux.rocky.conf already sourced in $main_conf");
                 }
             }
         }
diff --git a/fish/conf.d/update.fish.lock b/fish/conf.d/update.fish.lock
deleted file mode 100644
index 1bbf2e6..0000000
--- a/fish/conf.d/update.fish.lock
+++ /dev/null
@@ -1 +0,0 @@
-3281258
diff --git a/prompts/skills/rocky-vm-setup/SKILL.md b/prompts/skills/rocky-vm-setup/SKILL.md
index ddb78e8..661b9ae 100644
--- a/prompts/skills/rocky-vm-setup/SKILL.md
+++ b/prompts/skills/rocky-vm-setup/SKILL.md
@@ -57,10 +57,11 @@ Short LAN aliases for all f3s hosts (short, `.lan`, and `.lan.buetow.org` varian
 | Tool | Version | How Installed |
 |------|---------|---------------|
 | tmux | 3.2a | `dnf install -y tmux` |
+| tmux prefix | C-g | **Rocky override** — nested tmux (see below) |
 | fish | 3.7.1 | `dnf install -y fish` (EPEL) |
 | amp | 0.7.1 | Downloaded binary from GitHub releases |
 | claude-code | 2.1.169 | `npm install -g @anthropic-ai/claude-code` |
-| pi coding agent | 0.74.2 | `npm install -g @earendil-works/pi-coding-agent` |
+| pi coding agent | 0.79.0 | `npm install -g @earendil-works/pi-coding-agent` |
 | taskwarrior | 2.6.2 | **Built from source** (see below) |
 | Rex | 1.16.1 | `cpanm Rex` (requires expat-devel, perl-LWP-Protocol-https) |
 | zoxide | 0.9.8 | `dnf install -y zoxide` (EPEL) |
@@ -68,6 +69,50 @@ Short LAN aliases for all f3s hosts (short, `.lan`, and `.lan.buetow.org` varian
 | fzf fish plugin | — | **fisher install PatrickF1/fzf.fish** |
 | ask, hexai*, gt, gitsyncer, etc. | — | `go install codeberg.org/snonux/...` (see update::tools) |
 
+### Nested tmux (C-g on rocky)
+
+Earth (outer tmux) uses the default **C-b** prefix. Rocky (inner tmux) uses **C-g** so you can control both layers.
+
+**Visual distinction — you'll never confuse the two:**
+
+| Layer | Prefix | Active Border | Status Bar | Pane Indicators |
+|-------|--------|---------------|------------|-----------------|
+| **Earth (outer)** | `C-b` | **Magenta** | White-on-purple | Default blue |
+| **Rocky (inner)** | `C-g` | **Bright Red** | **Black-on-orange** with `[ROCKY]` label | **Red/orange** pane numbers, border labels |
+
+**Workflow:**
+| Key | Action |
+|-----|--------|
+| `C-b c` | Create window in outer tmux (earth) |
+| `C-g c` | Create window in inner tmux (rocky) |
+| `C-b b` | Send `C-b` through to inner tmux |
+| `C-g g` | Send `C-g` through to inner-inner tmux |
+
+Rocky config is in `~/.config/tmux/tmux.rocky.conf` and sourced from `tmux.local.conf`:
+
+```sh
+# ~/.config/tmux/tmux.rocky.conf
+unbind C-b
+set -g prefix C-g
+bind C-g send-prefix
+
+# Drastic RED/ORANGE color scheme
+set -g pane-active-border-style 'fg=brightred,bold'
+set -g status-style             'bg=colour208,fg=black,bold'
+set -g status-left              ' [ROCKY] #[bg=brightred,fg=white] #S '
+set -g window-status-current-style 'bg=brightred,fg=white,bold'
+set -g window-status-style         'bg=colour208,fg=black'
+
+# Active pane indicators
+set -g display-panes-colour       colour208       # prefix+q pane numbers
+set -g display-panes-active-colour brightred       # active pane number
+set -g pane-border-status         top              # show pane info on borders
+set -g pane-border-format         '#[fg=colour208] #{pane_index} #[fg=brightred]#{pane_title} '
+set -g window-status-current-format ' #I*#[bg=brightred,fg=white] #W '
+```
+
+This is deployed by the `home_tmux_rocky` Rex task (runs only when `hostname =~ /rocky/`).
+
 ### Building taskwarrior from source
 
 Rocky 9 does not ship `task`/`taskwarrior`. v3.x requires Rust; v2.6.2 compiles cleanly.
@@ -116,6 +161,8 @@ done
 # (foostore, loadbars, totalrecall, goprecords may need X11/GL deps for GUI — skip on headless)
 ```
 
+**tmux 3.2a compatibility note:** The dotfiles `tmux.conf` includes `set -g extended-keys-format csi-u` (tmux 3.3+). On rocky this line is automatically stripped by the `home_tmux_rocky` Rex task. If you deploy manually, remove or comment out that line.
+
 ---
 
 ## User and Privileges