Skip to content

Commit e60aece

Browse files
author
Matthieu Coudron
committed
flake: removed neovim
I removed some dead code and also the providing of neovim since it interfered with plugins (nixpkgs telescope required a neovim version >= 0.9).
1 parent c21eed6 commit e60aece

File tree

2 files changed

+28
-46
lines changed

2 files changed

+28
-46
lines changed

.github/workflows/default.yml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,4 +11,4 @@ jobs:
1111
with:
1212
nix_path: nixpkgs=channel:nixos-unstable
1313
- run: |
14-
nix develop . -c make test
14+
nix develop .#ci -c make test

flake.nix

Lines changed: 27 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -13,50 +13,18 @@
1313

1414
mkDevShell = luaVersion:
1515
let
16-
# luaPkgs = pkgs."lua${luaVersion}".pkgs;
1716
luaEnv = pkgs."lua${luaVersion}".withPackages (lp: with lp; [
1817
busted
1918
luacheck
2019
luarocks
2120
]);
22-
neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
23-
plugins = with pkgs.vimPlugins; [
24-
{
25-
plugin = packer-nvim;
26-
type = "lua";
27-
config = ''
28-
require('packer').init({
29-
luarocks = {
30-
python_cmd = 'python' -- Set the python command to use for running hererocks
31-
},
32-
})
33-
-- require my own manual config
34-
require('init-manual')
35-
'';
36-
}
37-
{ plugin = (nvim-treesitter.withPlugins (
38-
plugins: with plugins; [
39-
tree-sitter-lua
40-
tree-sitter-http
41-
tree-sitter-json
42-
]
43-
));
44-
}
45-
{ plugin = plenary-nvim; }
46-
];
47-
customRC = "";
48-
wrapRc = false;
49-
};
50-
myNeovim = pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped neovimConfig;
5121
in
5222
pkgs.mkShell {
5323
name = "rest-nvim";
5424
buildInputs = [
5525
pkgs.sumneko-lua-language-server
5626
luaEnv
5727
pkgs.stylua
58-
myNeovim
59-
# pkgs.neovim # assume user has one already installed
6028
];
6129

6230
shellHook = let
@@ -68,31 +36,45 @@
6836
tree-sitter-json
6937
]
7038
))];
71-
# opt = map (x: x.plugin) pluginsPartitioned.right;
7239
};
73-
# };
7440
packDirArgs.myNeovimPackages = myVimPackage;
7541
in
7642
''
77-
export DEBUG_PLENARY="debug"
78-
cat <<-EOF > minimal.vim
79-
set rtp+=.
80-
set packpath^=${pkgs.vimUtils.packDir packDirArgs}
81-
EOF
43+
export DEBUG_PLENARY="debug"
44+
cat <<-EOF > minimal.vim
45+
set rtp+=.
46+
set packpath^=${pkgs.vimUtils.packDir packDirArgs}
47+
EOF
8248
'';
8349
};
8450

8551
in
8652
{
8753

88-
# packages = {
89-
# default = self.packages.${system}.luarocks-51;
90-
# luarocks-51 = mkPackage "5_1";
91-
# luarocks-52 = mkPackage "5_2";
92-
# };
93-
9454
devShells = {
9555
default = self.devShells.${system}.luajit;
56+
ci = let
57+
neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
58+
plugins = with pkgs.vimPlugins; [
59+
{ plugin = (nvim-treesitter.withPlugins (
60+
plugins: with plugins; [
61+
tree-sitter-lua
62+
tree-sitter-http
63+
tree-sitter-json
64+
]
65+
));
66+
}
67+
{ plugin = plenary-nvim; }
68+
];
69+
customRC = "";
70+
wrapRc = false;
71+
};
72+
myNeovim = pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped neovimConfig;
73+
in
74+
(mkDevShell "jit").overrideAttrs(oa: {
75+
buildInputs = oa.buildInputs ++ [ myNeovim ];
76+
});
77+
9678
luajit = mkDevShell "jit";
9779
lua-51 = mkDevShell "5_1";
9880
lua-52 = mkDevShell "5_2";

0 commit comments

Comments
 (0)