Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

hosts/*: remove lib.flatten usage #109

Merged
merged 1 commit into from
Apr 10, 2024
Merged

hosts/*: remove lib.flatten usage #109

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
17 changes: 8 additions & 9 deletions hosts/binarycache/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,12 +11,13 @@
sops.defaultSopsFile = ./secrets.yaml;
sops.secrets.cache-sig-key.owner = "root";

imports = lib.flatten [
(with inputs; [
sops-nix.nixosModules.sops
disko.nixosModules.disko
])
(with self.nixosModules; [
imports =
[
./disk-config.nix
inputs.sops-nix.nixosModules.sops
inputs.disko.nixosModules.disko
]
++ (with self.nixosModules; [
common
qemu-common
ficolo-common
Expand All @@ -31,9 +32,7 @@
user-hrosten
user-mkaapu
user-avnik
])
./disk-config.nix
];
]);

nix.settings = {
# we don't want the cache to be a substitutor for itself
Expand Down
19 changes: 8 additions & 11 deletions hosts/ficolobuild/build3.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,19 +1,16 @@
# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
# SPDX-License-Identifier: Apache-2.0
{
self,
lib,
...
}: {
imports = lib.flatten [
(with self.nixosModules; [
{self, ...}: {
imports =
[
./builder.nix
./developers.nix
]
++ (with self.nixosModules; [
user-themisto
user-ktu
user-avnik
])
./builder.nix
./developers.nix
];
]);

# build3 specific configuration

Expand Down
17 changes: 7 additions & 10 deletions hosts/ficolobuild/build4.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,16 +1,13 @@
# SPDX-FileCopyrightText: 2022-2024 TII (SSRC) and the Ghaf contributors
# SPDX-License-Identifier: Apache-2.0
{
self,
lib,
...
}: {
imports = lib.flatten [
(with self.nixosModules; [
flokli marked this conversation as resolved.
Show resolved Hide resolved
{self, ...}: {
imports =
[
./builder.nix
]
++ (with self.nixosModules; [
user-themisto
])
./builder.nix
];
]);

# build4 specific configuration

Expand Down
15 changes: 8 additions & 7 deletions hosts/ficolobuild/builder.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,10 +9,13 @@
modulesPath,
...
}: {
imports = lib.flatten [
(modulesPath + "/installer/scan/not-detected.nix")
inputs.disko.nixosModules.disko
(with self.nixosModules; [
imports =
[
./disk-config.nix
(modulesPath + "/installer/scan/not-detected.nix")
inputs.disko.nixosModules.disko
]
++ (with self.nixosModules; [
common
ficolo-common
service-openssh
Expand All @@ -24,9 +27,7 @@
user-tervis
user-karim
user-mika
])
./disk-config.nix
];
]);

# Hardwre Configuration:

Expand Down
17 changes: 8 additions & 9 deletions hosts/monitoring/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -16,12 +16,13 @@ in {
sops.defaultSopsFile = ./secrets.yaml;
sops.secrets.sshified_private_key.owner = "sshified";

imports = lib.flatten [
(with inputs; [
sops-nix.nixosModules.sops
disko.nixosModules.disko
])
(with self.nixosModules; [
imports =
[
./disk-config.nix
inputs.sops-nix.nixosModules.sops
inputs.disko.nixosModules.disko
]
++ (with self.nixosModules; [
common
qemu-common
ficolo-common
Expand All @@ -30,9 +31,7 @@ in {
service-node-exporter
user-jrautiola
user-tervis
])
./disk-config.nix
];
]);

nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";

Expand Down
17 changes: 8 additions & 9 deletions hosts/prbuilder/configuration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,12 +8,13 @@
pkgs,
...
}: {
imports = lib.flatten [
(with inputs; [
nix-serve-ng.nixosModules.default
disko.nixosModules.disko
])
(with self.nixosModules; [
imports =
[
./disk-config.nix
inputs.nix-serve-ng.nixosModules.default
inputs.disko.nixosModules.disko
]
++ (with self.nixosModules; [
common
qemu-common
ficolo-common
Expand All @@ -26,9 +27,7 @@
user-tervis
user-barna
user-mika
])
./disk-config.nix
];
]);
nixpkgs.hostPlatform = lib.mkDefault "x86_64-linux";
# List packages installed in system profile
environment.systemPackages = with pkgs; [
Expand Down
Loading