feat(branding): fastfetch logo + Nomarchy.ttf glyph in the Waybar button

Two branding follow-ups, using the vendored legacy assets:

- fastfetch (modules/home/fastfetch.nix, nomarchy.fastfetch.enable): the
  vector logo recolored to the palette accent and rendered to compact
  block-art via chafa at build time (so it tracks the theme), fronting a
  curated module list. Replaces the oversized legacy ASCII.
- Waybar logo glyph: vendor Nomarchy.ttf (modules/nixos/branding/),
  install it via fonts.packages, and switch the summer-day/night menu
  buttons to its U+F000 mark with `font-family: Nomarchy` pinned in CSS
  (Nerd Fonts also occupy U+F000, so the pin is required). Glyph stored as
  the  JSON escape for robustness.

Also log a roadmap item for a quality-of-life alias collection.

Verified: font family resolves as "Nomarchy" and the ttf maps U+F000;
both summer jsonc parse; chafa logo builds headless; nix flake check passes.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>

.claude/settings.local.json

@@ -265,7 +265,20 @@
       "Bash(nix-instantiate --parse modules/home/rofi.nix)",
       "Bash(nix-instantiate --parse modules/home/shell.nix)",
       "Bash(command -v nix)",
-      "Bash(nix-instantiate --parse modules/home/keys.nix)"
+      "Bash(nix-instantiate --parse modules/home/keys.nix)",
+      "Bash(cp /home/bernardo/Projects/Nomarchy/modules/nixos/plymouth/logo.png /tmp/logo-orig.png)",
+      "Bash(nix run *)",
+      "Bash(cp /tmp/logo-text.png /home/bernardo/Projects/Nomarchy/.tmp-logo-preview.png)",
+      "Bash(cp /tmp/logo-text.png /home/bernardo/Projects/Nomarchy/preview-logo.png)",
+      "Bash(nix-instantiate --parse modules/nixos/plymouth.nix)",
+      "Bash(echo \"parse OK\")",
+      "Bash(echo \"=== build the plymouth theme derivation directly ===\")",
+      "Bash(nix-instantiate --parse modules/nixos/default.nix)",
+      "Bash(cp /nix/store/f18ij42lmpg07fn1m29aplayakx7kqpz-splash-test.png/* preview-splash-built.png)",
+      "Bash(cp /nix/store/f18ij42lmpg07fn1m29aplayakx7kqpz-splash-test.png preview-splash-built.png)",
+      "Bash(nix-instantiate --parse hosts/live.nix)",
+      "Bash(nix-instantiate --parse modules/home/stylix.nix)",
+      "Bash(nix-shell -p fontconfig --run \"fc-scan --format '%{family}\\\\n' modules/nixos/branding/Nomarchy.ttf\")"
     ]
   }
 }

README.md

@@ -316,10 +316,29 @@ close · `SUPER+1..9` workspaces · `Print` region screenshot.
   `nomarchy.osd.*`, media keys drive `swayosd-client`, themed from the JSON)
 - **Distro branding, round 2:** `distroName = "Nomarchy"` ships
   (os-release `PRETTY_NAME`, systemd-boot entries, ISO menu label).
