From 5dad72c5cdf3bf363a83c45cbdb0ce16d5c7b4ff Mon Sep 17 00:00:00 2001 From: Greg Hellings Date: Fri, 29 Dec 2023 23:36:40 -0600 Subject: [PATCH] Move modules to shared --- configuration.nix | 3 +-- darwin/default.nix | 3 +-- flake.nix | 3 --- hosts/default.nix | 3 +-- hosts/myself/container-git.nix | 16 ++++++++++++---- hosts/myself/git.nix | 1 + {modules-all => modules}/ci-runner.nix | 0 {modules-darwin => modules/darwin}/default.nix | 0 {modules-all => modules}/default.nix | 7 ++++++- {modules-linux => modules/linux}/backup.nix | 0 {modules-linux => modules/linux}/default.nix | 0 {modules-linux => modules/linux}/gnome.nix | 0 {modules-linux => modules/linux}/home.nix | 0 {modules-linux => modules/linux}/kde.nix | 0 {modules-linux => modules/linux}/kiwix-serve.nix | 0 {modules-linux => modules/linux}/linode.nix | 0 {modules-linux => modules/linux}/linux.nix | 0 {modules-linux => modules/linux}/proxy.nix | 0 {modules-linux => modules/linux}/router.nix | 0 {modules-linux => modules/linux}/rpi4.nix | 0 {modules-linux => modules/linux}/tailscale.nix | 0 21 files changed, 22 insertions(+), 14 deletions(-) rename {modules-all => modules}/ci-runner.nix (100%) rename {modules-darwin => modules/darwin}/default.nix (100%) rename {modules-all => modules}/default.nix (85%) rename {modules-linux => modules/linux}/backup.nix (100%) rename {modules-linux => modules/linux}/default.nix (100%) rename {modules-linux => modules/linux}/gnome.nix (100%) rename {modules-linux => modules/linux}/home.nix (100%) rename {modules-linux => modules/linux}/kde.nix (100%) rename {modules-linux => modules/linux}/kiwix-serve.nix (100%) rename {modules-linux => modules/linux}/linode.nix (100%) rename {modules-linux => modules/linux}/linux.nix (100%) rename {modules-linux => modules/linux}/proxy.nix (100%) rename {modules-linux => modules/linux}/router.nix (100%) rename {modules-linux => modules/linux}/rpi4.nix (100%) rename {modules-linux => modules/linux}/tailscale.nix (100%) diff --git a/configuration.nix b/configuration.nix index 622e0db..1944e5c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -8,8 +8,7 @@ imports = [ # Include the results of the hardware scan. ./hardware-configuration.nix - ./modules-all/ - ./modules-linux/ + ./modules/ ]; # Bootloader. diff --git a/darwin/default.nix b/darwin/default.nix index 8ff0ba7..f693ae1 100644 --- a/darwin/default.nix +++ b/darwin/default.nix @@ -31,8 +31,7 @@ let }; users.users."gregory.hellings".home = "/Users/gregory.hellings"; } - ../modules-all - ../modules-darwin + ../modules ./${name} ] ++ extraMods; }; diff --git a/flake.nix b/flake.nix index e309825..2920e92 100644 --- a/flake.nix +++ b/flake.nix @@ -84,9 +84,6 @@ })); overlays = { default = local_overlay; }; - modules = (import ./modules-all {}) // - (import ./modules-linux {}) // - (import ./modules-darwin {}); packages = (import ./overlays/packages.nix { inherit nixunstable flake-utils; }); }; } diff --git a/hosts/default.nix b/hosts/default.nix index ee0e65a..0954582 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -35,8 +35,7 @@ let } inputs.agenix.nixosModules.default hm.nixosModules.home-manager - ../modules-all - ../modules-linux + ../modules ./${name} ] ++ extraMods; }; diff --git a/hosts/myself/container-git.nix b/hosts/myself/container-git.nix index fae98e2..364ab5c 100644 --- a/hosts/myself/container-git.nix +++ b/hosts/myself/container-git.nix @@ -6,8 +6,8 @@ in { imports = [ inputs.agenix.nixosModules.default - ../../modules-linux/proxy.nix - ../../modules-linux/tailscale.nix + ../../modules/linux/proxy.nix + ../../modules/linux/tailscale.nix ]; age.identityPaths = [ "/etc/ssh/ssh_host_ed25519_key" ]; @@ -133,8 +133,16 @@ in { # Do not start nginx until we have tailscaled up and running, so it can bind # to the 100.* addresses systemd.services.nginx = { - after = [ "tailscaled.service" ]; - requires = [ "tailscaled.service" ]; + after = [ + "tailscaled.service" + "network.target" + "network-online.target" + ]; + wants = [ + "tailscaled.service" + "network.target" + "network-online.target" + ]; }; system.stateVersion = "24.05"; } diff --git a/hosts/myself/git.nix b/hosts/myself/git.nix index d278b2a..3b638e1 100644 --- a/hosts/myself/git.nix +++ b/hosts/myself/git.nix @@ -217,5 +217,6 @@ in { virtualisation = { docker.enable = true; oci-containers.backend = "docker"; + virtualbox.host.enable = true; }; } diff --git a/modules-all/ci-runner.nix b/modules/ci-runner.nix similarity index 100% rename from modules-all/ci-runner.nix rename to modules/ci-runner.nix diff --git a/modules-darwin/default.nix b/modules/darwin/default.nix similarity index 100% rename from modules-darwin/default.nix rename to modules/darwin/default.nix diff --git a/modules-all/default.nix b/modules/default.nix similarity index 85% rename from modules-all/default.nix rename to modules/default.nix index 68a1f9b..70fac9a 100644 --- a/modules-all/default.nix +++ b/modules/default.nix @@ -1,9 +1,14 @@ { pkgs, lib, ... }: +let + inherit (lib.strings) hasSuffix; + system = pkgs.system; in { imports = [ ./ci-runner.nix - ]; + ] + ++ (if (lib.strings.hasSuffix "darwin" "nope") then [./darwin] else []) + ++ (if (lib.strings.hasSuffix "linux" "linux") then [./linux] else []); # Enable flakes nix = { diff --git a/modules-linux/backup.nix b/modules/linux/backup.nix similarity index 100% rename from modules-linux/backup.nix rename to modules/linux/backup.nix diff --git a/modules-linux/default.nix b/modules/linux/default.nix similarity index 100% rename from modules-linux/default.nix rename to modules/linux/default.nix diff --git a/modules-linux/gnome.nix b/modules/linux/gnome.nix similarity index 100% rename from modules-linux/gnome.nix rename to modules/linux/gnome.nix diff --git a/modules-linux/home.nix b/modules/linux/home.nix similarity index 100% rename from modules-linux/home.nix rename to modules/linux/home.nix diff --git a/modules-linux/kde.nix b/modules/linux/kde.nix similarity index 100% rename from modules-linux/kde.nix rename to modules/linux/kde.nix diff --git a/modules-linux/kiwix-serve.nix b/modules/linux/kiwix-serve.nix similarity index 100% rename from modules-linux/kiwix-serve.nix rename to modules/linux/kiwix-serve.nix diff --git a/modules-linux/linode.nix b/modules/linux/linode.nix similarity index 100% rename from modules-linux/linode.nix rename to modules/linux/linode.nix diff --git a/modules-linux/linux.nix b/modules/linux/linux.nix similarity index 100% rename from modules-linux/linux.nix rename to modules/linux/linux.nix diff --git a/modules-linux/proxy.nix b/modules/linux/proxy.nix similarity index 100% rename from modules-linux/proxy.nix rename to modules/linux/proxy.nix diff --git a/modules-linux/router.nix b/modules/linux/router.nix similarity index 100% rename from modules-linux/router.nix rename to modules/linux/router.nix diff --git a/modules-linux/rpi4.nix b/modules/linux/rpi4.nix similarity index 100% rename from modules-linux/rpi4.nix rename to modules/linux/rpi4.nix diff --git a/modules-linux/tailscale.nix b/modules/linux/tailscale.nix similarity index 100% rename from modules-linux/tailscale.nix rename to modules/linux/tailscale.nix