From f252a38b1b99881fc0500cb2fc6f5310b79bfef1 Mon Sep 17 00:00:00 2001
From: Jaculabilis <jaculabilis@git.alogoulogoi.com>
Date: Fri, 9 Jun 2023 20:59:09 +0000
Subject: [PATCH] Update empyrean configs to 23.05

---
 flake.nix                    |  2 +-
 machine/empyrean/default.nix |  7 +++----
 machine/empyrean/gitea.nix   | 12 +++++++-----
 3 files changed, 11 insertions(+), 10 deletions(-)

diff --git a/flake.nix b/flake.nix
index 1338942..90f7aaf 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,7 +17,7 @@
         system = "aarch64-linux";
         modules = [ ./machine/catacomb ];
       };
-      empyrean = nixpkgs.lib.nixosSystem {
+      empyrean = nixpkgs-next.lib.nixosSystem {
         system = "x86_64-linux";
         modules = [ ./machine/empyrean ];
       };
diff --git a/machine/empyrean/default.nix b/machine/empyrean/default.nix
index bd960ca..0de8c1d 100644
--- a/machine/empyrean/default.nix
+++ b/machine/empyrean/default.nix
@@ -18,7 +18,6 @@
   # Use the GRUB 2 boot loader.
   boot.loader.grub = {
     enable = true;
-    version = 2;
     device = "/dev/xvda";
     extraConfig = "serial --unit=0 --speed=115200 ; terminal_input serial console ; terminal_output serial console";
   };
@@ -115,8 +114,8 @@
 
   services.openssh = {
     enable = true;
-    passwordAuthentication = false;
-    permitRootLogin = "prohibit-password";
+    settings.PasswordAuthentication = false;
+    settings.PermitRootLogin = "prohibit-password";
   };
 
   services.tinc.networks.beatific = {
@@ -180,7 +179,7 @@
   # this value at the release version of the first install of this system.
   # Before changing this value read the documentation for this option
   # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html).
-  system.stateVersion = "20.03"; # Did you read the comment?
+  system.stateVersion = "23.05"; # Did you read the comment?
 
 }
 
diff --git a/machine/empyrean/gitea.nix b/machine/empyrean/gitea.nix
index 9b1b563..0bc8e6f 100644
--- a/machine/empyrean/gitea.nix
+++ b/machine/empyrean/gitea.nix
@@ -5,12 +5,7 @@
 {
   # Gitea configuration
   services.gitea = {
-    # Enable Gitea and configure for reverse proxy
     enable = true;
-    httpAddress = "127.0.0.1";
-    httpPort = 3300;
-    domain = "git.alogoulogoi.com";
-    rootUrl = "https://git.alogoulogoi.com/";
 
     #useWizard = true;  # Needed for first-time building
 
@@ -22,6 +17,13 @@
       interval = "weekly";
     };
     settings = {
+      "server" = {
+        # Configuration for reverse proxy
+        ROOT_URL = "https://git.alogoulogoi.com/";
+        HTTP_ADDR = "127.0.0.1";
+        HTTP_PORT = 3300;
+        DOMAIN = "git.alogoulogoi.com";
+      };
       "repository" = {
         DEFAULT_PRIVATE = true;
       };