d252f01f17
The powerline look (the `[]` separator glyph + bg-filled segments) didn't read well. Switch to a flat prompt: bold-accent directory, warn git branch, subtext git-status/duration, `❯` character — plain colored text, no background fills, each module carrying its own trailing space so there are no stray gaps. Also reference cmd_duration in `format` (it was configured but never shown). Generated starship.toml verified valid; nix flake check passes. Visual pass still wants a live terminal. Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
121 lines
3.6 KiB
Nix
121 lines
3.6 KiB
Nix
# Shell experience — zsh (the default login shell, set system-side) with
|
||
# autosuggestions + syntax highlighting, a themed starship prompt, and
|
||
# modern CLI tools wired in: bat (cat), eza (ls), zoxide (cd). bat uses
|
||
# the "ansi" theme so it follows the terminal palette (Ghostty is themed
|
||
# from the same JSON); starship is themed from the palette directly.
|
||
#
|
||
# home.shell.enableZshIntegration = true is the single lever that makes
|
||
# every integrating program (starship, eza, zoxide, ghostty, yazi) emit
|
||
# its zsh hooks — no per-module flags needed.
|
||
{ config, lib, pkgs, ... }:
|
||
|
||
let
|
||
cfg = config.nomarchy;
|
||
t = cfg.theme;
|
||
c = t.colors;
|
||
in
|
||
{
|
||
config = lib.mkIf cfg.shell.enable {
|
||
home.shell.enableZshIntegration = true;
|
||
|
||
# rg/fd as themselves (NOT aliased over grep/find — their flags
|
||
# differ enough to surprise). Available regardless of yazi/rofi.
|
||
home.packages = with pkgs; [ ripgrep fd ];
|
||
|
||
programs.zsh = {
|
||
enable = true;
|
||
enableCompletion = true;
|
||
autosuggestion.enable = true;
|
||
syntaxHighlighting.enable = true;
|
||
autocd = true;
|
||
history = {
|
||
size = 50000;
|
||
save = 50000;
|
||
ignoreDups = true;
|
||
ignoreSpace = true;
|
||
expireDuplicatesFirst = true;
|
||
};
|
||
shellAliases = {
|
||
cat = "bat --paging=never";
|
||
less = "bat";
|
||
grep = "grep --color=auto";
|
||
# eza enableZshIntegration aliases ls/ll/la; add a couple extras.
|
||
lt = "eza --tree --level=2 --icons=auto --group-directories-first";
|
||
tree = "eza --tree --icons=auto --group-directories-first";
|
||
".." = "cd ..";
|
||
"..." = "cd ../..";
|
||
};
|
||
};
|
||
|
||
programs.starship = {
|
||
enable = true;
|
||
settings = {
|
||
add_newline = false;
|
||
palette = "nomarchy";
|
||
# starship wants full #rrggbb (or names) — keep the leading #.
|
||
palettes.nomarchy = {
|
||
inherit (c) base text accent good warn bad subtext;
|
||
};
|
||
# Flat prompt — colored text only, no powerline separators or
|
||
# background fills. Each module emits its own trailing space so
|
||
# there are no stray gaps when git/duration are absent.
|
||
format = lib.concatStrings [
|
||
"$directory"
|
||
"$git_branch"
|
||
"$git_status"
|
||
"$cmd_duration"
|
||
"$character"
|
||
];
|
||
directory = {
|
||
style = "bold accent";
|
||
format = "[$path]($style) ";
|
||
truncation_length = 3;
|
||
truncate_to_repo = true;
|
||
};
|
||
git_branch = {
|
||
style = "warn";
|
||
format = "[$symbol$branch]($style) ";
|
||
symbol = " ";
|
||
};
|
||
git_status = {
|
||
style = "subtext";
|
||
# Parenthesised → the segment (and its trailing space) only
|
||
# render when there's actually a status to show.
|
||
format = "([$all_status$ahead_behind]($style) )";
|
||
};
|
||
character = {
|
||
success_symbol = "[❯](good)";
|
||
error_symbol = "[❯](bad)";
|
||
};
|
||
cmd_duration = {
|
||
min_time = 2000;
|
||
style = "subtext";
|
||
format = "[ $duration]($style) ";
|
||
};
|
||
};
|
||
};
|
||
|
||
# bat: "ansi" follows the terminal's 16-color palette → tracks the
|
||
# active Nomarchy theme (Ghostty bakes it) with no per-theme config.
|
||
programs.bat = {
|
||
enable = true;
|
||
config = {
|
||
theme = "ansi";
|
||
style = "numbers,changes,header";
|
||
};
|
||
};
|
||
|
||
programs.eza = {
|
||
enable = true;
|
||
icons = "auto";
|
||
git = true;
|
||
extraOptions = [ "--group-directories-first" ];
|
||
};
|
||
|
||
programs.zoxide = {
|
||
enable = true;
|
||
options = [ "--cmd cd" ]; # `cd` becomes the smart jumper (z under the hood)
|
||
};
|
||
};
|
||
}
|