From 02cd8440f1bc634125828a645277e9e5803c41e1 Mon Sep 17 00:00:00 2001 From: Rouven Seifert Date: Sun, 17 Sep 2023 20:14:32 +0200 Subject: [PATCH] refactor: ran deadnix --- hosts/quitte/configuration.nix | 2 +- hosts/quitte/hardware-configuration.nix | 2 +- hosts/quitte/network.nix | 2 +- modules/course-management.nix | 2 +- modules/ldap/default.nix | 2 +- modules/mail/default.nix | 2 +- modules/matrix.nix | 2 +- modules/mautrix-telegram.nix | 2 +- modules/sogo.nix | 2 +- modules/sops.nix | 2 +- modules/stream.nix | 2 +- modules/userdir.nix | 2 +- modules/wiki.nix | 2 +- 13 files changed, 13 insertions(+), 13 deletions(-) diff --git a/hosts/quitte/configuration.nix b/hosts/quitte/configuration.nix index 0bd9bf7..428e7fe 100644 --- a/hosts/quitte/configuration.nix +++ b/hosts/quitte/configuration.nix @@ -1,4 +1,4 @@ -{ config, pkgs, ... }: +{ pkgs, ... }: { imports = diff --git a/hosts/quitte/hardware-configuration.nix b/hosts/quitte/hardware-configuration.nix index 0bc9cf4..3c7c759 100644 --- a/hosts/quitte/hardware-configuration.nix +++ b/hosts/quitte/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/quitte/network.nix b/hosts/quitte/network.nix index 62af786..858f70e 100644 --- a/hosts/quitte/network.nix +++ b/hosts/quitte/network.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ config, ... }: let wireguard_port = 51820; in diff --git a/modules/course-management.nix b/modules/course-management.nix index 38f02a5..88cbc3b 100644 --- a/modules/course-management.nix +++ b/modules/course-management.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, lib, ... }: let hostName = "kurse.${config.networking.domain}"; in diff --git a/modules/ldap/default.nix b/modules/ldap/default.nix index a3d548c..98274df 100644 --- a/modules/ldap/default.nix +++ b/modules/ldap/default.nix @@ -55,7 +55,7 @@ in services.portunus = { enable = true; - package = pkgs.portunus.overrideAttrs (old: { + package = pkgs.portunus.overrideAttrs (_old: { patches = [ ./0001-update-user-validation-regex.patch ./0002-both-ldap-and-ldaps.patch diff --git a/modules/mail/default.nix b/modules/mail/default.nix index d321abb..992c796 100644 --- a/modules/mail/default.nix +++ b/modules/mail/default.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, ... }: let hostname = "mail.${config.networking.domain}"; domain = config.networking.domain; diff --git a/modules/matrix.nix b/modules/matrix.nix index beb211e..4162020 100644 --- a/modules/matrix.nix +++ b/modules/matrix.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, ... }: let domainServer = "matrix.staging.${config.networking.domain}"; domainClient = "chat.staging.${config.networking.domain}"; diff --git a/modules/mautrix-telegram.nix b/modules/mautrix-telegram.nix index 105a7a2..2b96d14 100644 --- a/modules/mautrix-telegram.nix +++ b/modules/mautrix-telegram.nix @@ -1,4 +1,4 @@ -{ config, options, lib, pkgs, ... }: +{ config, lib, pkgs, ... }: let homeserverDomain = config.services.matrix-synapse.settings.server_name; registrationFileSynapse = "/var/lib/matrix-synapse/telegram-registration.yaml"; diff --git a/modules/sogo.nix b/modules/sogo.nix index b1263b2..8b2490b 100644 --- a/modules/sogo.nix +++ b/modules/sogo.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, lib, ... }: let sogo-hostname = "mail.${config.networking.domain}"; in diff --git a/modules/sops.nix b/modules/sops.nix index 837fa32..d34979f 100644 --- a/modules/sops.nix +++ b/modules/sops.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ ... }: { sops.age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; sops.age.generateKey = false; diff --git a/modules/stream.nix b/modules/stream.nix index 11d45ef..3227e45 100644 --- a/modules/stream.nix +++ b/modules/stream.nix @@ -1,4 +1,4 @@ -{ pkgs, config, ... }: +{ config, ... }: { services = { nginx = { diff --git a/modules/userdir.nix b/modules/userdir.nix index 381ead5..16a8d27 100644 --- a/modules/userdir.nix +++ b/modules/userdir.nix @@ -1,4 +1,4 @@ -{ config, lib, pkgs, ... }: +{ config, ... }: let domain = "users.${config.networking.domain}"; port = 8083; diff --git a/modules/wiki.nix b/modules/wiki.nix index 8280210..1c82037 100644 --- a/modules/wiki.nix +++ b/modules/wiki.nix @@ -1,4 +1,4 @@ -{ config, pkgs, lib, ... }: +{ config, pkgs, ... }: let domain = "wiki.${config.networking.domain}"; listenPort = 8080;