From 246f2cf360e6809a6999e667ba8c3a2ff2d7dfe9 Mon Sep 17 00:00:00 2001 From: Ari Sosnovsky Date: Tue, 20 Oct 2026 15:05:27 -0400 Subject: [PATCH] bye superset --- flake.nix | 1 - hosts/fwbook/packages.nix | 1 - modules/core/default.nix | 2 - modules/lib.nix | 1 - pkgs/ABOUTME.md | 1 - pkgs/superset-desktop/default.nix | 132 ------------------------------ pkgs/superset-desktop/update.sh | 33 -------- 7 files changed, 171 deletions(-) delete mode 100644 pkgs/superset-desktop/default.nix delete mode 100755 pkgs/superset-desktop/update.sh diff --git a/flake.nix b/flake.nix index 563e99f..64eb1e2 100644 --- a/flake.nix +++ b/flake.nix @@ -302,7 +302,6 @@ skyg-dns-records = dnsRecordsFile; ds4 = my-nixpkgs.legacyPackages.${system}.ds4; buzz-desktop = lib.pkgs.${system}.buzz-desktop; - superset-desktop = lib.pkgs.${system}.superset-desktop; delta-editor = lib.pkgs.${system}.delta-editor; colibri = lib.pkgs.${system}.colibri; herdr = herdr.packages.${system}.default; diff --git a/hosts/fwbook/packages.nix b/hosts/fwbook/packages.nix index 316dc02..cf55473 100644 --- a/hosts/fwbook/packages.nix +++ b/hosts/fwbook/packages.nix @@ -173,7 +173,6 @@ in bubblewrap delta-editor herdr - superset-desktop ai-usagebar.packages.${pkgs.stdenv.hostPlatform.system}.default hermes-agent.packages.${pkgs.stdenv.hostPlatform.system}.default diff --git a/modules/core/default.nix b/modules/core/default.nix index 1ae9b04..e4e922f 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -26,8 +26,6 @@ niri-touchscreen-gestures = final.callPackage ../../pkgs/niri-touchscreen-gestures { }; # Buzz Desktop AppImage wrapper, see pkgs/buzz-desktop. buzz-desktop = final.callPackage ../../pkgs/buzz-desktop { }; - # Superset Desktop AppImage wrapper, see pkgs/superset-desktop. - superset-desktop = final.callPackage ../../pkgs/superset-desktop { }; # Delta Editor (Zed Industries) prebuilt tarball, see pkgs/delta-editor. delta-editor = final.callPackage ../../pkgs/delta-editor { }; diff --git a/modules/lib.nix b/modules/lib.nix index 6fca8c5..73f54c8 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -32,7 +32,6 @@ let colibri = final.callPackage ../pkgs/colibri { }; niri-touchscreen-gestures = final.callPackage ../pkgs/niri-touchscreen-gestures { }; buzz-desktop = final.callPackage ../pkgs/buzz-desktop { }; - superset-desktop = final.callPackage ../pkgs/superset-desktop { }; delta-editor = final.callPackage ../pkgs/delta-editor { }; }) ]; diff --git a/pkgs/ABOUTME.md b/pkgs/ABOUTME.md index c2f052f..9b7acd2 100644 --- a/pkgs/ABOUTME.md +++ b/pkgs/ABOUTME.md @@ -10,7 +10,6 @@ Packages here are exposed via an overlay defined in `modules/core/default.nix`. | `colibri/` | colibrì (`JustVugg/colibri`) — GLM-5.2/OLMoE local inference engine, built from source, pinned to a tagged release. Backend-parameterized (`backend = "cpu" \| "rocm"`). Exposed as `pkgs.colibri` (cpu, default), `pkgs.colibri-rocm` (Strix Halo / gfx1151). Installs the `coli` CLI (wrapped with the Python env its converter/bench subcommands need) plus the bundled `colibri`/`olmoe` engine binaries. Model weights are a runtime concern and not packaged. | | `niri-touchscreen-gestures/` | Python daemon that reads multi-touch events from a touchscreen via `evdev`, detects 2/3/4-finger swipes (up/down/left/right), and dispatches configurable `niri msg action` commands. Configured via TOML; exposed as `pkgs.niri-touchscreen-gestures`. | | `buzz-desktop/` | Block Buzz desktop (Type-2 AppImage from `block/buzz`). Wrapped with `appimageTools.wrapType2` plus extra FHS libs (`elfutils`, `zstd`, WebKit/tray, GStreamer good/bad) so it runs on NixOS. Exposed as `pkgs.buzz-desktop` (`buzz-desktop` binary + desktop entry / icons). | -| `superset-desktop/` | Superset Desktop (Type-2 AppImage from `superset-sh/superset`). Wrapped with `appimageTools.wrapType2` plus extra FHS libs (`elfutils`, `zstd`, WebKit/tray, GStreamer good/bad) so it runs on NixOS. Exposed as `pkgs.superset-desktop` (`superset-desktop` binary + desktop entry / icons). | | `delta-editor/` | Delta Editor (Zed Industries' AI-native editor, `delta.dev`) prebuilt tarball. No stable URL exists — the release API returns a short-lived signed R2 link — so `src` is a fixed-output derivation that resolves the API at build time. Interpreter/RPATH patched (`--force-rpath`, `dontPatchELF`), dlopen'd graphics libs (`libglvnd`, `vulkan-loader`, `wayland`) added via wrapper, `XKB_CONFIG_ROOT` set for the bundled libxkbcommon. Exposed as `pkgs.delta-editor` (`delta-editor` binary + desktop entry / icons); named `-editor` to avoid clashing with the `delta` git diff pager. | ## Adding a New Package diff --git a/pkgs/superset-desktop/default.nix b/pkgs/superset-desktop/default.nix deleted file mode 100644 index 5963cca..0000000 --- a/pkgs/superset-desktop/default.nix +++ /dev/null @@ -1,132 +0,0 @@ -{ lib -, fetchurl -, appimageTools -, runCommand -}: - -# Superset Desktop — AI-enabled workspace and IDE (superset-sh/superset). -# -# Upstream ships a Type-2 AppImage. On NixOS we need: -# 1. FHS libs missing from appimageTools.defaultFhsEnvArgs (elfutils, zstd, …) -# 2. WebKit DMA-BUF disabled — Superset only auto-enables this when it detects a -# real AppImage (`APPIMAGE` env). wrapAppImage runs the extracted AppDir. -# 3. Explicit GST_PLUGIN_SYSTEM_PATH_1_0 for WebKit media elements. -# 4. Drop the upstream AppRun hook that hardcodes `GDK_BACKEND=x11` (breaks -# Wayland clipboard under niri). -# 5. Drop AppImage-bundled OpenSSL 3.0 — AppRun prepends $APPDIR/usr/lib to -# LD_LIBRARY_PATH, so that old libssl shadows nixpkgs OpenSSL 3.2+ and -# breaks GStreamer plugins / curl (`OPENSSL_3.2.0' not found`). -# -# To bump: set `version`, then: -# nix hash file --type sha256 --sri <(curl -fsSL \ -# https://github.com/superset-sh/superset/releases/download/desktop-v${version}/superset-${version}-x86_64.AppImage) - -let - pname = "superset-desktop"; - version = "1.38.0"; - - src = fetchurl { - url = "https://github.com/superset-sh/superset/releases/download/desktop-v${version}/superset-${version}-x86_64.AppImage"; - hash = "sha256-F0Dka9zVsbtsPlmSgaQo/hh2z4qc9Sf/cOIV5HubrSw="; - }; - - extracted = appimageTools.extractType2 { - inherit pname version src; - }; - - appdir = runCommand "${pname}-appdir" { } '' - cp -a ${extracted}/. "$out" - chmod -R u+w "$out" - - # Prefer Wayland (clipboard) over hard-coded X11 from linuxdeploy. - hook="$out/apprun-hooks/linuxdeploy-plugin-gtk.sh" - if [ -f "$hook" ]; then - sed -i \ - -e 's/^export GDK_BACKEND=x11/# export GDK_BACKEND=x11 # nixos: allow Wayland for clipboard/' \ - "$hook" - fi - - # AppRun.wrapped forces LD_LIBRARY_PATH=$APPDIR/usr/lib first. The bundled - # libssl/libcrypto are OpenSSL 3.0.x and lack OPENSSL_3.2.0, which nixpkgs - # curl / gstreamer plugins need. Remove them so the FHS OpenSSL is used - # (libssl.so.3 soname is ABI-compatible for this use). - rm -f \ - "$out/usr/lib"/libssl.so \ - "$out/usr/lib"/libssl.so.* \ - "$out/usr/lib"/libcrypto.so \ - "$out/usr/lib"/libcrypto.so.* - ''; -in -appimageTools.wrapAppImage { - inherit pname version; - src = appdir; - - extraPkgs = pkgs: with pkgs; [ - elfutils # libelf.so.1 - zstd # libzstd.so.1 - openssl # replaces removed AppImage OpenSSL - curl - webkitgtk_4_1 - libsoup_3 - libayatana-appindicator - # WebKit media: appsink/appsrc (base), autoaudiosink (good) - gst_all_1.gstreamer - gst_all_1.gst-plugins-base - gst_all_1.gst-plugins-good - gst_all_1.gst-plugins-bad - gst_all_1.gst-plugins-ugly - gst_all_1.gst-libav - # Clipboard / desktop integration - wl-clipboard - xdg-utils - ]; - - profile = '' - # WebKit blank-window workaround (Superset sets this itself only for real AppImages). - export WEBKIT_DISABLE_DMABUF_RENDERER=1 - export WEBKIT_DISABLE_COMPOSITING_MODE=1 - - # Do not force X11 — Wayland clipboard with niri. - unset GDK_BACKEND - export GTK_USE_PORTAL=1 - - # GStreamer plugins from the FHS root (after AppDir OpenSSL removal they - # can load nixpkgs plugins that need OpenSSL 3.2+). - export GST_PLUGIN_SYSTEM_PATH_1_0="/usr/lib/gstreamer-1.0''${GST_PLUGIN_SYSTEM_PATH_1_0:+:$GST_PLUGIN_SYSTEM_PATH_1_0}" - export GST_PLUGIN_PATH="/usr/lib/gstreamer-1.0''${GST_PLUGIN_PATH:+:$GST_PLUGIN_PATH}" - ''; - - extraInstallCommands = '' - # Desktop entry is at AppDir root (not in usr/share/applications/). - install -Dm444 ${appdir}/superset.desktop \ - $out/share/applications/superset-desktop.desktop - substituteInPlace $out/share/applications/superset-desktop.desktop \ - --replace-fail 'Exec=superset' 'Exec=${pname}' \ - --replace-fail 'Icon=superset' 'Icon=${pname}' - - # Icons in usr/share/icons/hicolor/*/apps/ - for size in 16x16 32x32 48x48 64x64 128x128 256x256 512x512 1024x1024; do - icon=${appdir}/usr/share/icons/hicolor/$size/apps/superset.png - if [ -f "$icon" ]; then - install -Dm644 "$icon" \ - $out/share/icons/hicolor/$size/apps/${pname}.png - fi - done - # Also handle the root-level symlink as fallback - if [ ! -e $out/share/icons/hicolor/128x128/apps/${pname}.png ] \ - && [ -f ${appdir}/superset.png ]; then - install -Dm644 ${appdir}/superset.png \ - $out/share/icons/hicolor/128x128/apps/${pname}.png - fi - ''; - - meta = { - description = "Superset Desktop — AI-enabled workspace and IDE"; - homepage = "https://github.com/superset-sh/superset"; - changelog = "https://github.com/superset-sh/superset/releases/tag/desktop-v${version}"; - license = lib.licenses.asl20; - sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; - platforms = [ "x86_64-linux" ]; - mainProgram = "superset-desktop"; - }; -} diff --git a/pkgs/superset-desktop/update.sh b/pkgs/superset-desktop/update.sh deleted file mode 100755 index 5a687bd..0000000 --- a/pkgs/superset-desktop/update.sh +++ /dev/null @@ -1,33 +0,0 @@ -#!/usr/bin/env bash -# Bump superset-desktop to a new version. -# Usage: ./update.sh [] -# With version: bump to that version. -# Without args: auto-detect latest from GitHub releases. -set -euo pipefail - -PKG="superset-desktop" -REPO="superset-sh/superset" -URL_TEMPLATE="https://github.com/superset-sh/superset/releases/download/desktop-v\${VERSION}/superset-\${VERSION}-x86_64.AppImage" - -if [ $# -ge 1 ]; then - VERSION="$1" -else - echo "Auto-detecting latest superset-desktop version..." - VERSION=$(curl -fsSL "https://api.github.com/repos/${REPO}/releases" \ - | jq -r '[.[] | select(.tag_name | startswith("desktop-v")) | .tag_name | sub("^desktop-v"; "")] | .[0]') - if [ -z "$VERSION" ]; then - echo "Could not auto-detect latest version from GitHub." - echo "Usage: $0 []" - exit 1 - fi - echo "Latest: $VERSION" -fi - -URL=$(eval "echo $URL_TEMPLATE") - -sed -i "s/version = \".*\";/version = \"${VERSION}\";/" default.nix - -HASH=$(nix hash file --type sha256 --sri <(curl -fsSL "$URL")) -sed -i "s|hash = \".*\";|hash = \"${HASH}\";|" default.nix - -echo "✅ ${PKG} bumped to ${VERSION}"