flake.lock

@@ -66,6 +66,22 @@
         "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,
@@ -85,7 +101,8 @@
     "root": {
       "inputs": {
         "nixos-wsl": "nixos-wsl",
-        "nixpkgs": "nixpkgs_2"
+        "nixpkgs": "nixpkgs_2",
+        "nixpkgs-empyrean": "nixpkgs-empyrean"
       }
     }
   },

flake.nix

@@ -1,15 +1,16 @@
 {
   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, nixos-wsl }@attrs: {
+  outputs = { self, nixpkgs, nixpkgs-empyrean, nixos-wsl }@attrs: {
     nixosConfigurations.catacomb = nixpkgs.lib.nixosSystem {
       system = "aarch64-linux";
       modules = [ ./machine/catacomb ];
     };
-    nixosConfigurations.empyrean = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.empyrean = nixpkgs-empyrean.lib.nixosSystem {
       system = "x86_64-linux";
       modules = [ ./machine/empyrean ];
     };

machine/empyrean/catacomb.nix

@@ -12,18 +12,18 @@
     '';
     locations = {
       # Forwards to the index server
-      "/browse/".proxyPass = "http://10.22.20.2:7472/browse/";
+      "/browse/".proxyPass = "http://10.7.3.16:7472/browse/";
       # Forwards to nginx via catacomb auth server
       "/".extraConfig = ''
         auth_request /auth;
         proxy_buffering off;
-        proxy_pass http://10.22.20.2:7470/;
+        proxy_pass http://10.7.3.16:7470/;
       '';
       "= /auth".extraConfig = ''
         internal;
         proxy_buffering off;
         proxy_pass_request_body off;
-        proxy_pass http://10.22.20.2:7471/;
+        proxy_pass http://10.7.3.16:7471/;
         proxy_set_header Content-Length "";
         proxy_set_header X-Original-URI $request_uri;
       '';

machine/empyrean/default.nix

@@ -8,8 +8,8 @@
   imports =
     [ # Include the results of the hardware scan.
       ./hardware-configuration.nix
-      #./amanuensis.nix
-      #./redstring.nix
+      ./amanuensis.nix
+      ./redstring.nix
       ./catacomb.nix
       ./gitea.nix
       ./inquisitor.nix
@@ -26,7 +26,7 @@
 
   nix = {
     package = pkgs.nixFlakes;
-    settings.max-jobs = 2;
+    maxJobs = 2;
     extraOptions = ''
       experimental-features = nix-command flakes
     '';
@@ -95,7 +95,7 @@
     };
   };
   security.acme = {
-    defaults.email = "tim.vanbaak+alogoulogoi@gmail.com";
+    email = "tim.vanbaak+alogoulogoi@gmail.com";
     acceptTerms = true;
   };
 

machine/empyrean/gitea.nix

@@ -12,6 +12,8 @@
     domain = "git.alogoulogoi.com";
     rootUrl = "https://git.alogoulogoi.com/";
 
+    # Private server
+    disableRegistration = true;
     #useWizard = true;  # Needed for first-time building
 
     # Settings
@@ -21,6 +23,7 @@
       enable = true;
       interval = "weekly";
     };
+    log.level = "Info";
     settings = {
       "repository" = {
         DEFAULT_PRIVATE = true;
@@ -42,9 +45,6 @@
       };
       "cron.archive_cleanup".ENABLED = false;
       "cron.sync_external_users".ENABLED = false;
-      log.LEVEL = "Info";
-      # Private server
-      service.DISABLE_REGISTRATION = true;
     };
   };
 

machine/empyrean/hardware-configuration.nix

@@ -18,5 +18,5 @@
 
   swapDevices = [ ];
 
-  nix.settings.max-jobs = lib.mkDefault 1;
+  nix.maxJobs = lib.mkDefault 1;
 }

machine/empyrean/inquisitor.nix

@@ -5,11 +5,10 @@ let
   inquisitorSource = pkgs.fetchFromGitHub {
     owner = "Jaculabilis";
     repo = "Inquisitor";
-    rev = "dd3a8016d3148681886c9a2bba465d5eab85a0ac";
+    rev = "a6d961aba948d3a682dbde12dbaa8805eadbbd84";
     sha256 = "10n6c5zvi27f92b7am0rrdizxz0mlp3rw1y1jyd44b57ykk7x6fr";
   };
-  inquisitorLocal = "/root/inquisitor";
-  inquisitor = pkgs.callPackage inquisitorLocal { inherit pkgs; };
+  inquisitor = pkgs.callPackage inquisitorSource {};
 
   # Define the inquisitor data directory
   inquisiDir = "/var/lib/inquisitor";