-  Remaining: `isoImage.splashImage`/`grubTheme` art for the ISO boot
-  screen, tuigreet/MOTD text, and the `distroId` question (it changes
+  ✓ tuigreet greeting (`Welcome to <distroName>`) and a branded `users.motd`
+  (doubling as a helper cheat sheet), both keyed off `distroName`.
+  ✓ `isoImage.splashImage` — the vendored vector logo
+  (`modules/nixos/branding/logo.svg`, from legacy) recolored to the palette
+  accent on the theme base, built at ISO-build time (`hosts/live.nix`).
+  Remaining: `isoImage.grubTheme` so UEFI boot matches the isolinux splash
+  (needs a full grub theme dir), and the `distroId` question (it changes
   `DEFAULT_HOSTNAME` and upstream `isNixos` checks — needs a test pass;
   nixos-* CLI names stay regardless)
+- ✓ **fastfetch branding:** `modules/home/fastfetch.nix`
+  (`nomarchy.fastfetch.enable`) — the vendored vector logo, recolored to
+  the palette accent and rendered to compact block-art via chafa at build
+  time (tracks the theme), fronting a curated module list. Replaces the
+  oversized legacy ASCII with a themed, sized logo.
+- ✓ **Nomarchy logo font in Waybar:** vendored `Nomarchy.ttf`
+  (`modules/nixos/branding/`), installed via `fonts.packages`, and the
+  summer-day/night menu buttons now use its `U+F000` glyph with
+  `font-family: Nomarchy` pinned in their CSS (Nerd Fonts also occupy
+  U+F000, so the pin is required). The other themes have no logo button.
+- **Quality-of-life command aliases:** assemble a curated collection of
+  shell aliases/abbreviations for common operations (git, nix, navigation,
+  the nomarchy helpers, …), themed into the zsh shell experience
+  (`modules/home/shell.nix`). Decide scope and which to ship on by default.
 - **Theme-switch feedback:** ✓ the "rebuilding…" notification is now
   persistent (timeout 0) and replaced in place by "applied ✓" / failure
   via a synchronous tag, so a multi-minute switch never reads as a failed
@@ -341,10 +360,12 @@ close · `SUPER+1..9` workspaces · `Print` region screenshot.
   `nomarchy.apps.*` option surface so each is individually opt-out for
   users who want a leaner machine. Watch closure size (texlive-full is
   multi-GB — likely default-off or a lighter scheme).
-- **Plymouth logo contrast:** the shipped splash logo is too dark against
-  the dark `base` background; recolor/lighten it (or tint from the palette
-  `accent`/`text` instead of shipping a fixed navy asset) so it reads on
-  both light and dark themes.
+- ✓ **Plymouth logo contrast:** the shipped art was a fixed navy that
+  vanished on dark bases. `modules/nixos/plymouth.nix` now recolors every
+  element from the palette at build time (flat fill, alpha kept):
+  logo/lock/bullet → text, entry/progress-box → surface, progress-bar →
+  accent. Reads on light and dark; follows the theme as of the last system
+  rebuild (like the background tint).
 - **Hibernate double-unlock:** on resume from hibernate the LUKS
   passphrase already gates the machine, but hypridle's `before_sleep_cmd`
   also locks hyprlock, so the user types a password twice. Lock only on
@@ -395,3 +416,11 @@ close · `SUPER+1..9` workspaces · `Print` region screenshot.
   Waybar honours → all 10 rendered as phantoms. Dropped the block from
   `themes/summer-{day,night}/waybar.jsonc`; the other themes use the
   generated `waybar.nix`, which never had it, so they already match.
+- ✓ **GTK/Qt ignore the theme's light/dark mode:** Stylix set `polarity`
+  but not the `org.freedesktop.appearance color-scheme` that GTK4/libadwaita
+  and Qt6 read via the portal, so a light theme could still render apps
+  dark. `stylix.nix` now sets `dconf` `org/gnome/desktop/interface
+  color-scheme` = `prefer-light`/`prefer-dark` from `t.mode`
+  (xdg-desktop-portal-gtk already ships, and `programs.dconf` is on
+  system-side), so libadwaita/Qt follow the palette. Needs a live session
+  to confirm the portal picks it up for all apps.

hosts/live.nix

@@ -3,11 +3,27 @@
 # exists to test the distro end-to-end on real hardware.
 { lib, pkgs, username, nomarchySrc, ... }:
 
+let
+  # ISO boot splash: the Nomarchy monogram recolored to the palette accent,
+  # centred on the theme base. Built from the vendored vector logo and the
+  # live theme-state.json (tokyo-night by default). Shows on the isolinux
+  # (BIOS) boot menu; UEFI/GRUB still uses the stock theme (see roadmap).
+  state = builtins.fromJSON (builtins.readFile ../theme-state.json);
+  isoColor = key: fallback: lib.removePrefix "#" ((state.colors or { }).${key} or fallback);
+  isoSplash = pkgs.runCommand "nomarchy-iso-splash.png"
+    { nativeBuildInputs = [ pkgs.imagemagick pkgs.librsvg ]; } ''
+    rsvg-convert -h 320 ${../modules/nixos/branding/logo.svg} > logo.png
+    magick logo.png -fill "#${isoColor "accent" "7aa2f7"}" -colorize 100 logo-c.png
+    magick -size 1920x1080 xc:"#${isoColor "base" "1a1b26"}" \
+      logo-c.png -gravity center -composite $out
+  '';
+in
 {
   networking.hostName = "nomarchy-live";
 
   isoImage.volumeID = lib.mkForce "NOMARCHY_LIVE";
   isoImage.edition = lib.mkForce "live";
+  isoImage.splashImage = isoSplash;
 
   # The minimal-CD profile slims the image for a CONSOLE installer; this
   # ISO is the desktop, so re-enable what it strips. Above all

modules/home/default.nix

@@ -19,6 +19,7 @@
     ./osd.nix       # swayosd volume/brightness OSD, themed
     ./shell.nix     # zsh + starship + bat/eza/zoxide, themed
     ./keys.nix      # gpg-agent (fronts SSH) + pinentry-qt
+    ./fastfetch.nix # system info with the themed Nomarchy logo
   ];
 
   # Clipboard history (wl-paste watcher); browsed via the SUPER+CTRL+V

modules/home/fastfetch.nix

@@ -0,0 +1,50 @@
+# fastfetch — system summary fronted by the Nomarchy monogram. The logo is
+# rendered from the vendored vector mark (modules/nixos/branding/logo.svg)
+# via chafa at build time, recolored to the palette accent — so it's a
+# compact, themed block-art logo that tracks the theme on each
+# home-manager switch (rather than the oversized legacy ASCII).
+{ config, lib, pkgs, ... }:
+
+let
+  cfg = config.nomarchy;
+  c = cfg.theme.colors;
+
+  logo = pkgs.runCommand "nomarchy-fastfetch-logo"
+    { nativeBuildInputs = [ pkgs.imagemagick pkgs.librsvg pkgs.chafa ]; } ''
+    rsvg-convert -w 220 ${../nixos/branding/logo.svg} > logo.png
+    magick logo.png -fill "${c.accent}" -colorize 100 logo-c.png
+    chafa --format symbols --symbols block --size 20x10 --colors full --polite on logo-c.png > $out
+  '';
+in
+{
+  config = lib.mkIf cfg.fastfetch.enable {
+    programs.fastfetch = {
+      enable = true;
+      settings = {
+        logo = {
+          type = "file-raw";
+          source = "${logo}";
+          padding = { top = 1; left = 2; right = 3; };
+        };
+        display.separator = "  ";
+        modules = [
+          "break"
+          { type = "os"; key = "distro"; keyColor = "blue"; }
+          { type = "kernel"; key = "kernel"; keyColor = "blue"; }
+          { type = "uptime"; key = "uptime"; keyColor = "blue"; }
+          { type = "packages"; key = "pkgs"; keyColor = "blue"; }
+          { type = "wm"; key = "wm"; keyColor = "blue"; }
+          { type = "shell"; key = "shell"; keyColor = "blue"; }
+          { type = "terminal"; key = "term"; keyColor = "blue"; }
+          "break"
+          { type = "cpu"; key = "cpu"; keyColor = "magenta"; }
+          { type = "gpu"; key = "gpu"; keyColor = "magenta"; }
+          { type = "memory"; key = "memory"; keyColor = "magenta"; }
+          { type = "disk"; key = "disk"; keyColor = "magenta"; }
+          "break"
+          { type = "colors"; symbol = "circle"; }
+        ];
+      };
+    };
+  };
+}

modules/home/options.nix

@@ -70,6 +70,7 @@
     osd.enable = lib.mkEnableOption "swayosd on-screen display for volume/brightness/mute" // { default = true; };
     shell.enable = lib.mkEnableOption "the zsh shell experience (starship prompt, bat/eza/zoxide)" // { default = true; };
     keys.enable = lib.mkEnableOption "the SSH + GPG agent (gpg-agent fronting SSH, pinentry-qt)" // { default = true; };
+    fastfetch.enable = lib.mkEnableOption "fastfetch system info fronted by the themed Nomarchy logo" // { default = true; };
     ghostty.enable = lib.mkEnableOption "Nomarchy's Ghostty configuration" // { default = true; };
     btop.enable = lib.mkEnableOption "btop with the per-theme nomarchy theme" // { default = true; };
     stylix.enable = lib.mkEnableOption "Stylix theming for the long tail of apps (GTK, Qt, cursors)" // { default = true; };

modules/home/stylix.nix

@@ -86,5 +86,14 @@ in
         sizes.terminal = t.fonts.size;
       };
     };
