Fix nixvim and delete old files
This commit is contained in:
parent
80241ccb6b
commit
819aff7644
8 changed files with 21 additions and 456 deletions
|
|
@ -38,7 +38,6 @@
|
|||
enable = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
vimdiffAlias = true;
|
||||
|
||||
globals = {
|
||||
mapleader = " ";
|
||||
|
|
@ -46,7 +45,7 @@
|
|||
rust_recommended_style = 0;
|
||||
};
|
||||
|
||||
options = {
|
||||
opts = {
|
||||
list = true;
|
||||
updatetime = 750;
|
||||
|
||||
|
|
@ -92,7 +91,7 @@
|
|||
enable = true;
|
||||
flavour = "mocha";
|
||||
integrations.vimwiki = lib.mkIf wiki.enable true;
|
||||
}
|
||||
};
|
||||
};
|
||||
|
||||
programs.nixvim.plugins = with config.neovim.plugins; {
|
||||
|
|
@ -116,7 +115,7 @@
|
|||
{ name = "nvim_lsp"; }
|
||||
{ name = "path"; }
|
||||
{ name = "buffer"; }
|
||||
] + lib.options luasnip.enable { name = "cmp-luasnip" };
|
||||
] ++ lib.optional luasnip.enable { name = "cmp-luasnip"; };
|
||||
|
||||
mapping = {
|
||||
"<C-Space>" = "cmp.mapping.complete {}";
|
||||
|
|
@ -161,10 +160,10 @@
|
|||
|
||||
telescope = {
|
||||
enable = telescope.enable;
|
||||
keymaps = [
|
||||
{ key = "<leader>ff"; action = "find_files"; }
|
||||
{ key = "<leader>fg"; action = "git_files"; }
|
||||
];
|
||||
keymaps = {
|
||||
"<leader>ff" = "find_files";
|
||||
"<leader>fg" = "git_files";
|
||||
};
|
||||
extensions = {
|
||||
fzf = lib.mkIf telescope.fzf.enable {
|
||||
enable = true;
|
||||
|
|
@ -177,7 +176,7 @@
|
|||
};
|
||||
|
||||
treesitter = {
|
||||
enable = treesiter.enable;
|
||||
enable = treesitter.enable;
|
||||
highlight.enable = true;
|
||||
indent.enable = true;
|
||||
folding.enable = true;
|
||||
|
|
@ -194,14 +193,13 @@
|
|||
}
|
||||
];
|
||||
};
|
||||
|
||||
nvim-lspconfig.enable = true;
|
||||
nix.enable = config.neovim.languages.nix.enable;
|
||||
rustaceanvim.enable = config.neovim.languages.rust.enable;
|
||||
typsecript-tools.enable = config.neovim.languages.typescript.enable;
|
||||
};
|
||||
|
||||
programs.nixvim.plugins.nvim-lspconfig.enable = true;
|
||||
programs.nixvim.plugins = with config.neovim.languages; {
|
||||
nix.enable = nix.enable;
|
||||
rustaceanvim.enable = rust.enable;
|
||||
typsecript-tools.enable = typescript.enable;
|
||||
};
|
||||
programs.nixvim.lsp = {
|
||||
enable = true;
|
||||
servers = with config.neovim.languages; {
|
||||
|
|
@ -217,10 +215,10 @@
|
|||
{ key = "gi"; lspBufAction = "implementation"; }
|
||||
{ key = "gt"; lspBufAction = "type_definition"; }
|
||||
{ key = "K"; lspBufAction = "hover"; }
|
||||
] + lib.options config.neovim.plugins.telescope.enable {
|
||||
key = "gr";
|
||||
action = lib.nixvim.mkRaw
|
||||
"require('telescope.builtin').lsp_references";
|
||||
] ++ lib.optional config.neovim.plugins.telescope.enable {
|
||||
key = "gr";
|
||||
action = config.lib.nixvim.mkRaw
|
||||
"require('telescope.builtin').lsp_references";
|
||||
};
|
||||
};
|
||||
};
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue