From 8f030a559bfda9789e2e4b7865460f5aa7e82d8f Mon Sep 17 00:00:00 2001
From: Jaculabilis <root@empyrean>
Date: Sun, 11 Dec 2022 00:00:55 +0000
Subject: [PATCH] Update empyrean to nixpkgs 22.11

---
 flake.lock                                  | 19 +------------------
 flake.nix                                   |  5 ++---
 machine/empyrean/default.nix                |  4 ++--
 machine/empyrean/gitea.nix                  |  6 +++---
 machine/empyrean/hardware-configuration.nix |  2 +-
 5 files changed, 9 insertions(+), 27 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1e8c269..7a21b2c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -66,22 +66,6 @@
         "type": "indirect"
       }
     },
-    "nixpkgs-empyrean": {
-      "locked": {
-        "lastModified": 1646588256,
-        "narHash": "sha256-ZHljmNlt19nSm0Mz8fx6QEhddKUkU4hhwFmfNmGn+EY=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2ebb6c1e5ae402ba35cca5eec58385e5f1adea04",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "2ebb6c1e5ae402ba35cca5eec58385e5f1adea04",
-        "type": "github"
-      }
-    },
     "nixpkgs_2": {
       "locked": {
         "lastModified": 1669833724,
@@ -101,8 +85,7 @@
     "root": {
       "inputs": {
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_2",
-        "nixpkgs-empyrean": "nixpkgs-empyrean"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index f999abc..567ff43 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,16 +1,15 @@
 {
   inputs = {
     nixpkgs.url = "github:NixOS/nixpkgs?ref=refs/tags/22.11";
-    nixpkgs-empyrean.url = "github:NixOS/nixpkgs?rev=2ebb6c1e5ae402ba35cca5eec58385e5f1adea04";
     nixos-wsl.url = github:nix-community/NixOS-WSL;
   };
 
-  outputs = { self, nixpkgs, nixpkgs-empyrean, nixos-wsl }@attrs: {
+  outputs = { self, nixpkgs, nixos-wsl }@attrs: {
     nixosConfigurations.catacomb = nixpkgs.lib.nixosSystem {
       system = "aarch64-linux";
       modules = [ ./machine/catacomb ];
     };
-    nixosConfigurations.empyrean = nixpkgs-empyrean.lib.nixosSystem {
+    nixosConfigurations.empyrean = nixpkgs.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [ ./machine/empyrean ];
     };
diff --git a/machine/empyrean/default.nix b/machine/empyrean/default.nix
index 6e0f3ce..3d48555 100644
--- a/machine/empyrean/default.nix
+++ b/machine/empyrean/default.nix
@@ -26,7 +26,7 @@
 
   nix = {
     package = pkgs.nixFlakes;
-    maxJobs = 2;
+    settings.max-jobs = 2;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
@@ -95,7 +95,7 @@
     };
   };
   security.acme = {
-    email = "tim.vanbaak+alogoulogoi@gmail.com";
+    defaults.email = "tim.vanbaak+alogoulogoi@gmail.com";
     acceptTerms = true;
   };
 
diff --git a/machine/empyrean/gitea.nix b/machine/empyrean/gitea.nix
index 6eaf7ff..39865c3 100644
--- a/machine/empyrean/gitea.nix
+++ b/machine/empyrean/gitea.nix
@@ -12,8 +12,6 @@
     domain = "git.alogoulogoi.com";
     rootUrl = "https://git.alogoulogoi.com/";
 
-    # Private server
-    disableRegistration = true;
     #useWizard = true;  # Needed for first-time building
 
     # Settings
@@ -23,7 +21,6 @@
       enable = true;
       interval = "weekly";
     };
-    log.level = "Info";
     settings = {
       "repository" = {
         DEFAULT_PRIVATE = true;
@@ -45,6 +42,9 @@
       };
       "cron.archive_cleanup".ENABLED = false;
       "cron.sync_external_users".ENABLED = false;
+      log.LEVEL = "Info";
+      # Private server
+      service.DISABLE_REGISTRATION = true;
     };
   };
 
diff --git a/machine/empyrean/hardware-configuration.nix b/machine/empyrean/hardware-configuration.nix
index 66d6ba0..8569666 100644
--- a/machine/empyrean/hardware-configuration.nix
+++ b/machine/empyrean/hardware-configuration.nix
@@ -18,5 +18,5 @@
 
   swapDevices = [ ];
 
-  nix.maxJobs = lib.mkDefault 1;
+  nix.settings.max-jobs = lib.mkDefault 1;
 }