servius/dotfiles
1
0
Fork 0
Code Issues Pull Requests Actions 1 Packages Projects Releases Wiki Activity

[feat] Fix neovim (nvim-cmp and telescope <c-n> / <c-p> conflict

Browse Source
This commit is contained in:
uttarayan21
2024-03-01 02:48:43 +05:30
parent fb0cb40553
commit c88a0824b1
2 changed files with 36 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files

62
config/nix/common/nvim/default.nix
View File

@@ -43,7 +43,9 @@
},
'';
};
lua-language-server = { enable = true; };
lua-language-server.enable = true;
jsonls.enable = true;
html.enable = true;
};
extraLua.pre = ''
local lsp_zero = require'lsp-zero'
@@ -60,6 +62,7 @@
# '';
};
nvim-dap.enable = true;
todo-comments.enable = true;
lualine.enable = true;
commentary.enable = true;
@@ -97,34 +100,39 @@
};
};
extraPlugins = let
comfortable-motion = pkgs.fetchFromGitHub {
owner = "yuttie";
repo = "comfortable-motion.vim";
rev = "master";
sha256 = "sha256-S1LJXmShhpCJIg/FEPx3jFbmPpS/1U4MAQN2RY/nkI0";
};
in [
comfortable-motion
pkgs.vimPlugins.vim-abolish
pkgs.vimPlugins.telescope-nvim
pkgs.vimPlugins.telescope-ui-select-nvim
pkgs.vimPlugins.telescope-fzf-native-nvim
pkgs.vimPlugins.telescope-file-browser-nvim
pkgs.vimExtraPlugins.rustaceanvim
extraPlugins =
let
comfortable-motion = pkgs.fetchFromGitHub {
owner = "yuttie";
repo = "comfortable-motion.vim";
rev = "master";
sha256 = "sha256-S1LJXmShhpCJIg/FEPx3jFbmPpS/1U4MAQN2RY/nkI0";
};
in
[
comfortable-motion
pkgs.vimPlugins.vim-abolish
pkgs.vimPlugins.telescope-nvim
pkgs.vimPlugins.telescope-ui-select-nvim
pkgs.vimPlugins.telescope-fzf-native-nvim
pkgs.vimPlugins.telescope-file-browser-nvim
pkgs.vimPlugins.telescope-dap-nvim
pkgs.vimExtraPlugins.rustaceanvim
pkgs.vimPlugins.nvim-cmp
pkgs.vimPlugins.cmp-buffer
pkgs.vimPlugins.cmp-path
pkgs.vimPlugins.cmp-cmdline
pkgs.vimPlugins.cmp-nvim-lsp
pkgs.vimPlugins.cmp-nvim-lua
# lsp stuff
pkgs.vimPlugins.nvim-cmp
pkgs.vimPlugins.cmp-buffer
pkgs.vimPlugins.cmp-path
pkgs.vimPlugins.cmp-cmdline
pkgs.vimPlugins.cmp-nvim-lsp
pkgs.vimPlugins.cmp-nvim-lua
pkgs.vimExtraPlugins.fidget-nvim
pkgs.vimExtraPlugins.copilot-lua
pkgs.vimExtraPlugins.lsp-zero-nvim
pkgs.vimExtraPlugins.fidget-nvim
pkgs.vimExtraPlugins.copilot-lua
pkgs.vimExtraPlugins.lsp-zero-nvim
pkgs.vimExtraPlugins.rest-nvim
];
pkgs.vimExtraPlugins.rest-nvim
];
extraConfigLua = builtins.readFile ./extraConfig.lua;
package = pkgs.neovim-nightly;
};

1
config/nix/common/nvim/extraConfig.lua
View File

@@ -13,6 +13,7 @@ require('telescope').setup {
}
require("telescope").load_extension("ui-select")
require("telescope").load_extension("dap")
require('telescope').load_extension("fzf")
require('telescope').load_extension("file_browser")