From 272bb5ffc1e241d1d84ca586408b788f5e69d511 Mon Sep 17 00:00:00 2001 From: zowoq <59103226+zowoq@users.noreply.github.com> Date: Thu, 21 Nov 2024 12:51:20 +1000 Subject: [PATCH] sort imports --- hosts/build01/default.nix | 4 ++-- hosts/build02/default.nix | 6 +++--- hosts/build03/default.nix | 17 ++++++++--------- hosts/build04/default.nix | 6 +++--- modules/darwin/common/default.nix | 6 +++--- 5 files changed, 19 insertions(+), 20 deletions(-) diff --git a/hosts/build01/default.nix b/hosts/build01/default.nix index 43882dc..0d0fec8 100644 --- a/hosts/build01/default.nix +++ b/hosts/build01/default.nix @@ -1,10 +1,10 @@ { inputs, ... }: { imports = [ - inputs.srvos.nixosModules.hardware-hetzner-online-amd - inputs.self.nixosModules.disko-zfs inputs.self.nixosModules.builder inputs.self.nixosModules.community-builder + inputs.self.nixosModules.disko-zfs + inputs.srvos.nixosModules.hardware-hetzner-online-amd ]; # Emulate riscv64 until we have proper builders diff --git a/hosts/build02/default.nix b/hosts/build02/default.nix index 2bbc8d9..813beb7 100644 --- a/hosts/build02/default.nix +++ b/hosts/build02/default.nix @@ -2,12 +2,12 @@ { imports = [ - inputs.self.nixosModules.nginx - inputs.srvos.nixosModules.hardware-hetzner-online-amd - ./nixpkgs-update.nix ./nixpkgs-update-backup.nix + ./nixpkgs-update.nix inputs.self.nixosModules.builder inputs.self.nixosModules.disko-zfs + inputs.self.nixosModules.nginx + inputs.srvos.nixosModules.hardware-hetzner-online-amd ]; # set in srvos, remove when reinstalling diff --git a/hosts/build03/default.nix b/hosts/build03/default.nix index 3f474de..f160d04 100644 --- a/hosts/build03/default.nix +++ b/hosts/build03/default.nix @@ -1,21 +1,20 @@ { inputs, ... }: { imports = [ - inputs.self.nixosModules.nginx - inputs.srvos.nixosModules.hardware-hetzner-online-amd - inputs.self.nixosModules.disko-zfs + ./builders.nix + ./postgresql.nix inputs.self.nixosModules.buildbot inputs.self.nixosModules.builder - inputs.self.nixosModules.ci-builder inputs.self.nixosModules.cgroups - inputs.self.nixosModules.hercules-ci - inputs.self.nixosModules.watch-store - ./builders.nix - + inputs.self.nixosModules.ci-builder + inputs.self.nixosModules.disko-zfs inputs.self.nixosModules.github-org-backup + inputs.self.nixosModules.hercules-ci inputs.self.nixosModules.hydra + inputs.self.nixosModules.nginx inputs.self.nixosModules.nur-update - ./postgresql.nix + inputs.self.nixosModules.watch-store + inputs.srvos.nixosModules.hardware-hetzner-online-amd ]; systemd.network.networks."10-uplink".networkConfig.Address = "2a01:4f8:2190:2698::2"; diff --git a/hosts/build04/default.nix b/hosts/build04/default.nix index d9b7f7e..529aff8 100644 --- a/hosts/build04/default.nix +++ b/hosts/build04/default.nix @@ -1,13 +1,13 @@ { inputs, ... }: { imports = [ - inputs.srvos.nixosModules.hardware-hetzner-online-arm - inputs.self.nixosModules.disko-zfs inputs.self.nixosModules.builder - inputs.self.nixosModules.ci-builder inputs.self.nixosModules.cgroups + inputs.self.nixosModules.ci-builder + inputs.self.nixosModules.disko-zfs inputs.self.nixosModules.hercules-ci inputs.self.nixosModules.remote-builder + inputs.srvos.nixosModules.hardware-hetzner-online-arm ]; # error: failed to start SSH connection diff --git a/modules/darwin/common/default.nix b/modules/darwin/common/default.nix index c7f9806..650d1ee 100644 --- a/modules/darwin/common/default.nix +++ b/modules/darwin/common/default.nix @@ -1,7 +1,8 @@ { inputs, ... }: { imports = [ - inputs.srvos.darwinModules.server + ../../shared/known-hosts.nix + ../../shared/nix-daemon.nix ./apfs-cleanup.nix ./network.nix ./packages.nix @@ -9,9 +10,8 @@ ./software-update.nix ./telegraf.nix ./users.nix - ../../shared/known-hosts.nix - ../../shared/nix-daemon.nix inputs.agenix.darwinModules.age + inputs.srvos.darwinModules.server ]; # https://github.com/NixOS/nix/issues/7273