cleanup

cluster/services/dns/admin.nix

@@ -1,7 +1,6 @@
 { cluster, config, hosts, inputs, lib, pkgs, tools, ... }:
 
 let
-  inherit (hosts.${config.networking.hostName}) interfaces;
   inherit (tools.meta) domain;
   inherit (config.links) pdnsAdmin;
   inherit (cluster.config) vars;

cluster/services/dns/authoritative.nix

@@ -2,10 +2,8 @@
 
 let
   inherit (hosts.${config.networking.hostName}) interfaces;
-  inherit (cluster.config) vars;
 
   patroni = cluster.config.links.patroni-pg-access;
-  pdns-api = cluster.config.links.powerdns-api;
 
   translateConfig = cfg: let
     configList = lib.mapAttrsToList (n: v: "${n}=${v}") cfg;

cluster/services/patroni/default.nix

@@ -1,8 +1,6 @@
 { config, lib, ... }:
 
 let
-  inherit (config.vars) hosts;
-
   cfg = config.services.patroni;
 
   renameToLink = mode: n: v: lib.nameValuePair "patroni-etcd-node-${mode}-${n}" v;

cluster/services/patroni/worker.nix

@@ -10,8 +10,6 @@ let
   pg = pkgs.postgresql_14;
 
   baseDir = "/srv/storage/database/postgres-ha";
-
-  cfg = config.services.patroni;
 in
 
 {

cluster/services/websites/default.nix

@@ -1,9 +1,5 @@
 { config, ... }:
 
-let
-  inherit (config.vars) hosts;
-
-in
 {
   services.websites = {
     nodes = {

flake.nix

@@ -10,8 +10,6 @@
     let
       systems = [ "x86_64-linux" "aarch64-linux" ];
 
-      forSystems = nixpkgs.lib.genAttrs systems;
-
       nixpkgsFor = nixpkgs.legacyPackages;
 
       inherit (nixpkgs) lib;

hosts/VEGAS/modules/nginx/default.nix

@@ -1,11 +1,8 @@
 { lib, config, tools, ... }:
 
 let
-  inherit (tools.meta) domain adminEmail;
+  inherit (tools.meta) adminEmail;
-in
+in {
-  with tools.nginx.vhosts;
-  with tools.nginx.mappers;
-{
   security.acme.defaults.email = adminEmail;
   security.acme.acceptTerms = true;
   services.nginx = {

hosts/VEGAS/services/mail/postfix.nix

@@ -30,11 +30,8 @@ in
     origin = domain;
     recipientDelimiter = "+";
 
-    # TODO: replace with proper certs
+    sslCert = "${certDir}/fullchain.pem";
-    sslCert = "/var/lib/acme/mail.${domain}/fullchain.pem";
+    sslKey = "${certDir}/key.pem";
-    sslKey = "/var/lib/acme/mail.${domain}/key.pem";
-    #sslCert = "${certDir}/fullchain.pem";
-    #sslKey = "${certDir}/privkey.pem";
 
     setSendmail = true;
 

hosts/VEGAS/services/monitoring/default.nix

@@ -26,8 +26,6 @@ let
   );
 
   login = x: "https://login.${domain}/auth/realms/master/protocol/openid-connect/${x}";
-
-  myNode = hosts.${config.networking.hostName};
 in
 {
   imports = [

hosts/VEGAS/services/nextcloud/default.nix

@@ -1,7 +1,5 @@
 { cluster, config, lib, pkgs, tools, ... }:
 let
-  cfg = config.services.nextcloud.config;
-
   patroni = cluster.config.links.patroni-pg-access;
 in
 {

hosts/VEGAS/services/sso/default.nix

@@ -2,7 +2,6 @@
 with tools.nginx;
 let
   login = "login.${tools.meta.domain}";
-  cfg = config.services.keycloak;
   kc = config.links.keycloak;
   patroni = cluster.config.links.patroni-pg-access;
 in

hosts/VEGAS/services/websites/extra-sites.nix

@@ -1,8 +1,6 @@
 { tools, ... }:
 with tools.vhosts;
 let
-  inherit (tools) domain;
-
   noSSL = { enableACME = false; forceSSL = false; };
 in
 {

hosts/prophet/modules/nginx/default.nix

@@ -1,11 +1,8 @@
 { lib, config, tools, ... }:
 
 let
-  inherit (tools.meta) domain adminEmail;
+  inherit (tools.meta) adminEmail;
-in
+in {
-  with tools.nginx.vhosts;
-  with tools.nginx.mappers;
-{
   security.acme.defaults.email = adminEmail;
   security.acme.acceptTerms = true;
   services.nginx = {

modules/hyprspace/default.nix

@@ -20,7 +20,6 @@ let
   '';
 
   privateKeyFile = config.age.secrets.hyprspace-key.path;
-  discoverKey = config.age.secrets.hyprspace-discover-key.path;
   runConfig = "/run/hyprspace.yml";
 in {
   networking.hosts = lib.mapAttrs' (k: v: lib.nameValuePair v.hypr.addr [k "${k}.hypr"]) hyprspaceCapableNodes;

packages/projects.nix

@@ -3,7 +3,6 @@
 {
   perSystem = { filters, inputs', pkgs, self', system, ... }:
   let
-    inherit (pkgs) lib;
     inherit (self'.packages) nix-super;
 
     pins = import ./sources;

packages/servers/sips/default.nix

@@ -29,6 +29,6 @@ buildGoModule rec {
     description = "A Simple IPFS Pinning Service";
     homepage = "https://github.com/DeedleFake/sips";
     license = licenses.mit;
-    maintainers = with maintainers; [  ];
+    maintainers = [  ];
   };
 }

packages/web-apps/searxng/default.nix

@@ -2,7 +2,7 @@
 
 with python3Packages;
 
-toPythonModule (buildPythonApplication rec {
+toPythonModule (buildPythonApplication {
   pname = "searxng";
   version = "1.0.0pre_${builtins.substring 0 7 pins.searxng.revision}";