SebastianStork/nixos-config
1
0
Fork 0
mirror of https://github.com/SebastianStork/nixos-config.git synced 2026-01-21 17:31:34 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Remove all uses of lib.flatten

Browse source
This commit is contained in:
SebastianStork 2025-06-19 12:22:59 +02:00
parent 23762ecb29
commit b7d927cb39
4 changed files with 27 additions and 32 deletions
Download patch file Download diff file Expand all files Collapse all files

6
flake/hosts.nix
View file

@ -15,11 +15,11 @@ let
|> lib.filesystem.listFilesRecursive |> lib.filesystem.listFilesRecursive
|> builtins.filter (lib.hasSuffix ".nix"); |> builtins.filter (lib.hasSuffix ".nix");
in in
lib.flatten [ [
{ networking = { inherit hostName; }; } { networking = { inherit hostName; }; }
"${self}/hosts/shared.nix" "${self}/hosts/shared.nix"
hostFiles ]
]; ++ hostFiles;
}; };
}; };

4
modules/system/services/crowdsec/default.nix
View file

@ -90,12 +90,12 @@ in
''; '';
in in
[ [
"crowdsecurity/linux" (lib.singleton "crowdsecurity/linux")
(lib.optional (lib.elem "sshd" cfg.sources) "crowdsecurity/sshd") (lib.optional (lib.elem "sshd" cfg.sources) "crowdsecurity/sshd")
(lib.optional (lib.elem "caddy" cfg.sources) "crowdsecurity/caddy") (lib.optional (lib.elem "caddy" cfg.sources) "crowdsecurity/caddy")
(lib.optional (lib.elem "iptables" cfg.sources) "crowdsecurity/iptables") (lib.optional (lib.elem "iptables" cfg.sources) "crowdsecurity/iptables")
] ]
|> lib.flatten |> lib.concatLists
|> lib.map installCollection |> lib.map installCollection
|> lib.concatLines |> lib.concatLines
|> (text: pkgs.writeShellScript "crowdsec-install-collections" "set -e\n${text}") |> (text: pkgs.writeShellScript "crowdsec-install-collections" "set -e\n${text}")

2
modules/system/services/gatus.nix
View file

@ -101,7 +101,7 @@ in
username = ""; username = "";
password = ""; password = "";
}; };
conditions = lib.flatten [ conditions = lib.concatLists [
extraConditions extraConditions
(lib.optional (lib.hasPrefix "http" url) "[STATUS] == 200") (lib.optional (lib.hasPrefix "http" url) "[STATUS] == 200")
(lib.optional (lib.hasPrefix "tcp" url) "[CONNECTED] == true") (lib.optional (lib.hasPrefix "tcp" url) "[CONNECTED] == true")

47
modules/system/wifi.nix
View file

@ -16,33 +16,28 @@ in
{ {
options.custom.wifi.enable = lib.mkEnableOption ""; options.custom.wifi.enable = lib.mkEnableOption "";
config = lib.mkIf config.custom.wifi.enable ( config = lib.mkIf config.custom.wifi.enable {
lib.mkMerge ( networking.wireless.iwd = {
lib.flatten [ enable = true;
{ settings = {
networking.wireless.iwd = { General.EnableNetworkConfiguration = true;
enable = true; Settings.AutoConnect = true;
settings = { Network.NameResolvingService = "resolvconf";
General.EnableNetworkConfiguration = true; };
Settings.AutoConnect = true; };
Network.NameResolvingService = "resolvconf";
};
};
environment.systemPackages = [ pkgs.iwgtk ]; environment.systemPackages = [ pkgs.iwgtk ];
}
( sops.secrets =
networks networks
|> lib.map (name: { |> lib.map (name: {
sops.secrets."iwd/${name}" = { }; name = "iwd/${name}";
value = { };
})
|> lib.listToAttrs;
systemd.tmpfiles.rules = [ systemd.tmpfiles.rules =
"C /var/lib/iwd/${name} - - - - ${config.sops.secrets."iwd/${name}".path}" networks
]; |> lib.map (name: "C /var/lib/iwd/${name} - - - - ${config.sops.secrets."iwd/${name}".path}");
}) };
)
]
)
);
} }