Skip to content

Commit 58e2615

Browse files
author
jghauser
committed
ci(flake): reformat
1 parent 960b3b7 commit 58e2615

File tree

2 files changed

+89
-78
lines changed

2 files changed

+89
-78
lines changed

flake.nix

Lines changed: 67 additions & 59 deletions
Original file line numberDiff line numberDiff line change
@@ -7,76 +7,84 @@
77
flake-parts.url = "github:hercules-ci/flake-parts";
88
};
99

10-
outputs = inputs @ {
11-
self,
12-
nixpkgs,
13-
flake-parts,
14-
...
15-
}: let
16-
name = "papis.nvim";
10+
outputs =
11+
inputs@{
12+
self,
13+
nixpkgs,
14+
flake-parts,
15+
...
16+
}:
17+
let
18+
name = "papis.nvim";
1719

18-
plugin-overlay = import ./nix/plugin-overlay.nix {
19-
inherit name self;
20-
};
21-
in
22-
flake-parts.lib.mkFlake {inherit inputs;} {
20+
plugin-overlay = import ./nix/plugin-overlay.nix {
21+
inherit name self;
22+
};
23+
in
24+
flake-parts.lib.mkFlake { inherit inputs; } {
2325
systems = [
2426
"x86_64-linux"
2527
"x86_64-darwin"
2628
"aarch64-darwin"
2729
];
28-
perSystem = {
29-
config,
30-
self',
31-
inputs',
32-
system,
33-
...
34-
}: let
35-
ci-overlay = import ./nix/ci-overlay.nix {
36-
inherit self name;
37-
};
30+
perSystem =
31+
{
32+
config,
33+
self',
34+
inputs',
35+
system,
36+
...
37+
}:
38+
let
39+
ci-overlay = import ./nix/ci-overlay.nix {
40+
inherit self name;
41+
};
3842

39-
pkgs = import nixpkgs {
40-
inherit system;
41-
overlays = [
42-
plugin-overlay
43-
ci-overlay
44-
];
45-
};
43+
pkgs = import nixpkgs {
44+
inherit system;
45+
overlays = [
46+
plugin-overlay
47+
ci-overlay
48+
];
49+
};
4650

47-
devShell = pkgs.mkShell {
48-
buildInputs = let
49-
nvim-test = pkgs.writeShellApplication {
50-
name = "nvim-test";
51-
text = let
52-
test-lib-dir = "~/.cache/papis_test_library";
51+
devShell = pkgs.mkShell {
52+
buildInputs =
53+
let
54+
nvim-test = pkgs.writeShellApplication {
55+
name = "nvim-test";
56+
text =
57+
let
58+
test-lib-dir = "~/.cache/papis_test_library";
59+
in
60+
# bash
61+
''
62+
${pkgs.coreutils}/bin/rm -rf ${test-lib-dir}
63+
${pkgs.coreutils}/bin/cp -r -r ./tests/files/library ${test-lib-dir}
64+
${pkgs.neovim-with-plugin}/bin/nvim -c "lua _Load_papis()" -c "e test.md"
65+
'';
66+
};
5367
in
54-
# bash
55-
''
56-
${pkgs.coreutils}/bin/rm -rf ${test-lib-dir}
57-
${pkgs.coreutils}/bin/cp -r -r ./tests/files/library ${test-lib-dir}
58-
${pkgs.neovim-with-plugin}/bin/nvim -c "lua _Load_papis()" -c "e test.md"
59-
'';
60-
};
61-
in [
62-
pkgs.sqlitebrowser
63-
pkgs.yq-go
64-
pkgs.luajit
65-
nvim-test
66-
];
67-
};
68-
in {
69-
devShells = {
70-
default = devShell;
71-
inherit devShell;
72-
};
68+
[
69+
pkgs.sqlitebrowser
70+
pkgs.yq-go
71+
pkgs.luajit
72+
nvim-test
73+
];
74+
};
75+
in
76+
{
77+
devShells = {
78+
default = devShell;
79+
inherit devShell;
80+
};
7381

74-
packages = rec {
75-
default = papis-nvim;
76-
inherit (pkgs.luajitPackages) papis-nvim;
77-
inherit (pkgs) neovim-with-plugin;
82+
packages = rec {
83+
default = papis-nvim;
84+
inherit (pkgs.luajitPackages) papis-nvim;
85+
inherit (pkgs) neovim-with-plugin;
86+
};
7887
};
79-
};
8088
flake = {
8189
overlays.default = plugin-overlay;
8290
};

nix/plugin-overlay.nix

Lines changed: 22 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -1,16 +1,19 @@
11
{
22
name,
33
self,
4-
}: final: prev: let
4+
}:
5+
final: prev:
6+
let
57
papis-nvim-luaPackage-override = luaself: luaprev: {
6-
papis-nvim = luaself.callPackage ({
7-
buildLuarocksPackage,
8-
lua,
9-
luaOlder,
10-
nui-nvim,
11-
sqlite,
12-
pathlib-nvim,
13-
}:
8+
papis-nvim = luaself.callPackage (
9+
{
10+
buildLuarocksPackage,
11+
lua,
12+
luaOlder,
13+
nui-nvim,
14+
sqlite,
15+
pathlib-nvim,
16+
}:
1417
buildLuarocksPackage {
1518
pname = name;
1619
version = "scm-1";
@@ -22,7 +25,8 @@
2225
pathlib-nvim
2326
];
2427
src = self;
25-
}) {};
28+
}
29+
) { };
2630
};
2731

2832
lua5_1 = prev.lua5_1.override {
@@ -33,21 +37,20 @@
3337
packageOverrides = papis-nvim-luaPackage-override;
3438
};
3539
luajitPackages = prev.luajitPackages // final.luajit.pkgs;
36-
in {
40+
in
41+
{
3742
inherit
3843
lua5_1
3944
lua51Packages
4045
luajit
4146
luajitPackages
4247
;
4348

44-
vimPlugins =
45-
prev.vimPlugins
46-
// {
47-
papis-nvim = final.neovimUtils.buildNeovimPlugin {
48-
pname = name;
49-
src = self;
50-
version = "dev";
51-
};
49+
vimPlugins = prev.vimPlugins // {
50+
papis-nvim = final.neovimUtils.buildNeovimPlugin {
51+
pname = name;
52+
src = self;
53+
version = "dev";
5254
};
55+
};
5356
}

0 commit comments

Comments
 (0)