Archived
Reorganize loose modules into themed directories
Several single-purpose modules sat at modules/ root or in the services/ catch-all despite the repo's established pattern of one directory per concern (tailscale/, beszel/, docker/, nix-cache/): - remote-builder-client.nix -> nix-cache/ (always co-included with nix-cache/client.nix in flake.nix's mkTarget, same buildType guard) - set-locale.nix -> common/ (unconditionally imported by common/configuration.nix already) - enable-ip-forwarding.nix -> networking/ - rotate-traefik-logs.nix -> traefik/rotate-logs.nix - services/docker-health-to-gotify.nix and services/nextcloud-cron-job.nix -> docker/ (both only ever imported by the docker build type, same as the rest of modules/docker/*) Pure path moves plus import-path updates in flake.nix, common/configuration.nix, and build-types/docker.nix — verified eval-equivalent (drvPath-identical) across representative hosts. Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com> Claude-Session: https://claude.ai/code/session_01La55Nsss8jZ7ZuzUV9mfot
This commit is contained in:
@@ -53,7 +53,7 @@
|
|||||||
}
|
}
|
||||||
] ++ lib.optionals (buildType != "nix-cache") [
|
] ++ lib.optionals (buildType != "nix-cache") [
|
||||||
./modules/nix-cache/client.nix
|
./modules/nix-cache/client.nix
|
||||||
./modules/remote-builder-client.nix
|
./modules/nix-cache/remote-builder-client.nix
|
||||||
];
|
];
|
||||||
specialArgs = { inherit inputs vars; };
|
specialArgs = { inherit inputs vars; };
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -1,4 +1,4 @@
|
|||||||
{ pkgs, ... }:
|
{ pkgs, vars, ... }:
|
||||||
|
|
||||||
{
|
{
|
||||||
# Pins the Docker Engine version, carried forward from the pre-refactor
|
# Pins the Docker Engine version, carried forward from the pre-refactor
|
||||||
@@ -13,11 +13,11 @@
|
|||||||
imports = [
|
imports = [
|
||||||
../docker/mount-data.nix
|
../docker/mount-data.nix
|
||||||
../docker/enable-service.nix
|
../docker/enable-service.nix
|
||||||
|
../docker/nextcloud-cron-job.nix
|
||||||
|
../docker/docker-health-to-gotify.nix
|
||||||
../tailscale/enable-service.nix
|
../tailscale/enable-service.nix
|
||||||
../rotate-traefik-logs.nix
|
../traefik/rotate-logs.nix
|
||||||
../raspi/mount-data.nix
|
../raspi/mount-data.nix
|
||||||
../services/nextcloud-cron-job.nix
|
|
||||||
../services/docker-health-to-gotify.nix
|
|
||||||
../services/enable-rpcbind.nix
|
../services/enable-rpcbind.nix
|
||||||
];
|
];
|
||||||
|
|
||||||
@@ -36,5 +36,5 @@
|
|||||||
users.users.nixos.extraGroups = [ "docker" ];
|
users.users.nixos.extraGroups = [ "docker" ];
|
||||||
services.openssh.settings.PermitRootLogin = "yes";
|
services.openssh.settings.PermitRootLogin = "yes";
|
||||||
|
|
||||||
networking.firewall.allowedTCPPorts = [ 80 8080 443 8090 ];
|
networking.firewall.allowedTCPPorts = [ 80 8080 443 vars.beszelHubPort ];
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -5,7 +5,7 @@
|
|||||||
[
|
[
|
||||||
# Include the results of the hardware scan.
|
# Include the results of the hardware scan.
|
||||||
# ./hardware-configuration.nix
|
# ./hardware-configuration.nix
|
||||||
../set-locale.nix
|
./set-locale.nix
|
||||||
];
|
];
|
||||||
# Use the GRUB 2 boot loader.
|
# Use the GRUB 2 boot loader.
|
||||||
# boot.loader.grub.enable = true;
|
# boot.loader.grub.enable = true;
|
||||||
|
|||||||
Reference in New Issue
Block a user