diff --git a/flake.nix b/flake.nix index bdab59a..7eb75d3 100644 --- a/flake.nix +++ b/flake.nix @@ -118,6 +118,7 @@ email = "ariel@sosnovsky.ca"; }; rootDir = ./.; + configsDir = ./configs; inherit nixpkgs nixpkgs-unstable @@ -131,6 +132,17 @@ ; specialArgs = { + skyg-secrets = { + buzz-env = ./secrets/buzz-env.age; + cloudflare-dns = ./secrets/cloudflare-dns.age; + portainer-agent-minipc1 = ./secrets/portainer-agent-minipc1.age; + portainer-agent-bigbox1 = ./secrets/portainer-agent-bigbox1.age; + portainer-tls-key = ./secrets/portainer-tls-key.age; + stack1 = ./secrets/stack1.age; + stack2 = ./secrets/stack2.age; + portainer-agent-minipc3 = ./secrets/portainer-agent-minipc3.age; + portainer-cert = ./configs/pki/portainer.app.internal.crt; + }; inherit hyprlauncher hyprland @@ -246,7 +258,7 @@ ds4 = my-nixpkgs.legacyPackages.${system}.ds4; buzz-desktop = lib.pkgs.${system}.buzz-desktop; superset-desktop = lib.pkgs.${system}.superset-desktop; - delta = lib.pkgs.${system}.delta; + 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 34ab7c1..7ed5bd6 100644 --- a/hosts/fwbook/packages.nix +++ b/hosts/fwbook/packages.nix @@ -115,7 +115,7 @@ unstablePkgs.claude-code buzz-desktop bubblewrap - delta + delta-editor herdr superset-desktop diff --git a/hosts/hl-bigbox1/services/portainer.nix b/hosts/hl-bigbox1/services/portainer.nix index 4f1d760..d9c2b3c 100644 --- a/hosts/hl-bigbox1/services/portainer.nix +++ b/hosts/hl-bigbox1/services/portainer.nix @@ -1,6 +1,6 @@ -{ config, ... }: +{ config, skyg-secrets, ... }: { - age.secrets.portainer-agent-bigbox1.file = "${config.skyg.rootDir}/secrets/portainer-agent-bigbox1.age"; + age.secrets.portainer-agent-bigbox1.file = skyg-secrets.portainer-agent-bigbox1; skyg.nixos.server.portainer = { enable = true; diff --git a/hosts/hl-minipc1/default.nix b/hosts/hl-minipc1/default.nix index 6448ae2..3d50342 100644 --- a/hosts/hl-minipc1/default.nix +++ b/hosts/hl-minipc1/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ config, pkgs, skyg-secrets, ... }: let ports = { nixServe = 5000; @@ -56,7 +56,7 @@ in skyg.nixos.server.k3s.enable = false; skyg.networkDrives.enable = true; - age.secrets.buzz-env.file = "${config.skyg.rootDir}/secrets/buzz-env.age"; + age.secrets.buzz-env.file = skyg-secrets.buzz-env; environment.systemPackages = [ buzz-manage ]; diff --git a/hosts/hl-minipc1/services/acme.nix b/hosts/hl-minipc1/services/acme.nix index c14b86f..03c3cd7 100644 --- a/hosts/hl-minipc1/services/acme.nix +++ b/hosts/hl-minipc1/services/acme.nix @@ -1,6 +1,6 @@ -{ config, pkgs, ... }: +{ config, pkgs, skyg-secrets, ... }: { - age.secrets.cloudflare-dns.file = "${config.skyg.rootDir}/secrets/cloudflare-dns.age"; + age.secrets.cloudflare-dns.file = skyg-secrets.cloudflare-dns; skyg.server.acme = { enable = true; diff --git a/hosts/hl-minipc1/services/portainer.nix b/hosts/hl-minipc1/services/portainer.nix index 4b1cf46..cde416e 100644 --- a/hosts/hl-minipc1/services/portainer.nix +++ b/hosts/hl-minipc1/services/portainer.nix @@ -1,6 +1,6 @@ -{ config, ... }: +{ config, skyg-secrets, ... }: { - age.secrets.portainer-agent-minipc1.file = "${config.skyg.rootDir}/secrets/portainer-agent-minipc1.age"; + age.secrets.portainer-agent-minipc1.file = skyg-secrets.portainer-agent-minipc1; skyg.nixos.server.portainer = { enable = true; diff --git a/hosts/hl-minipc2/services/portainer.nix b/hosts/hl-minipc2/services/portainer.nix index da26887..642c1ad 100644 --- a/hosts/hl-minipc2/services/portainer.nix +++ b/hosts/hl-minipc2/services/portainer.nix @@ -1,13 +1,13 @@ -{ ... }: +{ config, skyg-secrets, ... }: { - age.secrets.portainer-tls-key.file = "${config.skyg.rootDir}/secrets/portainer-tls-key.age"; + age.secrets.portainer-tls-key.file = skyg-secrets.portainer-tls-key; skyg.nixos.server.portainer = { enable = true; mode = "server"; server.tls = { enable = true; - cert = builtins.readFile "${config.skyg.rootDir}/configs/pki/portainer.app.internal.crt"; + cert = builtins.readFile skyg-secrets.portainer-cert; keySecretName = "portainer-tls-key"; }; }; diff --git a/hosts/hl-minipc2/services/stack1.nix b/hosts/hl-minipc2/services/stack1.nix index 799e162..58de6c7 100644 --- a/hosts/hl-minipc2/services/stack1.nix +++ b/hosts/hl-minipc2/services/stack1.nix @@ -1,6 +1,6 @@ -{ config, ... }: +{ config, skyg-secrets, ... }: { - age.secrets.stack1.file = "${config.skyg.rootDir}/secrets/stack1.age"; + age.secrets.stack1.file = skyg-secrets.stack1; skyg.nixos.common.container-services.stack1 = { enable = true; autoUpdate.enable = true; diff --git a/hosts/hl-minipc2/services/stack2.nix b/hosts/hl-minipc2/services/stack2.nix index 439a4f0..aa92027 100644 --- a/hosts/hl-minipc2/services/stack2.nix +++ b/hosts/hl-minipc2/services/stack2.nix @@ -1,6 +1,6 @@ -{ config, ... }: +{ config, skyg-secrets, ... }: { - age.secrets.stack2.file = "${config.skyg.rootDir}/secrets/stack2.age"; + age.secrets.stack2.file = skyg-secrets.stack2; skyg.nixos.common.container-services.stack2 = { enable = true; autoUpdate.enable = true; diff --git a/hosts/hl-minipc3/default.nix b/hosts/hl-minipc3/default.nix index 3642ccd..9ac0689 100644 --- a/hosts/hl-minipc3/default.nix +++ b/hosts/hl-minipc3/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ config, skyg-secrets, ... }: { imports = [ ./hardware-configuration @@ -20,7 +20,7 @@ envPath = "/opt/k3s/k3s.env"; }; - age.secrets.portainer-agent-minipc3.file = "${config.skyg.rootDir}/secrets/portainer-agent-minipc3.age"; + age.secrets.portainer-agent-minipc3.file = skyg-secrets.portainer-agent-minipc3; skyg.nixos.server.portainer = { enable = true; mode = "agent"; diff --git a/modules/core/default.nix b/modules/core/default.nix index 333c006..1ae9b04 100644 --- a/modules/core/default.nix +++ b/modules/core/default.nix @@ -11,6 +11,10 @@ type = lib.types.path; description = "Top-level path of the nixos-setup repo (set by the flake)."; }; + skyg.configsDir = lib.mkOption { + type = lib.types.path; + description = "Path to the configs directory (set by the flake)."; + }; }; config = { nixpkgs.overlays = [ @@ -24,8 +28,8 @@ buzz-desktop = final.callPackage ../../pkgs/buzz-desktop { }; # Superset Desktop AppImage wrapper, see pkgs/superset-desktop. superset-desktop = final.callPackage ../../pkgs/superset-desktop { }; - # Delta (Zed Industries) prebuilt tarball, see pkgs/delta. - delta = final.callPackage ../../pkgs/delta { }; + # Delta Editor (Zed Industries) prebuilt tarball, see pkgs/delta-editor. + delta-editor = final.callPackage ../../pkgs/delta-editor { }; # herdr (herdrdev/herdr) — see flake.nix input. herdr = herdr.packages.${final.stdenv.hostPlatform.system}.default; diff --git a/modules/lib.nix b/modules/lib.nix index bdfdd4f..b8b6583 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -2,6 +2,7 @@ , nixpkgs-unstable , user , rootDir +, configsDir , determinate , home-manager , nix-darwin @@ -32,7 +33,7 @@ let niri-touchscreen-gestures = final.callPackage ../pkgs/niri-touchscreen-gestures { }; buzz-desktop = final.callPackage ../pkgs/buzz-desktop { }; superset-desktop = final.callPackage ../pkgs/superset-desktop { }; - delta = final.callPackage ../pkgs/delta { }; + delta-editor = final.callPackage ../pkgs/delta-editor { }; }) ]; } @@ -112,6 +113,7 @@ in inherit user rootDir + configsDir hostName systemStateVersion; }) diff --git a/modules/main.nix b/modules/main.nix index e7a05a3..c5fcc81 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -2,6 +2,7 @@ , systemStateVersion , hostName , rootDir +, configsDir , ... }: { lib, ... }: { @@ -17,6 +18,7 @@ email = lib.mkDefault user.email; }; skyg.rootDir = rootDir; + skyg.configsDir = configsDir; skyg.core.hostName = hostName; skyg.home-manager.version = lib.mkDefault "26.05"; system.stateVersion = systemStateVersion; diff --git a/pkgs/ABOUTME.md b/pkgs/ABOUTME.md index a52b501..7be1f32 100644 --- a/pkgs/ABOUTME.md +++ b/pkgs/ABOUTME.md @@ -5,13 +5,13 @@ Packages here are exposed via an overlay defined in `modules/core/default.nix`. ## Contents -| Package | Description | -| ---------------------------- | -------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | -| `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/` | Delta (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`), dlopen'd graphics libs (`libglvnd`, `vulkan-loader`, `wayland`) added via wrapper, `XKB_CONFIG_ROOT` set for the bundled libxkbcommon. Exposed as `pkgs.delta` (`delta` binary + desktop entry / icons). | +| Package | Description | +| ---------------------------- | ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- | +| `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/delta/default.nix b/pkgs/delta-editor/default.nix similarity index 89% rename from pkgs/delta/default.nix rename to pkgs/delta-editor/default.nix index 459a180..c6715ab 100644 --- a/pkgs/delta/default.nix +++ b/pkgs/delta-editor/default.nix @@ -28,7 +28,7 @@ # To bump: set `version`, then run ./update.sh . let - pname = "delta"; + pname = "delta-editor"; version = "0.17.0"; apiUrl = "https://delta.dev/api/releases/nightly/${version}/asset?asset=delta&os=linux&arch=x86_64"; @@ -83,12 +83,16 @@ stdenvNoCC.mkDerivation { $out/lib/delta/bin/delta mkdir -p $out/bin - makeWrapper $out/lib/delta/bin/delta $out/bin/delta \ + makeWrapper $out/lib/delta/bin/delta $out/bin/delta-editor \ --prefix LD_LIBRARY_PATH : "${lib.makeLibraryPath [ libglvnd vulkan-loader wayland ]}" \ --set XKB_CONFIG_ROOT ${xkeyboard_config}/share/X11/xkb install -Dm444 $out/lib/delta/share/applications/dev.zed.Delta.desktop \ $out/share/applications/dev.zed.Delta.desktop + # Point the launcher at the renamed binary (avoids clashing with the + # `delta` git diff pager). + substituteInPlace $out/share/applications/dev.zed.Delta.desktop \ + --replace-fail 'Exec=delta ' 'Exec=delta-editor ' cp -a $out/lib/delta/share/icons/. $out/share/icons/ runHook postInstall @@ -100,6 +104,6 @@ stdenvNoCC.mkDerivation { license = lib.licenses.unfree; sourceProvenance = [ lib.sourceTypes.binaryNativeCode ]; platforms = [ "x86_64-linux" ]; - mainProgram = "delta"; + mainProgram = "delta-editor"; }; } diff --git a/pkgs/delta/update.sh b/pkgs/delta-editor/update.sh similarity index 98% rename from pkgs/delta/update.sh rename to pkgs/delta-editor/update.sh index 6f143cf..547726a 100755 --- a/pkgs/delta/update.sh +++ b/pkgs/delta-editor/update.sh @@ -5,7 +5,7 @@ # Without args: auto-detect latest nightly from the delta.dev release API. set -euo pipefail -PKG="delta" +PKG="delta-editor" API="https://delta.dev/api/releases/nightly" ASSET="asset=delta&os=linux&arch=x86_64"