aiolabs/omnixient
9
0
Fork 0
Code Issues 5 Pull requests Projects Releases Packages Wiki Activity Actions

fix(core): handle null omnixy.preset everywhere it's interpolated

Browse source 
Same null-vs-missing bug as the fastfetch fix, across lib.nix (env var +
status echo), menus.nix, scripts.nix, and fastfetch's about screen:
`cfg.preset or "…"` returns null (not the fallback) because preset
defaults to null. Any consumer that doesn't set a preset hit 'cannot
coerce null to a string'. Replace with explicit null checks.

Co-Authored-By: Claude Opus 4.8 <noreply@anthropic.com>
This commit is contained in:
Padreug 2026-06-28 10:45:21 +02:00
commit 8011163293
4 changed files with 5 additions and 5 deletions
Download patch file Download diff file Expand all files Collapse all files

2
modules/fastfetch.nix
View file

@ -31,7 +31,7 @@ in
cat /etc/omni/branding/about.txt
echo
echo "Theme: ${cfg.theme}"
echo "Preset: ${cfg.preset or "custom"}"
echo "Preset: ${if cfg.preset == null then "custom" else cfg.preset}"
echo "User: ${cfg.user}"
echo "NixOS Version: $(nixos-version)"
echo

4
modules/lib.nix
View file

@ -148,7 +148,7 @@ in
environment.variables = {
OMNI_USER = cfg.user;
OMNI_THEME = cfg.theme;
OMNI_PRESET = cfg.preset or "custom";
OMNI_PRESET = if cfg.preset == null then "custom" else cfg.preset;
OMNI_CONFIG_DIR = helpers.paths.config;
OMNI_CACHE_DIR = helpers.paths.cache;
};
@ -174,7 +174,7 @@ in
echo "Configuration:"
echo " User: ${cfg.user}"
echo " Theme: ${cfg.theme}"
echo " Preset: ${cfg.preset or "none"}"
echo " Preset: ${if cfg.preset == null then "none" else cfg.preset}"
echo ""
echo "Colors (base16 scheme):"
echo " Background: ${helpers.colors.bg}"

2
modules/menus.nix
View file

@ -44,7 +44,7 @@ in
echo -e "''${WHITE} 🚀 Declarative • 🎨 Beautiful • ⚡ Fast''${NC}"
echo
echo -e "''${BLUE}═══════════════════════════════════════════════════════''${NC}"
echo -e "''${WHITE} Theme: ''${YELLOW}${cfg.theme}''${WHITE} │ User: ''${GREEN}${cfg.user}''${WHITE} │ Preset: ''${PURPLE}${cfg.preset or "custom"}''${NC}"
echo -e "''${WHITE} Theme: ''${YELLOW}${cfg.theme}''${WHITE} │ User: ''${GREEN}${cfg.user}''${WHITE} │ Preset: ''${PURPLE}${if cfg.preset == null then "custom" else cfg.preset}''${NC}"
echo -e "''${BLUE}═══════════════════════════════════════════════════════''${NC}"
echo
}

2
modules/scripts.nix
View file

@ -25,7 +25,7 @@ in
echo "│ 🐧 OS: NixOS $(nixos-version)"
echo "│ 🎨 Theme: ${cfg.theme}"
echo "│ 👤 User: ${cfg.user}"
echo "│ 🏠 Preset: ${cfg.preset or "custom"}"
echo "│ 🏠 Preset: ${if cfg.preset == null then "custom" else cfg.preset}"
echo "│"
echo "│ 🔧 Uptime: $(uptime -p)"
echo "│ 💾 Memory: $(free -h | awk 'NR==2{printf "%.1f/%.1fGB (%.0f%%)", $3/1024/1024, $2/1024/1024, $3*100/$2}')"