+
+    # GTK4/libadwaita and Qt6 apps decide dark vs light from the XDG
+    # portal's color-scheme (org.freedesktop.appearance), which
+    # xdg-desktop-portal-gtk sources from this gsettings key. Stylix sets
+    # the GTK theme and `polarity` but not this, so a light theme still
+    # rendered libadwaita/Qt apps dark (and vice-versa). Drive it from the
+    # palette mode. (programs.dconf.enable is already on system-side.)
+    dconf.settings."org/gnome/desktop/interface".color-scheme =
+      if t.mode == "light" then "prefer-light" else "prefer-dark";
   };
 }

modules/nixos/branding/logo.svg

@@ -0,0 +1,64 @@
+<?xml version="1.0" encoding="UTF-8" standalone="no"?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg
+   width="157.40488mm"
+   height="162.48518mm"
+   viewBox="0 0 157.40488 162.48518"
+   version="1.1"
+   id="svg1"
+   xml:space="preserve"
+   inkscape:version="1.4.3 (0d15f75042, 2025-12-25)"
+   sodipodi:docname="icon.svg"
+   inkscape:export-filename="logo.png"
+   inkscape:export-xdpi="96"
+   inkscape:export-ydpi="96"
+   xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape"
+   xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd"
+   xmlns="http://www.w3.org/2000/svg"
+   xmlns:svg="http://www.w3.org/2000/svg"><sodipodi:namedview
+     id="namedview1"
+     pagecolor="#ffffff"
+     bordercolor="#000000"
+     borderopacity="0.25"
+     inkscape:showpageshadow="2"
+     inkscape:pageopacity="0.0"
+     inkscape:pagecheckerboard="0"
+     inkscape:deskcolor="#d1d1d1"
+     inkscape:document-units="mm"
+     inkscape:zoom="0.82803284"
+     inkscape:cx="216.175"
+     inkscape:cy="452.27675"
+     inkscape:window-width="1914"
+     inkscape:window-height="1012"
+     inkscape:window-x="0"
+     inkscape:window-y="0"
+     inkscape:window-maximized="0"
+     inkscape:current-layer="layer1"><inkscape:page
+       x="0"
+       y="-1.1741086e-21"
+       width="157.40488"
+       height="162.48518"
+       id="page2"
+       margin="0"
+       bleed="0" /></sodipodi:namedview><defs
+     id="defs1" /><g
+     inkscape:label="Layer 1"
+     inkscape:groupmode="layer"
+     id="layer1"
+     transform="translate(-28.332214,-25.599269)"><g
+       id="g4"
+       transform="translate(3.1953242,-22.686801)"
+       style="fill:#000088;fill-opacity:1"><path
+         style="fill:#000088;fill-opacity:1;stroke-width:0.264583"
+         d="M 25.136891,85.823024 25.557592,210.77125 88.452409,174.38061 67.417351,160.49747 57.110174,166.38729 V 105.80633 Z"
+         id="path1" /><path
+         style="fill:#000088;fill-opacity:1;stroke-width:0.264583"
+         d="M 67.728991,112.41131 182.54178,185.60757 153.16137,202.85259 67.830432,148.17947 Z"
+         id="path2" /><path
+         style="fill:#000088;fill-opacity:1;stroke-width:0.264583"
+         d="M 139.74857,145.88014 140.00405,110.4959 54.800856,56.333749 25.675926,73.32329 Z"
+         id="path3" /><path
+         style="fill:#000088;fill-opacity:1;stroke-width:0.264583"
+         d="M 182.2863,172.70573 V 48.286069 l -62.59305,36.406166 20.82177,13.668277 10.21927,-5.74834 0.12774,60.165978 z"
+         id="path4" /></g></g></svg>

