From c93ea5370af823f53ad880f65ce680cdb2400342 Mon Sep 17 00:00:00 2001
From: Erwin Boskma <erwin@datarift.nl>
Date: Fri, 9 Feb 2024 20:38:40 +0100
Subject: [PATCH] loki: Fix livebook

---
 machines/loki/configuration.nix |  2 +-
 machines/loki/secrets.yaml      |  6 +++---
 users/erwin/home.nix            | 13 +++++++------
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/machines/loki/configuration.nix b/machines/loki/configuration.nix
index ce9568c..c9ace3f 100644
--- a/machines/loki/configuration.nix
+++ b/machines/loki/configuration.nix
@@ -502,7 +502,7 @@
     renovate_env = {
       owner = "erwin";
     };
-    livebook_cookie = {
+    livebook-env = {
       owner = "erwin";
     };
     livebook-password = {
diff --git a/machines/loki/secrets.yaml b/machines/loki/secrets.yaml
index 63ff5b8..8833562 100644
--- a/machines/loki/secrets.yaml
+++ b/machines/loki/secrets.yaml
@@ -1,6 +1,6 @@
 ha_now_playing_token: ENC[AES256_GCM,data:2NKdfEn0tQx+DTE6HBVo79Ico8+afqJ2XFaBVOgIikaL4eMa34CqHwhX91T64VVdmWyjvhaC1kRzxsALoJvw1ZHEnSG2va6lX0vN36j/n8R3ulcX23ZJetMHYQQE6ss7A+gvnBHTnTBG+F9XyrPFT7xnfQ363lWHQ3nRFiGAZJjj6eYqLxSuG7KMWHtfSozy5gSy2JKoxyV4KnqpDs39PhBmNA7OSh3FRYZPIaq+i4qhdCfHRET+,iv:Znl6IW36aqhL/KBr0cRgPBPtqkhuc1GtoqCQEQJ/cXI=,tag:ubvLck9m9qiutU2zcQtdDw==,type:str]
 gh_token: ENC[AES256_GCM,data:7DBVEdZLReJQsyUoO9fITtHhE0UFcHr7XWod5XiaQ5iiwcI01tUdRA==,iv:HY82pn2rp9zf+xHWRg6Zwbl5V2qgp+67LghxHRQjiMI=,tag:OrkwDDYpJLXnsWZvqBtY9g==,type:str]
-livebook_cookie: ENC[AES256_GCM,data:ZB7u8BWNn7x2O00YTALYTwNi/obq8nH3mI01Bd8UxPg=,iv:JVpPJaB6O7oRjYqYuEueT812U0Bn8mUCOLDwpAU5yTs=,tag:GIkodjTt9mRLQZ0UAtJszg==,type:str]
+livebook-env: ENC[AES256_GCM,data:n0IReqMxu0pLJZtHdoTW+AvE8eKAyLsr41GbLR4OPSTrZrRKIOscZ5KIoLGtDrCQFw==,iv:MFC78r/1mfRf8puKWxXtaQeaqhFFVdYpu1vLMCe3JiI=,tag:Wd8EG95rx75EJpt5GaQw9g==,type:str]
 livebook-password: ENC[AES256_GCM,data:FaMIr0GxLTvAzrYt7blGbJuGDbr+lDiIMnvY2c/r,iv:SKKKYYRYLGtRGgaHs7zAnH8n0HZiGaoAlLAptUPaa/c=,tag:vgBGhmXH/QpTbKjbrQEhKw==,type:str]
 renovate_env: ENC[AES256_GCM,data:mzeS0FXsycD4hWMzRMgeEgTY+x2QtYtxmhcFCJcjwlD/q577kprHaU8otr1sOu9mwNud7K8kJGk=,iv:MMhr6CPsyvmP7+dKJUwt9cjnATm9JKZ/KbG4Dkj7hJ0=,tag:ubLmcW/CtT/uPiyswvr93w==,type:str]
 wireguard-horus-privkey: ENC[AES256_GCM,data:JVhdbvNqfdPWFCg24F56Hmu1Tf/EA6BOqa1uPuu8C/FrJhNaGi4S+KYOook=,iv:z8cq4C5vu/QqJ3UZdL1zEH22Ht3rKSbdHgAQbRSk8Kk=,tag:AVBvV8wJqw5jgDRiES89eQ==,type:str]
@@ -65,8 +65,8 @@ sops:
             YlFmNzNseHZXSk01SmEwK0ZIRlFmb0kKPms5J3yViVwgwvQhI5XYwcNQZs4Bhwv4
             scaA7FZV2sa4x+EXrYAxg3AioH7QOky02FujCOrUaThlLIzDVucgKg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2023-11-01T09:21:23Z"
-    mac: ENC[AES256_GCM,data:rYz0Q6CnVD6i+/Cs2RptgQnwx4SN5b+Tu4GeVt7gkvuFzegSIY5gv0N8hyvskKhdvTGzYE7DY5ePeFJRD1JdrRr/d9ZEmjCbapz+VxwfzxXlhyGElYboBEnWZ8G0C0mFtNOmPvwAqlinBNdQkRODX3l0zNa9947AXTPzkJuArPo=,iv:HQZzW/GkDP/kp7gAjiio5SKf3TGDeUySqfbaJWtYlVc=,tag:/taq1QhnK8FTCO+JquixRA==,type:str]
+    lastmodified: "2024-02-07T22:49:34Z"
+    mac: ENC[AES256_GCM,data:e3HW2LmCFwxXt2QkKf7pGKrpBQLFETVzz6w4/EEtxSzcuFn7p/S0AYk/4/FPXO+Gke1ccklXINFb/Qk0KlaWeToNg3Pp19xt5b9apvJQsoXQOuzjxqHDRkwZjGIFsYUvVgt/YNXs3AsTJzeMq0RjaI96xbwCitKvZl+sJP1nUBY=,iv:vA8xjOljqXwHwG+aJuCORgcHcNGgNf4L9RRV+dZv4+w=,tag:1Ukh7LQ/yTurdANzygxvXQ==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/users/erwin/home.nix b/users/erwin/home.nix
index dc7841d..b688fa2 100644
--- a/users/erwin/home.nix
+++ b/users/erwin/home.nix
@@ -438,12 +438,13 @@ in
       ddccontrol.enable = true;
 
       livebook = {
-        enableUserService = true;
-        environmentFile = pkgs.writeText "livebook-env" ''
-          LIVEBOOK_TOKEN_ENABLED=false
-          LIVEBOOK_IDENTITY_PROVIDER=tailscale:/run/tailscale/tailscaled.sock
-          LIVEBOOK_IP=100.106.117.132
-        '';
+        enableUserService = false;
+        environment = {
+          LIVEBOOK_TOKEN_ENABLED = false;
+          LIVEBOOK_IDENTITY_PROVIDER = "tailscale:/run/tailscale/tailscaled.sock";
+          LIVEBOOK_IP = "100.106.117.132";
+        };
+        environmentFile = config.sops.secrets.livebook-env.path;
       };
     };