diff options
| author | Nathan Reiner <nathan@nathanreiner.xyz> | 2026-11-17 21:34:24 +0100 |
|---|---|---|
| committer | Nathan Reiner <nathan@nathanreiner.xyz> | 2026-11-17 21:34:24 +0100 |
| commit | ea3db6f10b20d36bc496022e07a724b0b952b9b5 (patch) | |
| tree | a89278dc8fae82a93863ae408307dc127aa7ed38 | |
| parent | 5c29063131d9203eb60814898ba4af77914a0c4a (diff) | |
fix overlays
| -rw-r--r-- | flake.nix | 59 |
1 files changed, 35 insertions, 24 deletions
@@ -8,27 +8,17 @@ # src-tauri/src/lib.rs defines the web app URL as a COMPILE-TIME # constant: option_env!("LUMO_URL") with default # "https://lumo.proton.dev" — Proton's INTERNAL DEV environment. -# Building from the public repo without injection therefore talks to -# the dev endpoint, whose certificate the system trust store rightly -# rejects ("Unacceptable TLS certificate"). Production builds get -# LUMO_URL injected in Proton's internal CI. We do the same via the -# derivation environment (option_env! reads it at compile time). +# We inject the production URL via the derivation environment. # -# RUNTIME PIECES (all verified necessary step by step): +# RUNTIME PIECES (verified): # * libayatana-appindicator on LD_LIBRARY_PATH (tray dlopen) -# * glib-networking in buildInputs — GIO's gnutls TLS backend for -# WebKitGTK HTTPS (confirmed loaded in G_MESSAGES_DEBUG logs); -# wrapGAppsHook exports GIO_EXTRA_MODULES, that suffices -# * cacert bundle exported for any OpenSSL-style consumers -# * GIO_MODULE_DIR experiment REMOVED — the backend was found -# without it; --set would have hidden other GIO modules. +# * glib-networking in buildInputs (GIO gnutls TLS for WebKitGTK) +# * LUMO_URL = https://lumo.proton.me at build time # -# VERIFIED (GitHub file tree + README + build/run logs, branch master): -# * src-tauri/Cargo.toml, src-tauri/Cargo.lock committed -# * webview npm script: `npm run build:webview` — builds fine offline -# * upstream version from package.json (currently 0.5.9) -# * updater WARN (missing "linux-x86_64" platform) was a symptom of -# the dev endpoint; should disappear with the production URL. +# OVERLAY NOTE: overlays.default must be TOP-LEVEL, not inside +# eachDefaultSystem (flake-utils would namespace it to +# overlays.<system>.default and consumers wouldn't find it). It maps +# the consumer's system via final.system, not a hardcoded one. { description = "Lumo Desktop, Proton's privacy-first AI assistant (Tauri)"; @@ -166,13 +156,21 @@ type = "app"; program = "${lumo-desktop}/bin/lumo-desktop"; }; - - overlays.default = final: _: { - lumo-desktop = lumo-desktop; - }; }) // { + # ------------------------------------------------------------ + # System-INDEPENDENT outputs live here, OUTSIDE eachDefaultSystem. + # ------------------------------------------------------------ + + overlays.default = final: _prev: { + # Map the CONSUMER's system, not ours; falls back to their + # x86_64-linux build only if their system is exotic. + lumo-desktop = + self.packages.${final.system}.lumo-desktop + or self.packages.x86_64-linux.lumo-desktop; + }; + # Minimal Home Manager module: just adds the package. homeManagerModules.default = { config, lib, pkgs, ... }: { options.services.lumo-desktop = { @@ -184,7 +182,20 @@ }; }; - # Optional rolling-master timer (unchanged): - # systemd timer running `nix flake update lumo-src` daily. + # Optional rolling-master timer (drop into your NixOS config): + # systemd.services.lumo-desktop-update = { + # description = "Update lumo-desktop flake input to master"; + # serviceConfig = { + # Type = "oneshot"; + # User = "nathan"; + # WorkingDirectory = "/home/nathan/projekte/lumo-flake"; + # }; + # script = ''${pkgs.nix}/bin/nix flake update lumo-src''; + # }; + # systemd.timers.lumo-desktop-update = { + # wantedBy = [ "timers.target" ]; + # timerConfig.OnCalendar = "daily"; + # timerConfig.Persistent = true; + # }; }; } |