From 77b984f52e36e784bc2ef4fbd37aa076c42eddcf Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 27 Jul 2025 16:07:49 -0400 Subject: [PATCH 1/2] put earlyoom back --- clients/quadraticserver/docs.nix | 9 ++++++--- flake.lock | 8 ++++---- modules/{desktop => common}/earlyoom.nix | 0 3 files changed, 10 insertions(+), 7 deletions(-) rename modules/{desktop => common}/earlyoom.nix (100%) diff --git a/clients/quadraticserver/docs.nix b/clients/quadraticserver/docs.nix index 3e41cf5..453196c 100644 --- a/clients/quadraticserver/docs.nix +++ b/clients/quadraticserver/docs.nix @@ -32,6 +32,11 @@ in { enableNginx = false; redis.createLocally = true; postgresql.createLocally = true; + frontendPackage = pkgs.lasuite-docs-frontend.overrideAttrs { + env.NODE_ENV = "production"; + env.NEXT_PUBLIC_PUBLISH_AS_MIT = false; + env.PUBLISH_AS_MIT = false; + }; bind = "unix:${socket}"; inherit s3Url domain; @@ -40,8 +45,6 @@ in { OIDC_OP_TOKEN_ENDPOINT = "http://${authDomain}/token"; OIDC_OP_USER_ENDPOINT = "http://${authDomain}/userinfo"; OIDC_RP_SIGN_ALGO = "HS256"; - OIDC_USERINFO_FULLNAME_FIELDS = ''["name"]''; - OIDC_USERINFO_SHORTNAME_FIELD = "name"; LOGIN_REDIRECT_URL = "http://${domain}"; @@ -71,7 +74,7 @@ in { redir /api/v1.0/logout/None / - root * ${pkgs.lasuite-docs-frontend} + 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}/?$ diff --git a/flake.lock b/flake.lock index 504d4c9..f9b7717 100644 --- a/flake.lock +++ b/flake.lock @@ -1466,11 +1466,11 @@ ] }, "locked": { - "lastModified": 1753538890, - "narHash": "sha256-GadAOR4VJXtYnpunNnjBQqaO2s9BJxD49ui9OmrHdBg=", + "lastModified": 1753645986, + "narHash": "sha256-zR94Qw7F4TB03aKNr4O/QcbTEH45N9XQItjWRnJ/BRA=", "ref": "refs/heads/main", - "rev": "a86c8e2b26a6d12eaf6fd74f79111a08fc2768d6", - "revCount": 42, + "rev": "a5c4f900a279868f4d504914b53f27929ddc430c", + "revCount": 45, "type": "git", "url": "https://git.federated.nexus/Henry-Hiles/matrixoidc" }, diff --git a/modules/desktop/earlyoom.nix b/modules/common/earlyoom.nix similarity index 100% rename from modules/desktop/earlyoom.nix rename to modules/common/earlyoom.nix From 1852d8b88a3983e3386b4ccfb5844db82489b04a Mon Sep 17 00:00:00 2001 From: Henry-Hiles Date: Sun, 27 Jul 2025 20:28:47 -0400 Subject: [PATCH 2/2] use https for redir --- clients/quadraticserver/docs.nix | 8 ++++---- modules/graphical/dconf/default.nix | 1 - 2 files changed, 4 insertions(+), 5 deletions(-) diff --git a/clients/quadraticserver/docs.nix b/clients/quadraticserver/docs.nix index 453196c..00d0fe7 100644 --- a/clients/quadraticserver/docs.nix +++ b/clients/quadraticserver/docs.nix @@ -33,9 +33,9 @@ in { redis.createLocally = true; postgresql.createLocally = true; frontendPackage = pkgs.lasuite-docs-frontend.overrideAttrs { - env.NODE_ENV = "production"; - env.NEXT_PUBLIC_PUBLISH_AS_MIT = false; - env.PUBLISH_AS_MIT = false; + NODE_ENV = "production"; + NEXT_PUBLIC_PUBLISH_AS_MIT = false; + PUBLISH_AS_MIT = false; }; bind = "unix:${socket}"; inherit s3Url domain; @@ -46,7 +46,7 @@ in { OIDC_OP_USER_ENDPOINT = "http://${authDomain}/userinfo"; OIDC_RP_SIGN_ALGO = "HS256"; - LOGIN_REDIRECT_URL = "http://${domain}"; + LOGIN_REDIRECT_URL = "https://${domain}"; AWS_S3_ENDPOINT_URL = s3Domain; AWS_S3_ACCESS_KEY_ID = "minioadmin"; diff --git a/modules/graphical/dconf/default.nix b/modules/graphical/dconf/default.nix index d328150..3eb834d 100644 --- a/modules/graphical/dconf/default.nix +++ b/modules/graphical/dconf/default.nix @@ -83,7 +83,6 @@ "fullscreen-avoider@noobsai.github.com" "appindicatorsupport@rgcjonas.gmail.com" "compiz-windows-effect@hermes83.github.com" - "user-theme@gnome-shell-extensions.gcampax.github.com" "display-brightness-ddcutil@themightydeity.github.com" "launch-new-instance@gnome-shell-extensions.gcampax.github.com" ];