From 4b7af7342266e7e8680083ab0f70d110223cbc37 Mon Sep 17 00:00:00 2001
From: Vivian Roest <vivian@0x76.dev>
Date: Mon, 4 Dec 2023 11:03:32 +0100
Subject: [PATCH] fix grist

---
 flake.lock                                  | 18 +++++++++---------
 nixos/common/hm-modules/vscode.nix          |  4 ++++
 nixos/hosts/olympus/grist/configuration.nix |  3 ++-
 3 files changed, 15 insertions(+), 10 deletions(-)

diff --git a/flake.lock b/flake.lock
index adc831f0..002ec343 100644
--- a/flake.lock
+++ b/flake.lock
@@ -687,11 +687,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1701369906,
-        "narHash": "sha256-WwICfQ661I2hL2m9s449PjCR74d+9JtrhQeBoIaQ8/Q=",
+        "lastModified": 1701433070,
+        "narHash": "sha256-Gf9JStfENaUQ7YWFz3V7x/srIwr4nlnVteqaAxtwpgM=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "ef9088253c120d9b4dc26c5e41dd6c3c781ee9f0",
+        "rev": "4a8545f5e737a6338814a4676dc8e18c7f43fc57",
         "type": "github"
       },
       "original": {
@@ -1184,11 +1184,11 @@
     },
     "nixpkgs_stable": {
       "locked": {
-        "lastModified": 1701268161,
-        "narHash": "sha256-hL4jGGwMHHmyx6G9wi6IrYa8RLkoEtzCb4zWITH1B40=",
+        "lastModified": 1701362232,
+        "narHash": "sha256-GVdzxL0lhEadqs3hfRLuj+L1OJFGiL/L7gCcelgBlsw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "67be70a859530f6f7c358568eaa6ab0d84b36b01",
+        "rev": "d2332963662edffacfddfad59ff4f709dde80ffe",
         "type": "github"
       },
       "original": {
@@ -1220,11 +1220,11 @@
     },
     "nur": {
       "locked": {
-        "lastModified": 1701429346,
-        "narHash": "sha256-Y4tIQiX+tiuE6mUR6K360U+ln9iB7RKwbGLoo/Wh0a0=",
+        "lastModified": 1701525157,
+        "narHash": "sha256-GVE2K1UcVRBOghRWmgpIwKjziwfmqSMMLYzec8CHCzA=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "f4318c2621d55b05ce2787a2645053082dfe340c",
+        "rev": "2852283c5f07fdb12fa595d0d2d5fa27d8557586",
         "type": "github"
       },
       "original": {
diff --git a/nixos/common/hm-modules/vscode.nix b/nixos/common/hm-modules/vscode.nix
index 8a3ce1b5..eabbaba7 100644
--- a/nixos/common/hm-modules/vscode.nix
+++ b/nixos/common/hm-modules/vscode.nix
@@ -24,6 +24,9 @@ in {
         "rust-analyzer.checkOnSave.command" = "clippy";
         "debug.allowBreakpointsEverywhere" = true;
         "C_Cpp.clang_format_fallbackStyle" = "{ BasedOnStyle: Google, IndentWidth: 4, ColumnLimit: 0}";
+        "crates.compatibleDecorator" =  "✓";
+        "crates.errorDecorator" = "✗";
+        "crates.incompatibleDecorator" = "🛇";
         # Don't index unecessary things
         "files.exclude" = {
           "**/.vscode" = true;
@@ -64,6 +67,7 @@ in {
           xaver.clang-format
           sumneko.lua
           davidlday.languagetool-linter
+          serayuzgur.crates
         ];
     };
 
diff --git a/nixos/hosts/olympus/grist/configuration.nix b/nixos/hosts/olympus/grist/configuration.nix
index d24eec63..81571c39 100644
--- a/nixos/hosts/olympus/grist/configuration.nix
+++ b/nixos/hosts/olympus/grist/configuration.nix
@@ -24,7 +24,7 @@ in {
 
     oci-containers.containers.grist = {
       image =
-        "gristlabs/grist:1.1.8";
+        "gristlabs/grist:1.1.9";
       environment = {
         APP_HOME_URL = "https://grist.0x76.dev";
         GRIST_SUPPORT_ANON = "false";
@@ -43,6 +43,7 @@ in {
         PYTHON_VERSION_ON_CREATION = "3";
 
         GRIST_OIDC_IDP_ISSUER = "https://dex.0x76.dev";
+        GRIST_OIDC_IDP_SKIP_END_SESSION_ENDPOINT= "true";
       };
       environmentFiles = [ "${vs.grist}/environment" ];
       ports = [ "8484:8484" ];