@@ -76,65 +76,15 @@
7676 imageName = "nix-container";
7777 imageTag = "latest";
7878
79− # Fish prompt config. Installed at /etc/fish/prompt.fish and loaded via
80− # `fish --no-config --init-command` (see `cmd` below), NOT from
81− # $HOME/.config/fish — so the `~/.config` mount can't shadow it. Built
82− # on the host arch (just a text file), so no Linux builder is needed.
83− fishConfig = pkgsHost.writeText "prompt.fish" ''
84− # No welcome banner.
85− set -g fish_greeting
86−
87− # Pick a TERM whose terminfo entry actually exists in the bundled
88− # database, so TUIs render with the right capabilities (otherwise
89− # they glitch on redraw). The container runtime strips the host TERM
90− # down to a bare "xterm"; `c` forwards the real value as HOST_TERM.
91− # Ghostty reports "xterm-ghostty", but ncurses ships that entry under
92− # the name "ghostty", so map it. Prefer HOST_TERM over the runtime's
93− # bare "xterm" placeholder, falling back to xterm-256color.
94− for term_candidate in $HOST_TERM $TERM xterm-256color
95− test "$term_candidate" = xterm; and continue
96− set -l entry $term_candidate
97− test "$entry" = xterm-ghostty; and set entry ghostty
98− if infocmp $entry >/dev/null 2>&1
99− set -gx TERM $entry
100− break
101− end
102− end
103− set -q COLORTERM; or set -gx COLORTERM truecolor
104−
105− # Define the prompt as a function so fish renders it before every
106− # command; at top level it would run once at startup and be ignored.
107− function fish_prompt
108− set -l nix_shell_info
109− if set -q IN_NIX_SHELL; or set -q IN_NIX_RUN
110− set nix_shell_info ' ❄️'
111− end
112−
113− set -l cwd (prompt_pwd)
114−
115− set -l bookmark_info
116− if jj root 2>/dev/null >/dev/null
117− set -l jj_bookmark (jj log -r 'heads(::@ & bookmarks())' -T 'local_bookmarks ++ "\n"' --no-graph 2>/dev/null | tail -1)
118− if test -n "$jj_bookmark"
119− set bookmark_info ' ' (set_color brmagenta) $jj_bookmark (set_color normal)
120− end
121− end
122−
123− echo -n -s (set_color $fish_color_cwd) $cwd (set_color normal) $bookmark_info ' 🏗️' $nix_shell_info '> '
124− end
125− '';
126−
127− # Lay the prompt out at the path the cmd sources.
128− fishRoot = pkgsHost.runCommand "fish-prompt" { } ''
129− mkdir -p "$out/etc/fish"
130− cp ${fishConfig} "$out/etc/fish/prompt.fish"
131− '';
132−
133− # Build the OCI image from a `{ pkgs, nur }: [ ... ]` package function.
134− # The image always runs /bin/fish; fish, its prompt config, and Nix are
135− # bundled automatically, so `container.nix` lists only your extras.
79+ # Build the OCI image from a `{ pkgs, nur }: [ ... ]` package function,
80+ # for the named shell. The shell is the image's `cmd` (a PID1 that just
81+ # holds the container open — `c start` execs the real session into it)
82+ # and the default `$SHELL`; it's added automatically, so `container.nix`
83+ # lists only your extras. Nix (+ CA certs) and the ncurses terminfo
84+ # database are always shipped too. Nothing here is fish-specific: the
85+ # TERM fixup now happens host-side in `c` (passed via `-e TERM`).
13686 mkImage =
137− packages:
87+ shell: packages:
13888 n2c.buildImage {
13989 name = imageName;
14090 tag = imageTag;
@@ -144,10 +94,6 @@
14494 # buildEnv only *symlinks* paths (never runs them), so build it on
14595 # the host arch — the tree is arch-neutral and links the
14696 # (substituted) Linux store paths, sparing the Linux builder.
147− #
148− # Always shipped: fish (the cmd) + its prompt, and Nix (+ CA certs)
149− # so every container can use Nix; `initializeNixDatabase` registers
150− # the baked store.
15197 copyToRoot = pkgsHost.buildEnv {
15298 name = "root";
15399 paths =
@@ -155,24 +101,25 @@
155101 pkgs = pkgsLinux;
156102 nur = nurPkgs;
157103 }
104+ # The shell (cmd + $SHELL), when it exists in nixpkgs.
105+ ++ pkgsLinux.lib.optional (pkgsLinux ? ${shell}) pkgsLinux.${shell}
158106 ++ [
159− pkgsLinux.fish
160− fishRoot
161107 pkgsLinux.nix
162108 pkgsLinux.cacert
109+ # Basic userland (ls, cat, cp, sleep, …) so the container is
110+ # usable out of the box and tools that shell out don't fail.
111+ pkgsLinux.coreutils-full
163112 # Networking glue glibc needs: /etc/nsswitch.conf (+passwd,
164113 # group) so DNS/host lookups resolve, and /etc/protocols,
165114 # /etc/services. Without these, hostname resolution fails.
166115 pkgsLinux.fakeNss
167116 pkgsLinux.iana-etc
168− # Terminfo tools (infocmp/tput/clear/reset). The terminfo DB
169− # itself already ships via fish's ncurses dependency; this
170− # puts the lookup tools on PATH so the prompt init can pick a
171− # TERM entry that exists, and TUIs get correct capabilities.
117+ # The terminfo database (+ tput/clear/reset) so TUIs find the
118+ # entry for whatever TERM `c` passes in and render correctly.
172119 pkgsLinux.ncurses
173120 ];
174121 # Link all of /etc so the above files (nsswitch.conf, protocols,
175− # services, passwd, group, ssl certs, fish prompt) are present.
122+ # services, passwd, group, ssl certs) are present.
176123 pathsToLink = [
177124 "/bin"
178125 "/etc"
@@ -183,26 +130,19 @@
183130
184131 config = {
185132 # `cmd` (not `entrypoint`): the default command, *replaced* by any
186− # command passed to `container run/create`. `--no-config` skips
187− # $HOME/.config/fish (so a mounted ~/.config can't override the
188− # prompt); `--init-command` loads the bundled prompt instead.
189− cmd = [
190− "/bin/fish"
191− "--no-config"
192− "--init-command"
193− "source /etc/fish/prompt.fish"
194− ];
133+ # command passed to `container run/create`. It's the detected
134+ # shell — as PID1 it just holds the container open; `c start`
135+ # execs the real interactive session (zellij) into it.
136+ cmd = [ "/bin/${shell}" ];
195137 env = [
196138 "PATH=/bin"
197139 "HOME=/root"
198− # Default shell for tools that spawn one (zellij panes, etc.);
199− # without it they fall back to /bin/sh.
200− "SHELL=/bin/fish"
140+ # Default shell for tools that spawn one (zellij panes, etc.).
141+ "SHELL=/bin/${shell}"
201142 # Marker so shells/scripts can detect they're in here.
202143 "NIX_CONTAINER=1"
203− # Advertise truecolor so `container exec` sessions (which don't
204− # source the fish init) still get 24-bit color. TERM is fixed up
205− # in the fish prompt init, since the runtime overrides it here.
144+ # Advertise truecolor for 24-bit-aware tools; `c` passes the
145+ # resolved TERM via -e (the runtime would otherwise force xterm).
206146 "COLORTERM=truecolor"
207147 # A UTF-8 locale so tools handle multibyte/wide characters
208148 # correctly. glibc ships C.UTF-8 built in, so this needs no
@@ -240,17 +180,13 @@
240180 lib = {
241181 inherit mkImage;
242182 # skopeo copy app (`skopeo copy nix:<image> "$@"`) for an image built
243− # from a `{ pkgs, nur }: [ ... ]` function.
244− copyWith = packages: (mkImage packages).copyTo;
245− # Like `copyWith`, but also adds the named shell package (when it
246− # exists in nixpkgs) so `c init` can make the host shell available
247− # without it being listed in `container.nix`.
248− copyWithShell =
249− shell: packages:
250− (mkImage (
251− { pkgs, nur }:
252− packages { inherit pkgs nur; } ++ pkgs.lib.optional (pkgs ? ${shell}) pkgs.${shell}
253− )).copyTo;
183+ # from a `{ pkgs, nur }: [ ... ]` function. Defaults the shell (cmd +
184+ # $SHELL) to bash; use `copyWithShell` to pick another.
185+ copyWith = packages: (mkImage "bash" packages).copyTo;
186+ # Like `copyWith`, but for the named shell — `c init` passes the host
187+ # login shell, which is added to the image and used as cmd + $SHELL
188+ # without being listed in `container.nix`.
189+ copyWithShell = shell: packages: (mkImage shell packages).copyTo;
254190 };
255191 }
256192 );