modules/nixos/default.nix

@@ -9,6 +9,17 @@
 
 let
   cfg = config.nomarchy.system;
+  # Reused by the greeter banner and MOTD so the brand name lives in one
+  # place (system.nixos.distroName, set below).
+  distroName = config.system.nixos.distroName;
+
+  # The Nomarchy glyph font: a single-glyph face (the logo at U+F000) used
+  # by the Waybar menu button in the summer themes. Pinned via
+  # `font-family: Nomarchy` in their CSS, since Nerd Fonts also occupy
+  # U+F000 (a glass icon) and would otherwise win.
+  nomarchyLogoFont = pkgs.runCommandLocal "nomarchy-logo-font" { } ''
+    install -Dm444 ${./branding/Nomarchy.ttf} $out/share/fonts/truetype/Nomarchy.ttf
+  '';
 in
 {
   imports = [ ./options.nix ./plymouth.nix ./file-manager.nix ];
@@ -20,6 +31,19 @@ in
     # DEFAULT_HOSTNAME and upstream isNixos checks (see roadmap).
     system.nixos.distroName = lib.mkDefault "Nomarchy";
 
+    # MOTD on TTY/SSH login (the desktop auto-logs into Hyprland, so this
+    # is mostly seen over SSH or on a bare console). Branded, and doubles
+    # as a cheat sheet for the distro's own helpers.
+    users.motd = lib.mkDefault ''
+
+        ${distroName} — a NixOS desktop, themed from one JSON.
+
+        sys-update                          update inputs + rebuild the system
+        home-update                         apply home/theme changes (no sudo)
+        nomarchy-theme-sync apply <theme>   switch the whole palette
+        SUPER+?                             keybindings cheatsheet
+    '';
+
     # Unfree allowed distro-wide: pragmatic-desktop territory (vendor
     # GPU/wifi drivers, firmware, fonts, …). The custom nixpkgs-config
     # type can't carry a nested mkDefault; disagree with
@@ -42,7 +66,7 @@ in
         default_session = {
           # start-hyprland is Hyprland 0.55's watchdog launcher; running
           # the bare binary makes every session print a warning.
-          command = lib.mkDefault "${pkgs.tuigreet}/bin/tuigreet --time --remember --cmd start-hyprland";
+          command = lib.mkDefault "${pkgs.tuigreet}/bin/tuigreet --time --remember --greeting 'Welcome to ${distroName}' --cmd start-hyprland";
           user = "greeter";
         };
         # Boot straight into the session once; logout → normal greeter.
@@ -141,6 +165,8 @@ in
         # The legacy-ported waybar identities (summer-day/night) use
         # FontAwesome codepoints in their layouts and list it in css.
         font-awesome
+        # The Nomarchy logo glyph (U+F000) for the summer menu button.
+        nomarchyLogoFont
       ];
       fontconfig.defaultFonts = {
         monospace = lib.mkDefault [ "JetBrainsMono Nerd Font" ];

modules/nixos/plymouth.nix

@@ -14,7 +14,16 @@ let
     if cfg.stateFile != null
     then builtins.fromJSON (builtins.readFile cfg.stateFile)
     else { };
-  base = lib.removePrefix "#" ((state.colors or { }).base or "#1a1b26");
+  colorOf = key: fallback: lib.removePrefix "#" ((state.colors or { }).${key} or fallback);
+  base = colorOf "base" "#1a1b26";
+  # Splash elements are recolored from the palette so they read on any
+  # base, light or dark: foreground glyphs → text, field/track boxes →
+  # surface (raised from base in both polarities), the progress fill →
+  # accent. The shipped art is a fixed navy that vanished on dark themes.
+  text = colorOf "text" "#a9b1d6";
+  surface = colorOf "surface" "#32344a";
+  accent = colorOf "accent" "#7aa2f7";
+  magick = lib.getExe' pkgs.imagemagick "magick";
 
   # Plymouth's Window.SetBackgroundTopColor takes three floats in
   # 0.0–1.0; the .plymouth metadata's ConsoleLogBackgroundColor takes a
@@ -36,13 +45,26 @@ let
 
     src = ./plymouth;
 
+    nativeBuildInputs = [ pkgs.imagemagick ];
+
     installPhase = ''
-      mkdir -p $out/share/plymouth/themes/nomarchy
-      cp * $out/share/plymouth/themes/nomarchy/
+      themedir=$out/share/plymouth/themes/nomarchy
+      mkdir -p "$themedir"
+      cp * "$themedir/"
+
+      # Recolor the splash art from the palette (flat fill, alpha kept) so
+      # it reads on any base instead of the shipped fixed navy.
+      recolor() { ${magick} "$themedir/$1" -fill "#$2" -colorize 100 "$themedir/$1"; }
+      recolor logo.png         ${text}     # centre monogram
+      recolor lock.png         ${text}     # password-prompt padlock
+      recolor bullet.png       ${text}     # password dots
+      recolor entry.png        ${surface}  # password field box
+      recolor progress_box.png ${surface}  # progress track
+      recolor progress_bar.png ${accent}   # progress fill
 
       # Point the .plymouth metadata into the store
-      sed -i "s|/usr/share/plymouth/themes/nomarchy|$out/share/plymouth/themes/nomarchy|g" \
-        $out/share/plymouth/themes/nomarchy/nomarchy.plymouth
+      sed -i "s|/usr/share/plymouth/themes/nomarchy|$themedir|g" \
+        "$themedir/nomarchy.plymouth"
 
       # Bake the theme's base color: RGB floats for the script's
       # Window.SetBackground* calls, 0xRRGGBB for ConsoleLogBackground.
@@ -50,9 +72,9 @@ let
         -e 's|@BG_R@|${channel 0}|g' \
         -e 's|@BG_G@|${channel 2}|g' \
         -e 's|@BG_B@|${channel 4}|g' \
-        $out/share/plymouth/themes/nomarchy/nomarchy.script
+        "$themedir/nomarchy.script"
       sed -i 's|@BG_HEX@|${base}|g' \
-        $out/share/plymouth/themes/nomarchy/nomarchy.plymouth
+        "$themedir/nomarchy.plymouth"
     '';
   };
 in

