From fc58adf80f1795c378637f3848cec14d9dace592 Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sat, 14 Nov 2026 09:54:18 -0500 Subject: [PATCH] lasuite migration --- .../quadraticserver/lasuite-docs/default.nix | 347 +++++++++++------- .../quadraticserver/lasuite-docs/minio.nix | 317 ---------------- flake.lock | 116 ++---- flake.nix | 6 - secrets/lasuiteYProviderKey.age | 5 + secrets/minioCredentials.age | 11 - secrets/versityCredentials.age | 5 + 7 files changed, 248 insertions(+), 559 deletions(-) delete mode 100644 clients/quadraticserver/lasuite-docs/minio.nix create mode 100644 secrets/lasuiteYProviderKey.age delete mode 100644 secrets/minioCredentials.age create mode 100644 secrets/versityCredentials.age diff --git a/clients/quadraticserver/lasuite-docs/default.nix b/clients/quadraticserver/lasuite-docs/default.nix index 03c8182..0386aa0 100644 --- a/clients/quadraticserver/lasuite-docs/default.nix +++ b/clients/quadraticserver/lasuite-docs/default.nix @@ -1,154 +1,239 @@ { - inputs, config, pkgs, + lib, ... }: let - s3Domain = "http://127.0.0.1${config.services.minio-vendored.listenAddress}"; cfg = config.services.lasuite-docs; - # FIXME: pinned to 5.7.0 until migrated to 6.x - lasuitePkgs = import inputs.nixpkgs-lasuite { inherit (pkgs.stdenv.hostPlatform) system; }; + secrets = config.age.secrets; + + domain = "docs.federated.nexus"; + authDomain = "auth.federated.nexus"; + socket = "/run/lasuite-docs-gunicorn/socket"; + + # Attachments are stored in VersityGW, on the storage box like the continuwuity media + bucket = "lasuite-docs"; + s3Host = "127.0.0.1:7070"; + + s3AccessKey = "lasuite-docs"; + versityDir = "/var/lib/versitygw"; + + backendEnvironmentFiles = [ + secrets."lasuiteSecrets.age".path + secrets."lasuiteYProviderKey.age".path + secrets."versityCredentials.age".path + ]; in { - disabledModules = [ "services/web-apps/lasuite-docs.nix" ]; - imports = [ - "${inputs.nixpkgs-lasuite}/nixos/modules/services/web-apps/lasuite-docs.nix" - inputs.lasuite-docs-proxy.nixosModules.default - ]; - - nixpkgs.overlays = [ - (_: _: { - inherit (lasuitePkgs) - lasuite-docs - lasuite-docs-frontend - lasuite-docs-collaboration-server - ; - }) + systemd.mounts = [ + { + requires = [ "storagebox-online.service" ]; + after = [ "storagebox-online.service" ]; + what = "u675579@u675579.your-storagebox.de:/lasuite-docs"; + where = versityDir; + type = "fuse.sshfs"; + options = builtins.concatStringsSep "," [ + "_netdev" + "reconnect" + "ServerAliveInterval=15" + "ServerAliveCountMax=3" + "IdentityFile=/home/quadradical/.ssh/id_ed25519" + "allow_other" + ]; + } ]; systemd.services = { - lasuite-docs-collaboration-server.serviceConfig = { - EnvironmentFile = cfg.environmentFile; + lasuite-docs.serviceConfig = { + EnvironmentFile = lib.mkForce backendEnvironmentFiles; + Restart = "always"; + # FIXME: the socket gets its own runtime dir, as the shared lasuite-docs one is deleted + # whenever any unit using it stops, e.g. celery or the lasuite-docs-setup-keys oneshot + RuntimeDirectory = lib.mkForce [ + "lasuite-docs" + "lasuite-docs-gunicorn" + ]; + }; + + lasuite-docs-celery.serviceConfig = { + EnvironmentFile = lib.mkForce backendEnvironmentFiles; Restart = "always"; }; - lasuite-docs-celery.serviceConfig.Restart = "always"; - lasuite-docs.serviceConfig.Restart = "always"; - }; - - services = - let - proxySocket = "/var/run/lasuite-docs-proxy/socket"; - authDomain = "auth.federated.nexus"; - domain = "docs.federated.nexus"; - s3Url = "${s3Domain}/lasuite-docs"; - socket = "/var/run/lasuite-docs/socket"; - in - { - lasuite-docs-proxy = { - enable = true; - args = [ - "--socket" - proxySocket - "--authUri" - "https://docs.federated.nexus/api/v1.0/documents/media-auth/" - "--minioUri" - s3Url - ]; - group = "caddy"; - }; - lasuite-docs = { - enable = true; - enableNginx = false; - redis.createLocally = true; - postgresql.createLocally = true; - frontendPackage = pkgs.lasuite-docs-frontend.overrideAttrs { - NEXT_PUBLIC_PUBLISH_AS_MIT = "false"; - }; - bind = "unix:${socket}"; - inherit s3Url domain; - - settings = { - OIDC_OP_AUTHORIZATION_ENDPOINT = "https://federated.nexus/login"; - OIDC_OP_TOKEN_ENDPOINT = "https://${authDomain}/token"; - OIDC_OP_USER_ENDPOINT = "https://${authDomain}/userinfo"; - OIDC_RP_SIGN_ALGO = "HS256"; - - COLLABORATION_API_URL = "https://${domain}/collaboration/api/"; - LOGIN_REDIRECT_URL = "https://${domain}"; - - AWS_S3_ENDPOINT_URL = s3Domain; - AWS_S3_ACCESS_KEY_ID = "minioadmin"; - AWS_STORAGE_BUCKET_NAME = "lasuite-docs"; - MEDIA_BASE_URL = "https://${domain}"; - - DJANGO_ALLOWED_HOSTS = domain; - DJANGO_LANGUAGES = "en-us,English;fr-fr,Français;el-el,Ελληνικά;nl-nl,Nederlands;es-es,Español;uk-ua,УкраїнÑ�ька;ru-ru,РуÑ�Ñ�кий"; - }; - - environmentFile = config.age.secrets."lasuiteSecrets.age".path; - }; - - minio-vendored = { - enable = true; - rootCredentialsFile = config.age.secrets."minioCredentials.age".path; - }; - - caddy.virtualHosts."${domain}".extraConfig = - let - collabUrl = "http://localhost:${toString cfg.collaborationServer.port}"; - in - '' - handle_errors { - rewrite * /{http.error.status_code} - file_server - } - - redir /api/v1.0/logout/None / - - root * ${cfg.frontendPackage} - file_server - - @uuidDocs path_regexp uuidDocs ^/docs/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/?$ - rewrite @uuidDocs /docs/[id]/index.html - - reverse_proxy /static/admin/* unix/${socket} - reverse_proxy /api/* unix/${socket} - reverse_proxy /admin* unix/${socket} - - reverse_proxy /collaboration/ws/* ${collabUrl} - reverse_proxy /collaboration/api/* ${collabUrl} - - reverse_proxy /api/v1.0/documents/media-auth/ unix/${socket} - - reverse_proxy /media/* unix/${proxySocket} - ''; + lasuite-docs-yhub-server.serviceConfig = { + EnvironmentFile = secrets."lasuiteYProviderKey.age".path; + Restart = "always"; }; - systemd.services.minio-init = { - description = "Create MinIO bucket"; - after = [ "minio.service" ]; - requires = [ "minio.service" ]; - wantedBy = [ "multi-user.target" ]; - path = with pkgs; [ - getent - minio-client - ]; + lasuite-docs-yhub-server-setup-db = { + # FIXME: missing upstream, it can otherwise race postgres at boot + after = [ "postgresql.target" ]; + wants = [ "postgresql.target" ]; + # FIXME: the module sets POSTGRES="" for createLocally, but y-init-db skips creating the + # tables when it is empty. No host means the PGHOST socket, and the user is the unit's own. + environment.POSTGRES = lib.mkForce "postgres:///lasuite-docs-yhub-server"; + }; - serviceConfig = { - Type = "oneshot"; - EnvironmentFile = config.age.secrets."minioCredentials.age".path; - ExecStart = pkgs.writeShellScript "init-minio" '' - mc alias set minio ${s3Domain} "$MINIO_ROOT_USER" "$MINIO_ROOT_PASSWORD" --api s3v4 - mc mb --ignore-existing minio/lasuite-docs - mc anonymous get minio/lasuite-docs + versitygw = { + description = "Versity S3 Gateway"; + after = [ "network.target" ]; + wantedBy = [ "multi-user.target" ]; + unitConfig.RequiresMountsFor = [ versityDir ]; + serviceConfig = { + ExecStartPre = "${pkgs.coreutils}/bin/mkdir -p ${versityDir}/data ${versityDir}/meta"; + # sshfs has no xattrs (metadata goes to a sidecar dir instead), O_TMPFILE nor reliable flock + ExecStart = lib.escapeShellArgs [ + (lib.getExe pkgs.versitygw) + "--port" + s3Host + "--access" + s3AccessKey + "--quiet" + "posix" + "--sidecar" + "${versityDir}/meta" + "--disableotmp" + "--object-lock-mode" + "local" + "--disable-copy-file-range" + "${versityDir}/data" + ]; + # ROOT_SECRET_KEY + EnvironmentFile = secrets."versityCredentials.age".path; + Restart = "always"; + + # No StateDirectory, systemd would try to chown the sshfs mount + DynamicUser = true; + ReadWritePaths = [ versityDir ]; + UMask = "0077"; + CapabilityBoundingSet = [ "" ]; + LockPersonality = true; + MemoryDenyWriteExecute = true; + NoNewPrivileges = true; + PrivateDevices = true; + ProtectClock = true; + ProtectControlGroups = true; + ProtectHome = true; + ProtectHostname = true; + ProtectKernelLogs = true; + ProtectKernelModules = true; + ProtectKernelTunables = true; + ProtectProc = "invisible"; + ProcSubset = "pid"; + RestrictAddressFamilies = [ + "AF_INET" + "AF_INET6" + "AF_UNIX" + ]; + RestrictNamespaces = true; + RestrictRealtime = true; + SystemCallArchitectures = "native"; + SystemCallFilter = [ "@system-service" ]; + }; + }; + + versitygw-init = { + description = "Create VersityGW bucket"; + after = [ "versitygw.service" ]; + requires = [ "versitygw.service" ]; + wantedBy = [ "multi-user.target" ]; + path = [ pkgs.rclone ]; + environment = { + RCLONE_CONFIG_VERSITY_TYPE = "s3"; + RCLONE_CONFIG_VERSITY_PROVIDER = "Other"; + RCLONE_CONFIG_VERSITY_ENDPOINT = "http://${s3Host}"; + RCLONE_CONFIG_VERSITY_ACCESS_KEY_ID = s3AccessKey; + }; + serviceConfig = { + Type = "oneshot"; + RemainAfterExit = true; + EnvironmentFile = secrets."versityCredentials.age".path; + Restart = "on-failure"; + RestartSec = 5; + }; + script = '' + RCLONE_CONFIG_VERSITY_SECRET_ACCESS_KEY="$ROOT_SECRET_KEY" rclone mkdir versity:${bucket} ''; }; }; - nixpkgs.config.permittedInsecurePackages = [ - "minio-2025-10-15T17-29-55Z" - "minio-client-2025-08-13T08-35-41Z" - ]; + services = { + lasuite-docs = { + enable = true; + enableNginx = false; + redis.createLocally = true; + postgresql.createLocally = true; + frontendPackage = pkgs.lasuite-docs-frontend.overrideAttrs { + NEXT_PUBLIC_PUBLISH_AS_MIT = "false"; + }; + bind = "unix:${socket}"; + s3Url = "http://${s3Host}/${bucket}"; + inherit domain; + + # Both default to true, for migrating from 5.x, which is done + collaborationServer.enable = false; + yhub.settings.SOFT_MIGRATION = false; + + settings = { + OIDC_OP_AUTHORIZATION_ENDPOINT = "https://federated.nexus/login"; + OIDC_OP_TOKEN_ENDPOINT = "https://${authDomain}/token"; + OIDC_OP_USER_ENDPOINT = "https://${authDomain}/userinfo"; + OIDC_RP_SIGN_ALGO = "HS256"; + + LOGIN_REDIRECT_URL = "https://${domain}"; + + AWS_S3_ENDPOINT_URL = "http://${s3Host}"; + AWS_S3_ACCESS_KEY_ID = s3AccessKey; + AWS_STORAGE_BUCKET_NAME = bucket; + MEDIA_BASE_URL = "https://${domain}"; + + DJANGO_ALLOWED_HOSTS = domain; + DJANGO_LANGUAGES = "en-us,English;fr-fr,Français;el-el,Ελληνικά;nl-nl,Nederlands;es-es,Español;uk-ua,УкраїнÑ�ька;ru-ru,РуÑ�Ñ�кий"; + }; + + environmentFile = secrets."lasuiteSecrets.age".path; + }; + + caddy.virtualHosts.${domain}.extraConfig = '' + handle_errors { + rewrite * /{http.error.status_code} + file_server + } + + redir /api/v1.0/logout/None / + + root * ${cfg.frontendPackage} + file_server + + @uuidDocs path_regexp uuidDocs ^/docs/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/?$ + rewrite @uuidDocs /docs/[id]/index.html + + @userReconciliations path_regexp userReconciliations ^/user-reconciliations/(active|inactive)/[0-9a-f]{8}-[0-9a-f]{4}-4[0-9a-f]{3}-[89ab][0-9a-f]{3}-[0-9a-f]{12}/?$ + rewrite @userReconciliations /user-reconciliations/{re.userReconciliations.1}/[id]/index.html + + reverse_proxy /static/admin/* unix/${socket} + reverse_proxy /api/* unix/${socket} + reverse_proxy /admin* unix/${socket} + + @yhub path /collaboration/ws/v1/* /collaboration/ydoc/* /collaboration/activity/* /collaboration/changeset/* /collaboration/rollback/* /collaboration/jwks/* + reverse_proxy @yhub localhost:${toString cfg.yhub.settings.PORT} + + route /media/* { + forward_auth unix/${socket} { + uri /api/v1.0/documents/media-auth/ + header_up X-Original-URL {http.request.orig_uri} + copy_headers Authorization X-Amz-Date X-Amz-Content-SHA256 + } + + uri strip_prefix /media + rewrite * /${bucket}{uri} + header Content-Security-Policy "default-src 'none'" + reverse_proxy ${s3Host} { + header_up Host {upstream_hostport} + header_up -Cookie + } + } + ''; + }; } diff --git a/clients/quadraticserver/lasuite-docs/minio.nix b/clients/quadraticserver/lasuite-docs/minio.nix deleted file mode 100644 index 8bed6cd..0000000 --- a/clients/quadraticserver/lasuite-docs/minio.nix +++ /dev/null @@ -1,317 +0,0 @@ -# MinIO package and module, vendored from nixpkgs 6510408d147d8c5e6d76043e899e9251756f6a75 -# (nixos/modules/services/web-servers/minio.nix and pkgs/by-name/mi/minio/package.nix), since -# both were removed upstream because MinIO was abandoned. Only here until lasuite-docs is -# migrated to another S3 server. -# -# Changes from upstream: -# - The option is `services.minio-vendored`, since nixpkgs still reserves `services.minio` to -# show a removal message. The unit, user and paths are unchanged, so existing data keeps working. -# - The package is defined here, as `pkgs.minio` now throws, and without `passthru.tests`, as -# `nixosTests.minio` was removed too. -{ - config, - lib, - pkgs, - ... -}: - -with lib; - -let - cfg = config.services.minio-vendored; - - minio = pkgs.callPackage ( - { - lib, - buildGoModule, - fetchFromGitHub, - }: - let - # The web client verifies, that the server version is a valid datetime string: - # https://github.com/minio/minio/blob/3a0e7347cad25c60b2e51ff3194588b34d9e424c/browser/app/js/web.js#L51-L53 - # - # Example: - # versionToTimestamp "2021-04-22T15-44-28Z" - # => "2021-04-22T15:44:28Z" - versionToTimestamp = - version: - let - splitTS = builtins.elemAt (builtins.split "(.*)(T.*)" version) 1; - in - builtins.concatStringsSep "" [ - (builtins.elemAt splitTS 0) - (builtins.replaceStrings [ "-" ] [ ":" ] (builtins.elemAt splitTS 1)) - ]; - - # CopyrightYear will be printed to the CLI UI. - # Example: - # versionToYear "2021-04-22T15-44-28Z" - # => "2021" - versionToYear = version: builtins.elemAt (lib.splitString "-" version) 0; - in - buildGoModule (finalAttrs: { - pname = "minio"; - version = "2025-10-15T17-29-55Z"; - - src = fetchFromGitHub { - owner = "minio"; - repo = "minio"; - rev = "RELEASE.${finalAttrs.version}"; - hash = "sha256-HbjmCJYkWyRRHKriLP6QohaXYLk3QEVfi32Krq3ujjo="; - }; - - vendorHash = "sha256-BFnTJE9QFWmPsx90hDTG8MusdnwaBPYJxM5bCFk3hew="; - - doCheck = false; - - subPackages = [ "." ]; - - env.CGO_ENABLED = 0; - - tags = [ "kqueue" ]; - - ldflags = - let - t = "github.com/minio/minio/cmd"; - in - [ - "-s" - "-w" - "-X ${t}.Version=${versionToTimestamp finalAttrs.version}" - "-X ${t}.CopyrightYear=${versionToYear finalAttrs.version}" - "-X ${t}.ReleaseTag=RELEASE.${finalAttrs.version}" - "-X ${t}.CommitID=${finalAttrs.src.rev}" - ]; - - meta = { - homepage = "https://www.minio.io/"; - description = "S3-compatible object storage server"; - changelog = "https://github.com/minio/minio/releases/tag/RELEASE.${finalAttrs.version}"; - maintainers = with lib.maintainers; [ - bachp - ryan4yin - ]; - license = lib.licenses.agpl3Plus; - mainProgram = "minio"; - knownVulnerabilities = [ - "CVE-2026-40344: MinIO has an Unauthenticated Object Write via Missing Signature Verification in Unsigned-Trailer Uploads" - "CVE-2026-41145: Unauthenticated Object Write via Query-String Credential Signature Bypass in Unsigned-Trailer Uploads" - "CVE-2026-33322: JWT Algorithm Confusion in OIDC Authentication" - "CVE-2026-33419: LDAP login brute-force via user enumeration and missing rate limit" - "CVE-2026-34204: SSE Metadata Injection via Replication Headers" - "CVE-2026-39414: DoS via Unbounded Memory Allocation in S3 Select CSV Parsing" - "minio has been abandoned by upstream and security issues won't be fixed. Users should migrate to alternatives such as Garage, SeaweedFS, or Ceph. S3-compatible clients such as rclone can be used to move data." - ]; - }; - }) - ) { }; - - legacyCredentials = - cfg: - pkgs.writeText "minio-legacy-credentials" '' - MINIO_ROOT_USER=${cfg.accessKey} - MINIO_ROOT_PASSWORD=${cfg.secretKey} - ''; -in -{ - options.services.minio-vendored = { - enable = mkEnableOption "Minio Object Storage"; - - listenAddress = mkOption { - default = ":9000"; - type = types.str; - description = "IP address and port of the server."; - }; - - consoleAddress = mkOption { - default = ":9001"; - type = types.str; - description = "IP address and port of the web UI (console)."; - }; - - dataDir = mkOption { - default = [ "/var/lib/minio/data" ]; - type = types.listOf (types.either types.path types.str); - description = "The list of data directories or nodes for storing the objects. Use one path for regular operation and the minimum of 4 endpoints for Erasure Code mode."; - }; - - configDir = mkOption { - default = "/var/lib/minio/config"; - type = types.path; - description = "The config directory, for the access keys and other settings."; - }; - - certificatesDir = mkOption { - default = "/var/lib/minio/certs"; - type = types.path; - description = "The directory where TLS certificates are stored."; - }; - - accessKey = mkOption { - default = ""; - type = types.str; - description = '' - Access key of 5 to 20 characters in length that clients use to access the server. - This overrides the access key that is generated by minio on first startup and stored inside the - `configDir` directory. - ''; - }; - - secretKey = mkOption { - default = ""; - type = types.str; - description = '' - Specify the Secret key of 8 to 40 characters in length that clients use to access the server. - This overrides the secret key that is generated by minio on first startup and stored inside the - `configDir` directory. - ''; - }; - - rootCredentialsFile = mkOption { - type = types.nullOr types.path; - default = null; - description = '' - File containing the MINIO_ROOT_USER, default is "minioadmin", and - MINIO_ROOT_PASSWORD (length >= 8), default is "minioadmin"; in the format of - an EnvironmentFile=, as described by {manpage}`systemd.exec(5)`. - ''; - example = "/etc/nixos/minio-root-credentials"; - }; - - region = mkOption { - default = "us-east-1"; - type = types.str; - description = '' - The physical location of the server. By default it is set to us-east-1, which is same as AWS S3's and Minio's default region. - ''; - }; - - browser = mkOption { - default = true; - type = types.bool; - description = "Enable or disable access to web UI."; - }; - - package = mkOption { - type = types.package; - default = minio; - defaultText = literalMD "MinIO 2025-10-15T17-29-55Z, vendored above"; - description = "The MinIO package to use."; - }; - }; - - config = mkIf cfg.enable { - warnings = - optional ((cfg.accessKey != "") || (cfg.secretKey != "")) - "services.minio-vendored.`accessKey` and services.minio-vendored.`secretKey` are deprecated, please use services.minio-vendored.`rootCredentialsFile` instead."; - - systemd = lib.mkMerge [ - { - tmpfiles.rules = [ - "d '${cfg.configDir}' - minio minio - -" - ] - ++ (map (x: "d '" + x + "' - minio minio - - ") (builtins.filter lib.types.path.check cfg.dataDir)); - - services.minio = { - description = "Minio Object Storage"; - wants = [ "network-online.target" ]; - after = [ "network-online.target" ]; - wantedBy = [ "multi-user.target" ]; - serviceConfig = { - ExecStart = "${cfg.package}/bin/minio server --json --address ${cfg.listenAddress} --console-address ${cfg.consoleAddress} --config-dir=${cfg.configDir} --certs-dir=${cfg.certificatesDir} ${toString cfg.dataDir}"; - Type = "simple"; - User = "minio"; - Group = "minio"; - LimitNOFILE = 65536; - EnvironmentFile = - if (cfg.rootCredentialsFile != null) then - cfg.rootCredentialsFile - else if ((cfg.accessKey != "") || (cfg.secretKey != "")) then - (legacyCredentials cfg) - else - null; - - # hardening - DevicePolicy = "closed"; - CapabilityBoundingSet = ""; - RestrictAddressFamilies = [ - "AF_INET" - "AF_INET6" - "AF_NETLINK" - "AF_UNIX" - ]; - DeviceAllow = ""; - NoNewPrivileges = true; - PrivateDevices = true; - PrivateMounts = true; - PrivateTmp = true; - PrivateUsers = true; - ProtectClock = true; - ProtectControlGroups = true; - ProtectHome = true; - ProtectKernelLogs = true; - ProtectKernelModules = true; - ProtectKernelTunables = true; - MemoryDenyWriteExecute = true; - LockPersonality = true; - RemoveIPC = true; - RestrictNamespaces = true; - RestrictRealtime = true; - RestrictSUIDSGID = true; - SystemCallArchitectures = "native"; - SystemCallFilter = [ - "@system-service" - "~@privileged" - ]; - ProtectProc = "invisible"; - ProtectHostname = true; - UMask = "0077"; - # minio opens /proc/mounts on startup - ProcSubset = "all"; - }; - environment = { - MINIO_REGION = "${cfg.region}"; - MINIO_BROWSER = "${if cfg.browser then "on" else "off"}"; - }; - }; - } - - (lib.mkIf (cfg.rootCredentialsFile != null) { - # The service will fail if the credentials file is missing - services.minio.unitConfig.ConditionPathExists = cfg.rootCredentialsFile; - - # The service will not restart if the credentials file has - # been changed. This can cause stale root credentials. - paths.minio-root-credentials = { - wantedBy = [ "multi-user.target" ]; - - pathConfig = { - PathChanged = [ cfg.rootCredentialsFile ]; - Unit = "minio-restart.service"; - }; - }; - - services.minio-restart = { - description = "Restart MinIO"; - - script = '' - systemctl restart minio.service - ''; - - serviceConfig = { - Type = "oneshot"; - Restart = "on-failure"; - RestartSec = 5; - }; - }; - }) - ]; - - users.users.minio = { - group = "minio"; - uid = config.ids.uids.minio; - }; - - users.groups.minio.gid = config.ids.uids.minio; - }; -} diff --git a/flake.lock b/flake.lock index 16b299a..49ad3b0 100644 --- a/flake.lock +++ b/flake.lock @@ -199,7 +199,7 @@ "crane": "crane_2", "fenix": "fenix_2", "flake-compat": "flake-compat_3", - "flake-parts": "flake-parts_8", + "flake-parts": "flake-parts_7", "nixpkgs": [ "nexus", "nixpkgs" @@ -521,24 +521,6 @@ "inputs": { "nixpkgs-lib": "nixpkgs-lib_9" }, - "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_11": { - "inputs": { - "nixpkgs-lib": "nixpkgs-lib_10" - }, "locked": { "lastModified": 1785627969, "narHash": "sha256-4dtXQk/NMePegK/nWp5NSeuZKLATItOq61lpEvmXqGw=", @@ -553,7 +535,7 @@ "type": "github" } }, - "flake-parts_12": { + "flake-parts_11": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -673,11 +655,11 @@ "nixpkgs-lib": "nixpkgs-lib_6" }, "locked": { - "lastModified": 1749398372, - "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "lastModified": 1793576659, + "narHash": "sha256-V1h85lUaJBQoHFrB2vpXZOE0Ju1MYSnIpsehoVZYlDo=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "rev": "ea2630b7470978622c7689a1ff75d2b389175399", "type": "github" }, "original": { @@ -709,11 +691,11 @@ "nixpkgs-lib": "nixpkgs-lib_8" }, "locked": { - "lastModified": 1793576659, - "narHash": "sha256-V1h85lUaJBQoHFrB2vpXZOE0Ju1MYSnIpsehoVZYlDo=", + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "ea2630b7470978622c7689a1ff75d2b389175399", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", "type": "github" }, "original": { @@ -905,27 +887,6 @@ "type": "github" } }, - "lasuite-docs-proxy": { - "inputs": { - "flake-parts": "flake-parts_6", - "nixpkgs": [ - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1778277588, - "narHash": "sha256-BpfZLilp8GdH056PFZErXc9Sx1vBizGUEQj1SzrOnwY=", - "ref": "refs/heads/main", - "rev": "7f43decde89eb6ffe873a4addbd8928f6f076a18", - "revCount": 11, - "type": "git", - "url": "https://git.federated.nexus/Henry-Hiles/lasuite_docs_proxy" - }, - "original": { - "type": "git", - "url": "https://git.federated.nexus/Henry-Hiles/lasuite_docs_proxy" - } - }, "lk-jwt-service-module": { "flake": false, "locked": { @@ -940,7 +901,7 @@ }, "matrixoidc": { "inputs": { - "flake-parts": "flake-parts_7", + "flake-parts": "flake-parts_6", "nixpkgs": [ "nixpkgs" ] @@ -977,7 +938,7 @@ "nexus": { "inputs": { "continuwuity": "continuwuity_2", - "flake-parts": "flake-parts_9", + "flake-parts": "flake-parts_8", "nix2flatpak": "nix2flatpak", "nixpkgs": [ "nixpkgs" @@ -1000,7 +961,7 @@ }, "nexusbot": { "inputs": { - "flake-parts": "flake-parts_10", + "flake-parts": "flake-parts_9", "nixpkgs": [ "nixpkgs" ] @@ -1113,22 +1074,6 @@ "type": "github" } }, - "nixpkgs-lasuite": { - "locked": { - "lastModified": 1793726008, - "narHash": "sha256-jQp1wKvbwWdLBASTXkSi/VYmDJ5AbBi1WvcMt9HWJC8=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396", - "type": "github" - }, - "original": { - "owner": "nixos", - "repo": "nixpkgs", - "rev": "1d060086d60cb76a40cf37109f979d88a5bd6396", - "type": "github" - } - }, "nixpkgs-lib": { "locked": { "lastModified": 1793504054, @@ -1144,21 +1089,6 @@ "type": "github" } }, - "nixpkgs-lib_10": { - "locked": { - "lastModified": 1785031560, - "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", - "owner": "nix-community", - "repo": "nixpkgs.lib", - "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "nixpkgs.lib", - "type": "github" - } - }, "nixpkgs-lib_2": { "locked": { "lastModified": 1761765539, @@ -1221,11 +1151,11 @@ }, "nixpkgs-lib_6": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1793504054, + "narHash": "sha256-ThkfL3D/FhCiZFc9+3BtxwuMmpuK+/bGtXCSo1+yVew=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "7851ba61fd862b277cb6a9cef37394bc18bb94e4", "type": "github" }, "original": { @@ -1251,11 +1181,11 @@ }, "nixpkgs-lib_8": { "locked": { - "lastModified": 1793504054, - "narHash": "sha256-ThkfL3D/FhCiZFc9+3BtxwuMmpuK+/bGtXCSo1+yVew=", + "lastModified": 1748740939, + "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "7851ba61fd862b277cb6a9cef37394bc18bb94e4", + "rev": "656a64127e9d791a334452c6b6606d17539476e2", "type": "github" }, "original": { @@ -1266,11 +1196,11 @@ }, "nixpkgs-lib_9": { "locked": { - "lastModified": 1748740939, - "narHash": "sha256-rQaysilft1aVMwF14xIdGS3sj1yHlI6oKQNBRTF40cc=", + "lastModified": 1785031560, + "narHash": "sha256-OmshNvn2vupOFpYinLUu+1Dnpu4n7Q5N3ggGVNHpkUI=", "owner": "nix-community", "repo": "nixpkgs.lib", - "rev": "656a64127e9d791a334452c6b6606d17539476e2", + "rev": "0e79af5e3d4dcfcd676ab5ba3f95d2e3352e078c", "type": "github" }, "original": { @@ -1319,7 +1249,6 @@ "gaypanel": "gaypanel", "gnome-mobile": "gnome-mobile", "home-manager": "home-manager", - "lasuite-docs-proxy": "lasuite-docs-proxy", "lk-jwt-service-module": "lk-jwt-service-module", "matrixoidc": "matrixoidc", "nexus": "nexus", @@ -1327,7 +1256,6 @@ "nix-maid": "nix-maid", "nixphone": "nixphone", "nixpkgs": "nixpkgs", - "nixpkgs-lasuite": "nixpkgs-lasuite", "run0-sudo-shim": "run0-sudo-shim", "sable": "sable", "sable-next": "sable-next", @@ -1411,7 +1339,7 @@ "sable": { "inputs": { "fenix": "fenix_3", - "flake-parts": "flake-parts_11", + "flake-parts": "flake-parts_10", "git-hooks": "git-hooks", "nixpkgs": [ "nixpkgs" @@ -1459,7 +1387,7 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme_2", - "flake-parts": "flake-parts_12", + "flake-parts": "flake-parts_11", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" diff --git a/flake.nix b/flake.nix index e7dc1e3..50c1562 100755 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,6 @@ { inputs = { nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - # FIXME: pinned for lasuite-docs 5.7.0 until migrated to 6.x - nixpkgs-lasuite.url = "github:nixos/nixpkgs/1d060086d60cb76a40cf37109f979d88a5bd6396"; wrapper-manager.url = "git+https://codeberg.org/viperML/wrapper-manager"; flake-parts.url = "github:hercules-ci/flake-parts"; nix-maid.url = "git+https://codeberg.org/viperML/nix-maid"; @@ -50,10 +48,6 @@ url = "git+https://git.federated.nexus/Nexus/nexus"; inputs.nixpkgs.follows = "nixpkgs"; }; - lasuite-docs-proxy = { - url = "git+https://git.federated.nexus/Henry-Hiles/lasuite_docs_proxy"; - inputs.nixpkgs.follows = "nixpkgs"; - }; cozybot = { url = "git+https://git.federated.nexus/Henry-Hiles/cozybot"; inputs.nixpkgs.follows = "nixpkgs"; diff --git a/secrets/lasuiteYProviderKey.age b/secrets/lasuiteYProviderKey.age new file mode 100644 index 0000000..a685ad6 --- /dev/null +++ b/secrets/lasuiteYProviderKey.age @@ -0,0 +1,5 @@ +age-encryption.org/v1 +-> ssh-ed25519 VKQUdQ x1i2ti9r+Lo4NntpT/deCR9p98G1Bjr+VCSBHBd5hQU +q3EYR3AtqUZ/ZEf3H7GX7uP75302Kc32o6S4/9Qooe4 +--- JsKYbQ8pHXujEsVqT1K4Mmq8mwNvwMoMW75Bl0xOPys +Þwã8vSDúÙ*Jbæ’†ˆ1Qµ!5ˆÓãê„Dnž¨žÆÙ½NÅ8žwÊJ¨šœ+tø /ê†ïà(³k‹¯d£žÉ÷óÕáÞŒJ)mEÁþï…E8^è¢ ssh-ed25519 VKQUdQ g6xTTSn8NQE32ikEh8tO3kdA84PCxDDi0YdPIugL0yM +uWQN2fk2qqWblJReK3V9Qe8w+OUjWH5QbSP3dpZXVJ8 +--- G1q6yFC4TFYBdaZgrclq0o/xM7OTVl+Iyz9vzdOoReg +•Ñ`(üà )Çÿ³Ë‚Ž6Ï¿cR]m�ÿ™“PàS—»¸>ÁVÜ»ÜÝ;[Ðå C;�¥' Œ2ú^βtè›§<…g‹#·ÊF w+Y[EüÊjm%ᘠ¨[Øì$ø›^uA†þî©17‹'–È–9+#èž'›;ÈYtÕ¥¢9 Nò¼"�è¹|ïÏ�^nƒG™½ïBïóÈöžj­¡hr7QTù²�( \ No newline at end of file