Add nixfmt formatter

This commit is contained in:
Tim Van Baak 2024-07-18 23:20:16 -07:00
parent f08e634bd0
commit de23766af9
2 changed files with 17 additions and 13 deletions

View File

@ -17,11 +17,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1640223855, "lastModified": 1721369373,
"narHash": "sha256-2bOGDrou/P0E85O5CzcZcHrvDBR78kRIwSPMlaLnFb8=", "narHash": "sha256-KomTFhD1yPKYvU7cqJGBRyQACfmGJMMkUWJpvw3K7B8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "e7f5c0a08e442ed5772852b9f832d5d716020ebf", "rev": "9d5188abf958325668881e99aa74866b69214639",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -1,10 +1,15 @@
{ {
description = "A flake of MOTD files."; description = "A flake of MOTD files.";
inputs.nixpkgs.url = github:NixOS/nixpkgs; inputs.nixpkgs.url = "github:NixOS/nixpkgs";
inputs.flake-utils.url = github:numtide/flake-utils; inputs.flake-utils.url = "github:numtide/flake-utils";
outputs = { self, nixpkgs, flake-utils }: outputs =
{
self,
nixpkgs,
flake-utils,
}:
let let
motdFiles = { motdFiles = {
"40k" = ./40k-thought-for-the-day.txt; "40k" = ./40k-thought-for-the-day.txt;
@ -13,7 +18,8 @@
discordium = ./discordium.txt; discordium = ./discordium.txt;
}; };
in in
flake-utils.lib.eachDefaultSystem (system: flake-utils.lib.eachDefaultSystem (
system:
let let
pkgs = nixpkgs.legacyPackages.${system}; pkgs = nixpkgs.legacyPackages.${system};
motd = pkgs.stdenv.mkDerivation { motd = pkgs.stdenv.mkDerivation {
@ -22,17 +28,15 @@
builder = builtins.toFile "motd-builder.sh" '' builder = builtins.toFile "motd-builder.sh" ''
source $stdenv/setup source $stdenv/setup
mkdir -p $out mkdir -p $out
${builtins.foldl' ${builtins.foldl' (a: b: "${a}\n${b}") "" (
(a: b: "${a}\n${b}") map (attr: "cp ${motdFiles.${attr}} $out/${attr}.txt") (builtins.attrNames motdFiles)
"" )}
(map
(attr: "cp ${motdFiles.${attr}} $out/${attr}.txt")
(builtins.attrNames motdFiles))}
''; '';
}; };
in in
{ {
defaultPackage = motd; defaultPackage = motd;
formatter = pkgs.nixfmt-rfc-style;
} }
); );
} }