fix homepage

nixos/configurations.nix

@@ -2,9 +2,10 @@
 , nixpkgs
 , nixosSystem
 , home-manager
+, homePage
 , nixos-hardware
 }:
-let adapterModule = {
+let adapterModule = system: {
   nix.nixPath = [
     "home-manager=${home-manager}"
     "nixpkgs=${nixpkgs}"
@@ -26,14 +27,16 @@ let adapterModule = {
   ];
   nix.requireSignedBinaryCaches = true;
   nix.useSandbox = true;
-  nixpkgs.overlays = (nixpkgs.lib.attrValues self.overlays);
+  nixpkgs.overlays = (nixpkgs.lib.attrValues self.overlays) ++ [
+    (final: prev: { homePage = homePage.defaultPackage.${system}; })
+  ];
 };
 in
 {
-  gorgon = nixosSystem {
+  gorgon = nixosSystem rec {
     system = "x86_64-linux";
     modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
-      adapterModule
+      (adapterModule system)
       nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1
       #home-manager.nixosModules.home-manager
       #{
@@ -45,27 +48,27 @@ in
       ./gorgon/configuration.nix
     ];
   };
-  ifrit = nixosSystem {
+  ifrit = nixosSystem rec {
     system = "x86_64-linux";
     modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
-      adapterModule
+      (adapterModule system)
       ./modules/profiles/server.nix
       ./ifrit/configuration.nix
     ];
   };
 
-  surgat = nixosSystem {
+  surgat = nixosSystem rec {
     system = "x86_64-linux";
     modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
-      adapterModule
+      (adapterModule system)
       ./modules/profiles/server.nix
       ./surgat/configuration.nix
     ];
   };
-  pruflas = nixosSystem {
+  pruflas = nixosSystem rec {
     system = "x86_64-linux";
     modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [
-      adapterModule
+      (adapterModule system)
       ./modules/profiles/server.nix
       ./pruflas/configuration.nix
     ];

nixos/gorgon/configuration.nix

@@ -56,7 +56,7 @@ in
 
   # Enable CUPS to print documents.
   services.printing = {
-    enable = false;
+    enable = true;
     browsing = true;
     drivers = with pkgs; [
       hplip

nixos/modules/default.nix

@@ -9,7 +9,7 @@
   fileShare = import ./fileShare.nix;
   gitea = import ./gitea.nix;
   headphones = import ./headphones.nix;
-  homepage = import ./homepage.nix { inherit homePage; };
+  homepage = import ./homepage.nix;
   networking = import ./networking.nix;
   share = import ./share.nix;
   steam = import ./steam.nix;

nixos/modules/homepage.nix

@@ -1,8 +1,6 @@
-{ homePage }:
 { config, pkgs, lib, ... }:
 let
   cfg = config.dadada.homePage;
-  homePagePkg = pkgs.callPackage homePage { };
 in
 with lib; {
   options.dadada.homePage = {
@@ -14,7 +12,7 @@ with lib; {
     services.nginx.virtualHosts."dadada.li" = {
       enableACME = true;
       forceSSL = true;
-      root = "${homePagePkg}";
+      root = "${pkgs.homePage}";
     };
   };
 }

nixos/surgat/configuration.nix

@@ -15,7 +15,7 @@ in
     recommendedGzipSettings = true;
     recommendedProxySettings = true;
 
-    logError = "/dev/null";
+    #logError = "/dev/null";
     appendHttpConfig = ''
       access_log off;
     '';