From e43c6450d92582e7510c13e6213b917b1d306ed7 Mon Sep 17 00:00:00 2001
From: fruchti <fruchti@gvfr.de>
Date: Wed, 21 Jun 2023 15:27:22 +0200
Subject: [PATCH] Emitter: Fix warnings for 23.05

---
 hosts/Emitter.nix |  1 -
 hosts/gitea.nix   | 16 +++++++++-------
 2 files changed, 9 insertions(+), 8 deletions(-)

diff --git a/hosts/Emitter.nix b/hosts/Emitter.nix
index 5c23f64..8530b37 100644
--- a/hosts/Emitter.nix
+++ b/hosts/Emitter.nix
@@ -5,7 +5,6 @@
     ];
 
     boot.loader.grub.enable = true;
-    boot.loader.grub.version = 2;
     boot.loader.grub.device = "/dev/vda";
 
     networking.hostName = "Emitter";
diff --git a/hosts/gitea.nix b/hosts/gitea.nix
index d87655f..9de795d 100644
--- a/hosts/gitea.nix
+++ b/hosts/gitea.nix
@@ -16,9 +16,6 @@ in
             passwordFile = "/secrets/gitea_db_password";
             createDatabase = false;
         };
-        domain = "${domain}";
-        rootUrl = "https://${domain}/";
-        httpPort = 3001;
         repositoryRoot = "/data/git/repositories";
         lfs = {
             enable = true;
@@ -30,9 +27,9 @@ in
                 docutils  # Provides rendering of ReStructured Text files
                 pygments  # Provides syntax highlighting
             ]);
-            nbconvert =
-                pkgs.python310.withPackages (ps: with ps; [
+            nbconvert = pkgs.python310.withPackages (ps: with ps; [
                 jupyter
+                ipykernel
                 nbconvert
             ]);
             max_cached_jupyter_notebooks = 200;
@@ -67,7 +64,12 @@ in
             '';
         in
         {
-            server.SSH_PORT = lib.head config.services.openssh.ports;
+            server = {
+                SSH_PORT = lib.head config.services.openssh.ports;
+                ROOT_URL = "https://${domain}/";
+                HTTP_PORT = 3001;
+                DOMAIN = "${domain}";
+            };
             service.DISABLE_REGISTRATION = true;
             session.COOKIE_SECURE = true;
             "markup.restructuredtext" = {
@@ -79,7 +81,7 @@ in
             "markup.jupyter" = {
                 ENABLED = true;
                 FILE_EXTENSIONS = ".ipynb";
-                #RENDER_COMMAND = "\"${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic \"";
+                # RENDER_COMMAND = "\"${nbconvert}/bin/jupyter nbconvert --stdout --to html --template basic \"";
                 RENDER_COMMAND = "\"${cached_jupyter_preview} \"";
                 IS_INPUT_FILE = true;
                 # RENDER_CONTENT_MODE = "iframe";