diff --git a/flake.nix b/flake.nix index 8d4ed81e..4eb63b98 100644 --- a/flake.nix +++ b/flake.nix @@ -244,7 +244,7 @@ inherit system; modules = [ - ({ config, ... }: { + ({ ... }: { _module.args = { inherit hostRegistry inputs zentralwerk; }; diff --git a/hosts/bind/default.nix b/hosts/bind/default.nix index 06aa7800..14c394cb 100644 --- a/hosts/bind/default.nix +++ b/hosts/bind/default.nix @@ -1,4 +1,4 @@ -{ zentralwerk, config, hostRegistry, lib, pkgs, ... }: +{ zentralwerk, config, lib, pkgs, ... }: let systemctl = "${pkgs.systemd}/bin/systemctl"; deployCommand = "${systemctl} start deploy-c3d2-dns"; diff --git a/hosts/gitea/default.nix b/hosts/gitea/default.nix index 790d37a1..42b36d24 100644 --- a/hosts/gitea/default.nix +++ b/hosts/gitea/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, zentralwerk, ... }: +{ config, pkgs, lib, ... }: { c3d2.deployment.server = "server10"; diff --git a/hosts/hedgedoc/default.nix b/hosts/hedgedoc/default.nix index 2717f4d6..e90b9a17 100644 --- a/hosts/hedgedoc/default.nix +++ b/hosts/hedgedoc/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, zentralwerk, ... }: +{ config, pkgs, ... }: { c3d2.deployment.server = "server10"; diff --git a/hosts/hydra/default.nix b/hosts/hydra/default.nix index aa5a2e81..1e90451a 100644 --- a/hosts/hydra/default.nix +++ b/hosts/hydra/default.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, zentralwerk, ... }: +{ config, lib, ... }: let cachePort = 5000; diff --git a/hosts/hydra/hardware-configuration.nix b/hosts/hydra/hardware-configuration.nix index 4ae7718c..3e134373 100644 --- a/hosts/hydra/hardware-configuration.nix +++ b/hosts/hydra/hardware-configuration.nix @@ -1,7 +1,7 @@ # Do not modify this file! It was generated by ‘nixos-generate-config’ # and may be overwritten by future invocations. Please make changes # to /etc/nixos/configuration.nix instead. -{ config, lib, pkgs, modulesPath, ... }: +{ config, lib, modulesPath, ... }: { imports = diff --git a/hosts/jabber/default.nix b/hosts/jabber/default.nix index 09db9a74..6c1d482e 100644 --- a/hosts/jabber/default.nix +++ b/hosts/jabber/default.nix @@ -4,9 +4,7 @@ let domain = "jabber.c3d2.de"; publicIPv4 = "81.201.149.152"; - inherit (pkgs.jabber-secrets) - c3d2DynDns - coturnUser coturnPassword; + inherit (pkgs.jabber-secrets) coturnUser coturnPassword; prosodyFirewall = pkgs.writeText "antispam.pfw" '' %ZONE spam: creep.im, default.rs, sj.ms, anonym.im, xmpp.jp, safetyjabber.com, im.hot-chilli.net, jabb3r.org, draugr.de, laba.im, xmpp.sh, jabber.bitactive.com, 404.city, jabber.cd, jabber.jc-otto.de, jabster.pl, jabber.no, anoxinon.me, ubuntu-jabber.net, anonarchy.im, jabber.freenet.de, exploit.im, 616.pub, omemo.im, rsocks.net, chatwith.xyz, jabber.cz, jabbim.cz, blabber.im, jabber.root.cz, jabb.im, jabber.infos.ru, jabbim.pl, jabbim.com, linuxlovers.at, jabbim.ru, jabber.sk, njs.netlab.cz, jabba.biz diff --git a/hosts/mailtngbert/default.nix b/hosts/mailtngbert/default.nix index 19e5115d..957056f9 100644 --- a/hosts/mailtngbert/default.nix +++ b/hosts/mailtngbert/default.nix @@ -1,4 +1,4 @@ -{ zentralwerk, config, pkgs, lib, ... }: +{ config, pkgs, lib, ... }: let domain = "mailtngbert.c3d2.de"; diff --git a/hosts/mastodon/default.nix b/hosts/mastodon/default.nix index 9135f95e..7ffa36da 100644 --- a/hosts/mastodon/default.nix +++ b/hosts/mastodon/default.nix @@ -1,4 +1,4 @@ -{ zentralwerk, config, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: { c3d2.hq.statistics.enable = true; c3d2.deployment.server = "server10"; diff --git a/hosts/nfsroot/tftp.nix b/hosts/nfsroot/tftp.nix index 7c04a781..742c5e56 100644 --- a/hosts/nfsroot/tftp.nix +++ b/hosts/nfsroot/tftp.nix @@ -1,4 +1,4 @@ -{ tftproots, hostRegistry, lib, pkgs, ... }: +{ tftproots, pkgs, ... }: { networking.firewall.enable = false; diff --git a/hosts/rc3ticker/default.nix b/hosts/rc3ticker/default.nix index e99b1eba..db658b96 100644 --- a/hosts/rc3ticker/default.nix +++ b/hosts/rc3ticker/default.nix @@ -1,4 +1,4 @@ -{ zentralwerk, config, ... }: +{ config, ... }: { deployment = { diff --git a/hosts/sdrweb/default.nix b/hosts/sdrweb/default.nix index 60fdcff4..3144389e 100644 --- a/hosts/sdrweb/default.nix +++ b/hosts/sdrweb/default.nix @@ -1,4 +1,4 @@ -{ config, hostRegistry, pkgs, ... }: +{ hostRegistry, pkgs, ... }: { deployment = { mem = 4096; diff --git a/hosts/server10/default.nix b/hosts/server10/default.nix index 0ef9d371..8db5327b 100644 --- a/hosts/server10/default.nix +++ b/hosts/server10/default.nix @@ -1,4 +1,4 @@ -{ config, ... }: +{ ... }: { imports = [ diff --git a/overlays/bmxd.nix b/overlays/bmxd.nix index 4bec93ed..e585cc97 100644 --- a/overlays/bmxd.nix +++ b/overlays/bmxd.nix @@ -1,4 +1,4 @@ -{ stdenv, fetchgit, writeScript, runtimeShell }: +{ stdenv, fetchgit }: stdenv.mkDerivation { pname = "bmxd";