From 251ab93607c4b4938c3b973e31c9b73e3af79497 Mon Sep 17 00:00:00 2001 From: Prad Nukala Date: Fri, 6 Nov 2026 11:38:26 -0500 Subject: [PATCH] kitty: goliath window uses main kitty.conf via kitten ssh --- docs/desktop/hyprland.md | 4 ++-- docs/terminal/README.md | 2 +- docs/terminal/kitty.md | 7 +++---- dot_config/hypr | 2 +- 4 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/desktop/hyprland.md b/docs/desktop/hyprland.md index 79278fe..9eb8d7a 100644 --- a/docs/desktop/hyprland.md +++ b/docs/desktop/hyprland.md @@ -247,7 +247,7 @@ Named workspaces provide the per-app workspaces. `SUPER + ALT + S` (send to scra | `SUPER + CTRL + ALT + T` | tldraw offline: `omarchy-launch-or-focus tldraw-offline "gtk-launch tldraw-offline"` | show time | | `SUPER + CTRL + ALT + W` | tldraw: `omarchy-launch-or-focus tldraw "gtk-launch TLDraw"` | toggle weather | | `SUPER + CTRL + ALT + SPACE` | Sticky Notes Canvas via `gtk-launch io.github.faridjaff.StickyNotesCanvas` | — | -| `SUPER + SHIFT + G` | Goliath: `kitty --class=kitty-goliath --title=goliath --config ~/.config/kitty/goliath.conf` | Signal | +| `SUPER + SHIFT + G` | Goliath: `kitty --class=kitty-goliath --title=goliath --session=none kitten ssh goliath` (main `kitty.conf`) | Signal | | `SUPER + ALT + SHIFT + F` | `uwsm-app -- "$HOME/.local/bin/strata" "$(omarchy-cmd-terminal-cwd)"` — strata in the terminal's cwd | unbound first (default unnamed) | strata is the default file manager: `inode/directory` in `mimeapps.list` and the `org.freedesktop.FileManager1` D-Bus service both point at it ([15-tools](../chezmoi/scripts.md#15-tools)). The cwd bind uses the absolute path because `~/.local/bin` may be missing from uwsm-app's `PATH`. Omarchy's own file-manager bind on `SUPER + SHIFT + F` is replaced by full screen (below). A rule tagging `com.thisisgm.flea.picker` as `+floating-window` still sits between `flea --picker` marker comments, which the `flea` tool writes and removes itself. @@ -381,4 +381,4 @@ If the workspace is visible, the script hides it. If not, it launches any reside ## Related - [Waybar](waybar.md): the bar used with this setup. -- [kitty](../terminal/kitty.md): the `herdr` and `goliath` kitty configs launched here. +- [kitty](../terminal/kitty.md): the `herdr` kitty config and the goliath kitty launched here. diff --git a/docs/terminal/README.md b/docs/terminal/README.md index 9ee682f..4a98c61 100644 --- a/docs/terminal/README.md +++ b/docs/terminal/README.md @@ -6,7 +6,7 @@ kitty is the primary terminal. It runs in three modes: plain kitty (kitty owns s | Page | Source | What it covers | | --- | --- | --- | -| [kitty](kitty.md) | external repo via `.chezmoiexternals/kitty.toml` | Main config, host configs (tmux, herdr, goliath), kittens, custom tab bar | +| [kitty](kitty.md) | external repo via `.chezmoiexternals/kitty.toml` | Main config, host configs (tmux, herdr), the goliath ssh window, kittens, custom tab bar | | [Ghostty](ghostty.md) | external repo via `.chezmoiexternals/ghostty.toml` | tmux-only terminal: ctrl+shift chords → tmux, themes | | [tmux](tmux.md) | external repo via `.chezmoiexternals/tmux.toml` | Prefix, bindings, kitty-style tabs with Nerd Font icons, resurrect/continuum persistence | | [herdr](herdr.md) | external repo via `.chezmoiexternals/herdr.toml`, plus `dot_config/herdr-nvim/` | Agent-aware multiplexer: keys, theme, plugins, Claude hook | diff --git a/docs/terminal/kitty.md b/docs/terminal/kitty.md index 0829233..a5f8c04 100644 --- a/docs/terminal/kitty.md +++ b/docs/terminal/kitty.md @@ -15,7 +15,6 @@ GPU terminal emulator and the primary terminal on every role. kitty.conf tmux.conf herdr.conf - goliath.conf ssh.conf current-theme.conf tab_bar.py @@ -186,9 +185,9 @@ Launched by `super+a`. Class `kitty-herdr`, `tab_bar_style hidden` (herdr draws | `ctrl+shift+q` | `prefix x` | | `ctrl+shift+p` | `prefix P` (Switchboard commands) | -### goliath.conf — ssh to goliath +### Goliath (`SUPER + SHIFT + G`) -Launched by `SUPER + SHIFT + G` ([Hyprland](../desktop/hyprland.md)) as a new kitty (`--class=kitty-goliath`). `shell kitten ssh goliath`: a plain login shell on goliath, no tmux, so closing the window ends the session. kitten ssh copies kitty's terminfo over, so `TERM` stays `xterm-kitty`; connection sharing comes from `ssh.conf`. Also sets `listen_on unix:@kitty-goliath` and `tab_bar_style hidden`, and includes the Omarchy theme. No key maps beyond kitty's defaults. +Not a separate config: [Hyprland](../desktop/hyprland.md) starts a new kitty on the main `kitty.conf` (same tab bar, keys and theme) running `kitty --class=kitty-goliath --title=goliath --session=none kitten ssh goliath`. That is a plain login shell on goliath, no tmux, so closing the window ends the session. kitten ssh copies kitty's terminfo over, so `TERM` stays `xterm-kitty`. New tabs and splits open local shells. `--session=none` keeps this kitty from claiming today's [daily session](#daily-sessions); `--title` keeps the OS window titled `goliath` (`os_window_title.py` skips kitties started with `--title`). ### ssh.conf @@ -203,7 +202,7 @@ Kitten `ssh` config: for `hostname goliath`, `share_connections yes`. | `navigate_kitty.py` | No-UI kitten that calls `neighboring_window` with a direction argument; the counterpart nvim can invoke. Not mapped in `kitty.conf`. | | `select_tab.py` | Full-screen fuzzy tab picker using `kitty @ ls` data; shows cwds zsh-style. Keys: Up/Down/PgUp/PgDn scroll, Enter selects, typing filters, `ctrl+c`/Esc quits. Not mapped in `kitty.conf`. | | `switchtab.py` | Focuses the tab whose `vt` user var matches the argument, or launches one with that var and reorders tabs by `vt`. Not mapped. | -| `os_window_title.py` | Global watcher. On every `on_tab_bar_dirty` (tab switch, focus change, any program title change; also fires while the bar is hidden) it sets the OS window title to `tab_bar.py`'s `wd_label` for the active window's cwd: the repo root name, `~` at home, the dir name outside a repo. An empty label clears the override, so kitty falls back to the program's title. | +| `os_window_title.py` | Global watcher. On every `on_tab_bar_dirty` (tab switch, focus change, any program title change; also fires while the bar is hidden) it sets the OS window title to `tab_bar.py`'s `wd_label` for the active window's cwd: the repo root name, `~` at home, the dir name outside a repo. An empty label clears the override, so kitty falls back to the program's title. Does nothing in a kitty started with `--title` (the goliath window). | | `day_session.py` | Daily sessions: `geninclude` script, global watcher and the `flush` no-UI kitten in one file. See [Daily sessions](#daily-sessions). | Related: the [tmux](tmux.md) `is_vim` check and herdr's `vim-herdr-navigation` plugin complete the `ctrl+h/j/k/l` chain. Hyprland window rules can match the `kitty`, `kitty-tmux` and `kitty-herdr` app-ids ([Hyprland](../desktop/hyprland.md)). diff --git a/dot_config/hypr b/dot_config/hypr index ad796d0..93dc16e 160000 --- a/dot_config/hypr +++ b/dot_config/hypr @@ -1 +1 @@ -Subproject commit ad796d00da3411c6de6e5d11cfac2ba4da9e4ac8 +Subproject commit 93dc16e75e9e5de38120652a1634718a813b446c