Skip to content

Commit 71a7589

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 71a7589

File tree

1 file changed

+6
-30
lines changed

1 file changed

+6
-30
lines changed

flake.nix

Lines changed: 6 additions & 30 deletions
Original file line numberDiff line numberDiff line change
@@ -13,27 +13,13 @@
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
]);
2221
neovimConfig = pkgs.neovimUtils.makeNeovimConfig {
2322
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-
}
3723
{ plugin = (nvim-treesitter.withPlugins (
3824
plugins: with plugins; [
3925
tree-sitter-lua
@@ -45,7 +31,7 @@
4531
{ plugin = plenary-nvim; }
4632
];
4733
customRC = "";
48-
wrapRc = false;
34+
wrapRc = false;
4935
};
5036
myNeovim = pkgs.wrapNeovimUnstable pkgs.neovim-unwrapped neovimConfig;
5137
in
@@ -55,8 +41,6 @@
5541
pkgs.sumneko-lua-language-server
5642
luaEnv
5743
pkgs.stylua
58-
myNeovim
59-
# pkgs.neovim # assume user has one already installed
6044
];
6145

6246
shellHook = let
@@ -68,29 +52,21 @@
6852
tree-sitter-json
6953
]
7054
))];
71-
# opt = map (x: x.plugin) pluginsPartitioned.right;
7255
};
73-
# };
7456
packDirArgs.myNeovimPackages = myVimPackage;
7557
in
7658
''
77-
export DEBUG_PLENARY="debug"
78-
cat <<-EOF > minimal.vim
79-
set rtp+=.
80-
set packpath^=${pkgs.vimUtils.packDir packDirArgs}
81-
EOF
59+
export DEBUG_PLENARY="debug"
60+
cat <<-EOF > minimal.vim
61+
set rtp+=.
62+
set packpath^=${pkgs.vimUtils.packDir packDirArgs}
63+
EOF
8264
'';
8365
};
8466

8567
in
8668
{
8769

88-
# packages = {
89-
# default = self.packages.${system}.luarocks-51;
90-
# luarocks-51 = mkPackage "5_1";
91-
# luarocks-52 = mkPackage "5_2";
92-
# };
93-
9470
devShells = {
9571
default = self.devShells.${system}.luajit;
9672
luajit = mkDevShell "jit";

0 commit comments

Comments
 (0)