Skip to content

Commit 5951ec1

Browse files
committed
fix flake formatteR
1 parent 9466e16 commit 5951ec1

File tree

2 files changed

+21
-15
lines changed

2 files changed

+21
-15
lines changed

flake.nix

Lines changed: 20 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -6,28 +6,33 @@
66
flake-utils.url = "github:numtide/flake-utils";
77
};
88

9-
outputs = { flake-utils, nixpkgs, ... }:
10-
(flake-utils.lib.eachDefaultSystem (system:
9+
outputs =
10+
{ flake-utils, nixpkgs, ... }:
11+
(flake-utils.lib.eachDefaultSystem (
12+
system:
1113
let
1214
pkgs = import nixpkgs {
1315
inherit system;
1416
overlays = [
1517
(_: pkgs: {
16-
update-static-assets =
17-
pkgs.writeShellScriptBin "update-static-assets" ''
18-
set +x
19-
GIT_ROOT=$(git rev-parse --show-toplevel)
20-
if [ ! -e ./static-assets ]; then
21-
echo "Incorrect directory; must have static-assets folder."
22-
exit 1
23-
fi
24-
${pkgs.awscli2}/bin/aws s3 sync --exclude '.*' \
25-
--profile ian --acl public-read \
26-
$GIT_ROOT/static-assets s3://static.ian.pw/images/
27-
'';
18+
update-static-assets = pkgs.writeShellScriptBin "update-static-assets" ''
19+
set +x
20+
GIT_ROOT=$(git rev-parse --show-toplevel)
21+
if [ ! -e ./static-assets ]; then
22+
echo "Incorrect directory; must have static-assets folder."
23+
exit 1
24+
fi
25+
${pkgs.awscli2}/bin/aws s3 sync --exclude '.*' \
26+
--profile ian --acl public-read \
27+
$GIT_ROOT/static-assets s3://static.ian.pw/images/
28+
'';
2829
})
2930
];
3031
};
3132
in
32-
{ devShell = import ./shell.nix { inherit pkgs; }; }));
33+
{
34+
formatter = pkgs.nixfmt-rfc-style;
35+
devShell = import ./shell.nix { inherit pkgs; };
36+
}
37+
));
3338
}

shell.nix

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -9,6 +9,7 @@ in
99
mkShell {
1010
buildInputs = [
1111
(yarn.override { inherit nodejs; })
12+
nixfmt-rfc-style
1213
nodejs
1314
awscli2
1415
update-static-assets

0 commit comments

Comments
 (0)