beatzaplenty/nixos
Archived
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Resolve all statix and nixpkgs-fmt warnings repo-wide

Browse Source 
Zero W20 (repeated attribute keys), W10 (empty { ... }: variadic
pattern, use _: instead), and W04 (a = x.a instead of inherit)
warnings remain anywhere in the tree, and nixpkgs-fmt --check is
clean on all 46 .nix files.

Repeated-key merges go as deep as statix actually flags per file
(e.g. boot.loader.* nested under boot.loader = { ... } once the
outer boot.* merge exposed it as its own repeat) — every merge is a
pure attribute-path restructuring with no value changes, verified by
comparing config.system.build.toplevel.drvPath before/after for a
representative host per changed module plus a full 19-host + 4-package
eval sweep.

One indentation slip caught and fixed during this pass: nesting
modules/installer/common.nix's environment.etc."auto-install.sh".text
under an environment = { ... } block initially normalized the
script's shebang/set line indentation, which actually changes the
rendered file (Nix's '' string dedent treats it as real content, not
cosmetic whitespace) — reproduced the original's exact indentation
and reverified the rendered script is byte-identical to before.

modules/services/zfs/auto-mount-volumes.nix picked up formatting too;
worth noting it isn't imported by anything in this flake at all.

Co-Authored-By: Claude Sonnet 5 <noreply@anthropic.com>
Claude-Session: https://claude.ai/code/session_01La55Nsss8jZ7ZuzUV9mfot
This commit is contained in:
beatzaplenty
2026-07-20 03:47:42 +10:00
co-authored by Claude Sonnet 5
parent 627aad8c29
commit 6f8c6c8ef1
24 changed files with 367 additions and 314 deletions
Download Patch File Download Diff File Expand all files Collapse all files
modules/docker/enable-service.nix
+17 -17
View File
@@ -1,23 +1,23 @@
{ pkgs, ... }:
{
# virtualisation.docker.enable = true;
# virtualisation.docker.enable = true;
virtualisation.docker = {
enable = true;
package = pkgs.docker;
# listenOptions = [
# "unix:///var/run/docker.sock"
# "tcp://0.0.0.0:2375"
#];
enable = true;
package = pkgs.docker;
# listenOptions = [
# "unix:///var/run/docker.sock"
# "tcp://0.0.0.0:2375"
#];
# daemon.settings = {
# metrics-addr = "0.0.0.0:9323";
# experimental = true;
# };
};
# daemon.settings = {
# metrics-addr = "0.0.0.0:9323";
# experimental = true;
# };
};
environment.systemPackages = with pkgs; [
docker-compose
docker-buildx
];
}
environment.systemPackages = with pkgs; [
docker-compose
docker-buildx
];
}
modules/docker/mount-data.nix
+51 -49
View File
@@ -1,63 +1,65 @@
{ config, lib, pkgs, vars, ... }:
{
fileSystems."/mnt/docker/config" = {
device = "${vars.nfsServerHost}:${vars.storageRoot}/docker/config";
fsType = "nfs";
fileSystems = {
"/mnt/docker/config" = {
device = "${vars.nfsServerHost}:${vars.storageRoot}/docker/config";
fsType = "nfs";
options = [
"nfsvers=4.2"
"_netdev"
"x-systemd.automount"
"noatime"
];
};
options = [
"nfsvers=4.2"
"_netdev"
"x-systemd.automount"
"noatime"
];
};
fileSystems."/mnt/docker/databases" = {
device = "${vars.nfsServerHost}:${vars.storageRoot}/docker/databases";
fsType = "nfs";
"/mnt/docker/databases" = {
device = "${vars.nfsServerHost}:${vars.storageRoot}/docker/databases";
fsType = "nfs";
options = [
"nfsvers=4.2"
"_netdev"
"x-systemd.automount"
"noatime"
];
};
options = [
"nfsvers=4.2"
"_netdev"
"x-systemd.automount"
"noatime"
];
};
fileSystems."/mnt/docker/volumes" = {
device = "${vars.nfsServerHost}:${vars.storageRoot}/docker/volumes";
fsType = "nfs";
"/mnt/docker/volumes" = {
device = "${vars.nfsServerHost}:${vars.storageRoot}/docker/volumes";
fsType = "nfs";
options = [
"nfsvers=4.2"
"_netdev"
"x-systemd.automount"
"noatime"
];
};
options = [
"nfsvers=4.2"
"_netdev"
"x-systemd.automount"
"noatime"
];
};
fileSystems."/mnt/nextcloud-data" = {
device = "${vars.nfsServerHost}:${vars.storageRoot}/docker/nextcloud-data";
fsType = "nfs";
"/mnt/nextcloud-data" = {
device = "${vars.nfsServerHost}:${vars.storageRoot}/docker/nextcloud-data";
fsType = "nfs";
options = [
"nfsvers=4.2"
"_netdev"
"x-systemd.automount"
"noatime"
];
};
options = [
"nfsvers=4.2"
"_netdev"
"x-systemd.automount"
"noatime"
];
};
fileSystems."/mnt/raspi-backup" = {
device = "${vars.nfsServerHost}:${vars.storageRoot}/raspi/volumes";
fsType = "nfs";
"/mnt/raspi-backup" = {
device = "${vars.nfsServerHost}:${vars.storageRoot}/raspi/volumes";
fsType = "nfs";
options = [
"nfsvers=4.2"
"_netdev"
"x-systemd.automount"
"noatime"
];
options = [
"nfsvers=4.2"
"_netdev"
"x-systemd.automount"
"noatime"
];
};
};
}