themes/summer-day/waybar.css

@@ -90,6 +90,10 @@ window#waybar {
   margin-left: 15px;
   padding-left: 20px;
   padding-right: 21px;
+  /* The Nomarchy mark lives at U+F000 in the dedicated "Nomarchy" font;
+     pin the family or the Nerd Font's glass icon at U+F000 wins. */
+  font-family: Nomarchy;
+  font-size: 18px;
 }
 
 #custom-powermenu {

themes/summer-day/waybar.jsonc

@@ -23,7 +23,7 @@
 
   "custom/launcher": {
     "interval": "once",
-    "format": "󰣇",
+    "format": "\uf000",
     "on-click": "nomarchy-menu",
     "tooltip-format": "Nomarchy menu"
   },

themes/summer-night/waybar.css

@@ -99,6 +99,9 @@ window#waybar {
   margin-left: 15px;
   padding-left: 20px;
   padding-right: 21px;
+  /* The Nomarchy mark lives at U+F000 in the dedicated "Nomarchy" font;
+     pin the family or the Nerd Font's glass icon at U+F000 wins. */
+  font-family: Nomarchy;
   font-size: 20px;
 }
 

themes/summer-night/waybar.jsonc

@@ -23,7 +23,7 @@
 
   "custom/nomarchy": {
     "interval": "once",
-    "format": "󱄅",
+    "format": "\uf000",
     "on-click": "nomarchy-menu",
     "tooltip-format": "Nomarchy menu"
   },