overlays refactor

system-modules/nx2site/audiobookshelf.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   services = {
     audiobookshelf = {

system-modules/nx2site/dyn_dns.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, ... }: 
+{ pkgs, ... }@all: with all;
 {
   sops.secrets = {
     # "nx2site/namecheap.pw" = { };

system-modules/nx2site/gitea.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, secrets, ... }: 
+{ pkgs, ... }@all: with all;
 let git-user = "git"; in
 {
   sops.secrets = {

system-modules/nx2site/open-web-calendar.nix

@@ -1,4 +1,4 @@
-{ pkgs, hyper, ... }:
+{ pkgs, ... }@all: with all;
 {
   services = {
     open-web-calendar = {

system-modules/nx2site/paperless.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, secrets, ... }:
+{ pkgs, ... }@all: with all;
 let paperless-user = "paperless"; in
 {
   sops.secrets = {

system-modules/nx2site/proxy.nix

@@ -44,7 +44,7 @@
     # appendConfig = '''';
     clientMaxBodySize = "20m";
     defaultHTTPListenPort = 80;
-    defaultListenAddresses = [ "0.0.0.0" ] ++ pkgs.lib.optional config.networking.enableIPv6 "[::0]";
+    defaultListenAddresses = [ "0.0.0.0" ] ++ lib.optional config.networking.enableIPv6 "[::0]";
     defaultListen = dl;
     defaultMimeTypes = "${pkgs.mailcap}/etc/nginx/mime.types";
     defaultSSLListenPort = 443;
@@ -138,7 +138,7 @@
         listen = dl;
         locations = { "/" = { proxyPass = "http://127.0.0.1:8441"; }; }; 
       };
-      "dav.${hyper.domain}" = pkgs.lib.mkIf config.services.radicale.enable (vh // {
+      "dav.${hyper.domain}" = lib.mkIf config.services.radicale.enable (vh // {
         listen = dl;
         locations = { "/" = { proxyPass = "http://127.0.0.1:5232"; }; }; 
       });

system-modules/nx2site/rallly.nix

@@ -1,4 +1,4 @@
-{ pkgs, ... }:
+{ pkgs, ... }@all: with all;
 {
   environment.systemPackages = [
     (pkgs.mkYarnPackage {

system-modules/nx2site/vaultwarden.nix

@@ -1,4 +1,4 @@
-{ config, pkgs, hyper, secrets, ... }:
+{ pkgs, ... }@all: with all;
 {
   sops.secrets = {
     "nx2site/vaultwarden.env" = {