Compare commits

...

1 Commits

Author SHA1 Message Date
d24f58a4c9 feat(nix): add style tooling 2026-09-16 00:13:28 -04:00
7 changed files with 91 additions and 7 deletions

View File

@@ -99,6 +99,7 @@
# tech debt # tech debt
- better remote deployment - better remote deployment
- expose remote deployment as a flake app, replacing the Fish-only `deploy-to` workflow
- centralize shared system group names, starting with the `storage` group - centralize shared system group names, starting with the `storage` group
## nix refactor ## nix refactor

23
flake.lock generated
View File

@@ -465,7 +465,8 @@
"nixpkgs-unstable": "nixpkgs-unstable", "nixpkgs-unstable": "nixpkgs-unstable",
"nixvim": "nixvim", "nixvim": "nixvim",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix" "stylix": "stylix",
"treefmt-nix": "treefmt-nix"
} }
}, },
"sops-nix": { "sops-nix": {
@@ -617,6 +618,26 @@
"repo": "base16-zed", "repo": "base16-zed",
"type": "github" "type": "github"
} }
},
"treefmt-nix": {
"inputs": {
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"lastModified": 1786901030,
"narHash": "sha256-WSFCsDSE5ffgD2MqzkM2CYjeFiKhRF/dJUN8uedb6YE=",
"owner": "numtide",
"repo": "treefmt-nix",
"rev": "27b3b12a8e6375f28ebe122f07d230ca5459bbfa",
"type": "github"
},
"original": {
"owner": "numtide",
"repo": "treefmt-nix",
"type": "github"
}
} }
}, },
"root": "root", "root": "root",

View File

@@ -62,6 +62,12 @@
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";
}; };
# Repository formatter and Nix lint wiring.
treefmt-nix = {
url = "github:numtide/treefmt-nix";
inputs.nixpkgs.follows = "nixpkgs";
};
# CachyOS kernel and binary cache. # CachyOS kernel and binary cache.
# This must not follow this flake's nixpkgs because Chaotic builds against its own pinned package set. # This must not follow this flake's nixpkgs because Chaotic builds against its own pinned package set.
# Its cache serves the kernel only when the overlay stays on the cache-friendly path. # Its cache serves the kernel only when the overlay stays on the cache-friendly path.
@@ -70,11 +76,10 @@
outputs = outputs =
{ self, nixpkgs, ... }@inputs: { self, nixpkgs, ... }@inputs:
{ import ./src/dotfiles {
nixosConfigurations = (import ./src/dotfiles { inherit inputs self;
inherit inputs self; lib = nixpkgs.lib;
lib = nixpkgs.lib; root = ./configs/nixos;
root = ./configs/nixos; system = "x86_64-linux";
}).nixosConfigurations;
}; };
} }

28
src/dotfiles/apps.nix Normal file
View File

@@ -0,0 +1,28 @@
{
inputs,
lib,
formatter,
system,
}:
let
pkgs = inputs.nixpkgs.legacyPackages.${system};
in
{
fix = {
type = "app";
program = lib.getExe (pkgs.writeShellApplication {
name = "fix";
runtimeInputs = [
formatter.config.build.wrapper
pkgs.statix
pkgs.deadnix
];
text = ''
treefmt
statix fix .
deadnix --edit --exclude configs/nixos/hosts/*/hardware-configuration.nix -- .
treefmt
'';
});
};
}

View File

@@ -3,6 +3,7 @@
inputs, inputs,
self, self,
root, root,
system,
}: }:
let let
util = import ./util.nix { inherit lib; }; util = import ./util.nix { inherit lib; };
@@ -38,8 +39,23 @@ let
; ;
registry = registry.collected; registry = registry.collected;
}; };
formatter = import ./formatter.nix {
inherit inputs system;
};
in in
{ {
formatter.${system} = formatter.config.build.wrapper;
apps.${system} = import ./apps.nix {
inherit
inputs
lib
formatter
system
;
};
nixosConfigurations = import ./hosts.nix { nixosConfigurations = import ./hosts.nix {
inherit inherit
inputs inputs

View File

@@ -0,0 +1,10 @@
{ inputs, system }:
inputs.treefmt-nix.lib.evalModule inputs.nixpkgs.legacyPackages.${system} {
projectRootFile = "flake.nix";
programs.nixfmt.enable = true;
settings.formatter.nixfmt.excludes = [
"configs/nixos/hosts/*/hardware-configuration.nix"
];
}

3
statix.toml Normal file
View File

@@ -0,0 +1,3 @@
disabled = [
"repeated_keys",
]