Move modules to shared

This commit is contained in:
Greg Hellings
2023-12-29 23:36:40 -06:00
parent 5955faa0e2
commit 5dad72c5cd
21 changed files with 22 additions and 14 deletions
+1 -2
View File
@@ -35,8 +35,7 @@ let
}
inputs.agenix.nixosModules.default
hm.nixosModules.home-manager
../modules-all
../modules-linux
../modules
./${name}
] ++ extraMods;
};
+12 -4
View File
@@ -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";
}
+1
View File
@@ -217,5 +217,6 @@ in {
virtualisation = {
docker.enable = true;
oci-containers.backend = "docker";
virtualbox.host.enable = true;
};
}