treewide: apply deadnix fixes

This commit is contained in:
Max Headroom 2022-10-17 14:54:48 +02:00
parent dbbf2330fd
commit 142a640154
35 changed files with 32 additions and 37 deletions

View file

@ -1,4 +1,4 @@
{ config, lib, ... }: { lib, ... }:
with lib; with lib;
{ {

View file

@ -1,5 +1,5 @@
vars: vars:
{ name, config, lib, ... }: { config, lib, ... }:
with lib; with lib;
let let

View file

@ -1,4 +1,4 @@
{ cluster, config, hosts, inputs, lib, pkgs, tools, ... }: { cluster, config, lib, pkgs, tools, ... }:
let let
inherit (tools.meta) domain; inherit (tools.meta) domain;

View file

@ -1,4 +1,4 @@
{ cluster, config, hosts, inputs, lib, pkgs, tools, ... }: { cluster, config, hosts, lib, ... }:
let let
inherit (hosts.${config.networking.hostName}) interfaces; inherit (hosts.${config.networking.hostName}) interfaces;

View file

@ -1,4 +1,4 @@
{ config, tools, ... }: { tools, ... }:
{ {
vars = { vars = {

View file

@ -1,5 +1,3 @@
{ config, ... }:
{ {
services.websites = { services.websites = {
nodes = { nodes = {

View file

@ -1,4 +1,4 @@
{ config, inputs, lib, pkgs, tools, ... }: { inputs, lib, pkgs, tools, ... }:
let let
importWebsites = expr: import expr { importWebsites = expr: import expr {

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,4 +1,4 @@
{ lib, config, tools, ... }: { config, tools, ... }:
let let
inherit (tools.meta) adminEmail; inherit (tools.meta) adminEmail;

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, tools, ... }: { config, lib, tools, ... }:
let let
inherit (tools.meta) domain; inherit (tools.meta) domain;
login = x: "https://login.${domain}/auth/realms/master/protocol/openid-connect/${x}"; login = x: "https://login.${domain}/auth/realms/master/protocol/openid-connect/${x}";
@ -35,7 +35,7 @@ in
skip-provider-button = true; skip-provider-button = true;
}; };
}; };
services.nginx.virtualHosts = lib.genAttrs cfg.nginx.virtualHosts (vhost: { services.nginx.virtualHosts = lib.genAttrs cfg.nginx.virtualHosts (_vhost: {
# apply protection to the whole vhost, not just / # apply protection to the whole vhost, not just /
extraConfig = '' extraConfig = ''
auth_request /oauth2/auth; auth_request /oauth2/auth;

View file

@ -1,4 +1,4 @@
{ config, lib, tools, ... }: { config, tools, ... }:
with tools.nginx; with tools.nginx;
{ {
links = { links = {

View file

@ -1,4 +1,4 @@
{ aspect, config, hosts, lib, pkgs, tools, ... }: { aspect, config, hosts, tools, ... }:
with tools.nginx; with tools.nginx;
let let
inherit (tools.meta) domain; inherit (tools.meta) domain;

View file

@ -1,4 +1,4 @@
{ config, lib, tools, ... }: { tools, ... }:
with tools.nginx.mappers; with tools.nginx.mappers;
with tools.nginx.vhosts; with tools.nginx.vhosts;
{ {

View file

@ -1,4 +1,4 @@
{ config, lib, pkgs, tools, ... }: { config, pkgs, tools, ... }:
let let
inherit (tools.identity) ldap; inherit (tools.identity) ldap;
inherit (tools.meta) domain; inherit (tools.meta) domain;

View file

@ -1,4 +1,4 @@
{ cluster, config, hosts, inputs, lib, pkgs, tools, ... }: { cluster, config, inputs, lib, pkgs, tools, ... }:
let let
inherit (tools.meta) domain; inherit (tools.meta) domain;

View file

@ -1,4 +1,4 @@
{ config, inputs, lib, pkgs, tools, ... }: { config, lib, tools, ... }:
with tools.nginx; with tools.nginx;
let let
inherit (config) links; inherit (config) links;

View file

@ -1,4 +1,4 @@
{ config, inputs, lib, pkgs, tools, ... }: { inputs, pkgs, tools, ... }:
let let
importWebsites = expr: import expr { importWebsites = expr: import expr {

View file

@ -1,4 +1,4 @@
{ config, hosts, ... }: { config, ... }:
let let
inherit (config.networking) hostName; inherit (config.networking) hostName;

View file

@ -1,4 +1,4 @@
{ aspect, config, hosts, inputs, lib, pkgs, tools, ... }: { aspect, config, hosts, inputs, tools, ... }:
{ {
imports = imports =

View file

@ -1,7 +1,7 @@
# Do not modify this file! It was generated by nixos-generate-config # Do not modify this file! It was generated by nixos-generate-config
# and may be overwritten by future invocations. Please make changes # and may be overwritten by future invocations. Please make changes
# to /etc/nixos/configuration.nix instead. # to /etc/nixos/configuration.nix instead.
{ config, lib, pkgs, modulesPath, ... }: { modulesPath, ... }:
{ {
imports = imports =

View file

@ -1,4 +1,4 @@
{ lib, config, tools, ... }: { config, tools, ... }:
let let
inherit (tools.meta) adminEmail; inherit (tools.meta) adminEmail;

View file

@ -1,4 +1,4 @@
{ aspect, inputs, config, hosts, pkgs, ... }: { aspect, inputs, hosts, ... }:
{ {
imports = imports =

View file

@ -1,4 +1,4 @@
{ pkgs, aspect, hosts, tools, ... }: { aspect, hosts, ... }:
{ {
imports = with aspect; [ imports = with aspect; [

View file

@ -1,4 +1,3 @@
{ pkgs, lib, config, inputs, ... }:
{ {
nixpkgs.overlays = [ nixpkgs.overlays = [
(self: super: (self: super:

View file

@ -1,4 +1,4 @@
{ config, pkgs, hosts, inputs, lib, tools, ... }: { config, hosts, lib, tools, ... }:
let let
orgDomain = tools.meta.domain; orgDomain = tools.meta.domain;
orgRealm = lib.toUpper orgDomain; orgRealm = lib.toUpper orgDomain;

View file

@ -1,4 +1,3 @@
{ pkgs, config, ... }:
{ {
boot.kernel.sysctl = { boot.kernel.sysctl = {
"kernel.yama.ptrace_scope" = 1; "kernel.yama.ptrace_scope" = 1;

View file

@ -1,4 +1,4 @@
{ pkgs, lib, config, ... }: { lib, config, ... }:
{ {
age.secrets = { age.secrets = {
hydraS3 = { hydraS3 = {

View file

@ -1,4 +1,3 @@
{ pkgs, config, ... }:
{ {
nix.trustedUsers = [ "nix" ]; nix.trustedUsers = [ "nix" ];
users.users.nix = { users.users.nix = {

View file

@ -1,4 +1,4 @@
{ config, inputs, ... }: { inputs, ... }:
with inputs; with inputs;
{ {

View file

@ -1,4 +1,4 @@
{ config, lib, ... }: { lib, ... }:
with lib; with lib;

View file

@ -1,4 +1,4 @@
{ pkgs, config, ... }: { pkgs, ... }:
let let
component = name: builtins.readFile (builtins.toString ../../config/zsh/components + "/${name}.zsh"); component = name: builtins.readFile (builtins.toString ../../config/zsh/components + "/${name}.zsh");

View file

@ -1,4 +1,4 @@
{ hosts, config, lib, ... }: { hosts, lib, ... }:
let let
filtered = lib.filterAttrs (_: host: host ? ssh) hosts; filtered = lib.filterAttrs (_: host: host ? ssh) hosts;
idCapable = lib.filterAttrs (_: host: host.ssh ? id) filtered; idCapable = lib.filterAttrs (_: host: host.ssh ? id) filtered;

View file

@ -1,4 +1,4 @@
{ filters, inputs', pkgs, self, self', ... }: { filters, pkgs, self, self', ... }:
{ {
checks = filters.doFilter filters.checks { checks = filters.doFilter filters.checks {
keycloak = pkgs.callPackage ./keycloak-custom-jre.nix { keycloak = pkgs.callPackage ./keycloak-custom-jre.nix {

View file

@ -1,4 +1,4 @@
{ inputs, lib, ... }: { lib, ... }:
let let
filters = import ./system-filter.nix; filters = import ./system-filter.nix;
doFilter' = system: filterSet: lib.filterAttrs (name: _: doFilter' = system: filterSet: lib.filterAttrs (name: _:

View file

@ -1,7 +1,7 @@
{ inputs, self, ... }: { inputs, self, ... }:
{ {
perSystem = { filters, inputs', pkgs, self', system, ... }: perSystem = { filters, pkgs, self', ... }:
let let
inherit (self'.packages) nix-super; inherit (self'.packages) nix-super;