Skip to content
This repository was archived by the owner on Dec 27, 2025. It is now read-only.

Commit ff61dec

Browse files
committed
chore(nix): tweak flake.nix
1 parent 0f5b7bd commit ff61dec

1 file changed

Lines changed: 29 additions & 26 deletions

File tree

flake.nix

Lines changed: 29 additions & 26 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@
55
{ self, nixpkgs, ... }:
66
let
77
pname = "vim-fennel-syntax";
8+
89
version = "${version_base}+sha.${version_sha}";
910
version_base = "1.2.0";
1011
version_sha = self.shortRev or self.dirtyShortRev or "unknown";
@@ -23,12 +24,15 @@
2324
f (
2425
import nixpkgs {
2526
inherit system;
26-
overlays = [ overlay ];
27+
overlays = [
28+
devOverlay
29+
overlay
30+
];
2731
}
2832
)
2933
);
3034

31-
overlay = final: prev: {
35+
devOverlay = final: prev: {
3236
luajit = prev.luajit.override {
3337
packageOverrides = self: super: {
3438
gumbo = self.buildLuarocksPackage rec {
@@ -43,7 +47,29 @@
4347
};
4448
};
4549
};
50+
formatter = final.writeShellApplication {
51+
name = "${pname}-formatter";
52+
runtimeInputs = with final; [
53+
vim-vint
54+
nixfmt-rfc-style
55+
];
56+
text = ''
57+
mapfile -t files < <(git ls-files --exclude-standard)
58+
for file in "''${files[@]}"; do
59+
case "''${file##*.}" in
60+
vim)
61+
vint "$file" &
62+
;;
63+
nix)
64+
nixfmt -w80 "$file" &
65+
;;
66+
esac
67+
done
68+
'';
69+
};
70+
};
4671

72+
overlay = final: prev: {
4773
m15aVimPlugins =
4874
let
4975
inherit (final) lib;
@@ -63,33 +89,10 @@
6389
};
6490
}
6591
);
66-
67-
formatter = final.writeShellApplication {
68-
name = "${pname}-formatter";
69-
runtimeInputs = with final; [
70-
nixfmt-rfc-style
71-
vim-vint
72-
];
73-
text = ''
74-
mapfile -t files < <(git ls-files --exclude-standard)
75-
for file in "''${files[@]}"; do
76-
case "''${file##*.}" in
77-
nix)
78-
nixfmt -w80 "$file"
79-
;;
80-
vim)
81-
vint "$file"
82-
;;
83-
esac
84-
done
85-
'';
86-
};
8792
};
8893
in
8994
{
90-
overlays.default = final: prev: {
91-
inherit (overlay final prev) m15aVimPlugins;
92-
};
95+
overlays.default = overlay;
9396

9497
packages = forDefaultSystems (pkgs: {
9598
default = pkgs.m15aVimPlugins.${pname};

0 commit comments

Comments
 (0)