Nvim: basic LSP and Telescope setup
This commit is contained in:
parent
a07f454331
commit
a2d69430f6
5 changed files with 321 additions and 139 deletions
|
|
@ -2,131 +2,185 @@
|
|||
let vp = pkgs.vimPlugins; in {
|
||||
programs.neovim = {
|
||||
enable = true;
|
||||
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
vimdiffAlias = true;
|
||||
|
||||
plugins = [
|
||||
# Git related plugins
|
||||
vp.fugitive
|
||||
vp.rhubarb
|
||||
# # Git related plugins
|
||||
# vp.fugitive
|
||||
# vp.rhubarb
|
||||
|
||||
|
||||
# Detect tabstop and shiftwidth automatically
|
||||
vp.sleuth
|
||||
|
||||
|
||||
# LSP
|
||||
{
|
||||
plugin = vp.fidget-nvim;
|
||||
config = ''
|
||||
require("fidget").setup({})
|
||||
'';
|
||||
type = "lua";
|
||||
}
|
||||
vp.neodev-nvim
|
||||
# vp.lsp-zero-nvim
|
||||
# vp.nvim-cmp
|
||||
# vp.cmp-nvim-lsp
|
||||
# vp.nvim-lspconfig
|
||||
|
||||
vp.telescope-fzf-native-nvim
|
||||
{
|
||||
plugin = vp.telescope-nvim;
|
||||
type = "lua";
|
||||
config = ''
|
||||
local telescope = require("telescope")
|
||||
local actions = require("telescope.actions")
|
||||
|
||||
telescope.setup({
|
||||
defaults = {
|
||||
mappings = {
|
||||
i = {
|
||||
["<C-k>"] = actions.move_selection_previous, -- move to prev result
|
||||
["<C-j>"] = actions.move_selection_next, -- move to next result
|
||||
["<C-q>"] = actions.send_selected_to_qflist + actions.open_qflist,
|
||||
}
|
||||
}
|
||||
}
|
||||
})
|
||||
|
||||
telescope.load_extension("fzf");
|
||||
|
||||
local keymap = vim.keymap
|
||||
|
||||
keymap.set("n", "<leader>ff", "<cmd>Telescope find_files<cr>", { desc = "Fuzzy find files in cwd" })
|
||||
keymap.set("n", "<leader>fr", "<cmd>Telescope oldfiles<cr>", { desc = "Fuzzy find recent files" })
|
||||
keymap.set("n", "<leader>fs", "<cmd>Telescope live_grep<cr>", { desc = "Find string in cwd" })
|
||||
keymap.set("n", "<leader>fc", "<cmd>Telescope grep_string<cr>", { desc = "Fuzzy string under cursor in cwd" })
|
||||
'';
|
||||
}
|
||||
|
||||
vp.dressing-nvim # Better UI for input and selection
|
||||
|
||||
# Tree view
|
||||
# vp.chadtree
|
||||
vp.nerdtree-git-plugin
|
||||
vp.vim-devicons
|
||||
vp.nerdtree
|
||||
|
||||
vp.cmp-buffer # source for text in buffer
|
||||
vp.cmp-path # source for file system path
|
||||
vp.luasnip
|
||||
vp.cmp_luasnip
|
||||
vp.friendly-snippets
|
||||
{
|
||||
plugin = vp.nvim-cmp;
|
||||
type = "lua";
|
||||
config = builtins.readFile ./nvim/nvim-cmp-config.lua;
|
||||
}
|
||||
|
||||
# # Detect tabstop and shiftwidth automatically
|
||||
# vp.sleuth
|
||||
|
||||
# {
|
||||
# plugin = vp.nvim-cmp;
|
||||
# type = "lua";
|
||||
# config = ''
|
||||
# require()
|
||||
# '';
|
||||
# }
|
||||
|
||||
# # LSP
|
||||
vp.fidget-nvim # fidget moving while LSP is working
|
||||
# vp.neodev-nvim
|
||||
# # vp.nvim-lspconfig
|
||||
vp.cmp-nvim-lsp
|
||||
{
|
||||
plugin = vp.nvim-lspconfig;
|
||||
type = "lua";
|
||||
config = ''
|
||||
local lspconfig = require('lspconfig')
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
lspconfig.pylsp.setup {capabilities=capabilities}
|
||||
lspconfig.nil_ls.setup {capabilities=capabilities}
|
||||
lspconfig.rust_analyzer.setup {capabilities=capabilities}
|
||||
lspconfig.texlab.setup {capabilities=capabilities}
|
||||
'';
|
||||
config = builtins.readFile ./nvim/nvim-lspconfig.lua;
|
||||
}
|
||||
|
||||
# Autocompletion
|
||||
## Snippet engine & its associated nvim-cmp source
|
||||
vp.luasnip
|
||||
vp.cmp_luasnip
|
||||
## Adds LSP completion capabilities
|
||||
vp.cmp-nvim-lsp
|
||||
vp.cmp-path
|
||||
## Adds a number of user-friendly snippets
|
||||
vp.friendly-snippets
|
||||
## NVIM CMP
|
||||
vp.nvim-cmp
|
||||
# # Autocompletion
|
||||
# ## Snippet engine & its associated nvim-cmp source
|
||||
# vp.luasnip
|
||||
# vp.cmp_luasnip
|
||||
# ## Adds LSP completion capabilities
|
||||
# vp.cmp-nvim-lsp
|
||||
# vp.cmp-path
|
||||
# ## Adds a number of user-friendly snippets
|
||||
# vp.friendly-snippets
|
||||
# ## NVIM CMP
|
||||
# vp.nvim-cmp
|
||||
|
||||
# Useful plugin to show you pending keybinds
|
||||
{ plugin = vp.which-key-nvim; config = ''require("which-key").setup({})''; type = "lua"; }
|
||||
# # Useful plugin to show you pending keybinds
|
||||
# { plugin = vp.which-key-nvim; config = ''require("which-key").setup({})''; type = "lua"; }
|
||||
|
||||
# Adds git related signs to the gutter, as well as utilities for managing changes
|
||||
{
|
||||
plugin = vp.gitsigns-nvim;
|
||||
config = ''
|
||||
require("gitsigns").setup({
|
||||
-- See `:help gitsigns.txt`
|
||||
signs = {
|
||||
add = { text = '+' },
|
||||
change = { text = '~' },
|
||||
delete = { text = '_' },
|
||||
topdelete = { text = '‾' },
|
||||
changedelete = { text = '~' },
|
||||
},
|
||||
on_attach = function(bufnr)
|
||||
local gs = package.loaded.gitsigns
|
||||
# {
|
||||
# plugin = vp.gitsigns-nvim;
|
||||
# config = ''
|
||||
# require("gitsigns").setup({
|
||||
# -- See `:help gitsigns.txt`
|
||||
# signs = {
|
||||
# add = { text = '+' },
|
||||
# change = { text = '~' },
|
||||
# delete = { text = '_' },
|
||||
# topdelete = { text = '‾' },
|
||||
# changedelete = { text = '~' },
|
||||
# },
|
||||
# on_attach = function(bufnr)
|
||||
# local gs = package.loaded.gitsigns
|
||||
|
||||
local function map(mode, l, r, opts)
|
||||
opts = opts or {}
|
||||
opts.buffer = bufnr
|
||||
vim.keymap.set(mode, l, r, opts)
|
||||
end
|
||||
# local function map(mode, l, r, opts)
|
||||
# opts = opts or {}
|
||||
# opts.buffer = bufnr
|
||||
# vim.keymap.set(mode, l, r, opts)
|
||||
# end
|
||||
|
||||
-- Navigation
|
||||
map({ 'n', 'v' }, ']c', function()
|
||||
if vim.wo.diff then
|
||||
return ']c'
|
||||
end
|
||||
vim.schedule(function()
|
||||
gs.next_hunk()
|
||||
end)
|
||||
return '<Ignore>'
|
||||
end, { expr = true, desc = 'Jump to next hunk' })
|
||||
# -- Navigation
|
||||
# map({ 'n', 'v' }, ']c', function()
|
||||
# if vim.wo.diff then
|
||||
# return ']c'
|
||||
# end
|
||||
# vim.schedule(function()
|
||||
# gs.next_hunk()
|
||||
# end)
|
||||
# return '<Ignore>'
|
||||
# end, { expr = true, desc = 'Jump to next hunk' })
|
||||
|
||||
map({ 'n', 'v' }, '[c', function()
|
||||
if vim.wo.diff then
|
||||
return '[c'
|
||||
end
|
||||
vim.schedule(function()
|
||||
gs.prev_hunk()
|
||||
end)
|
||||
return '<Ignore>'
|
||||
end, { expr = true, desc = 'Jump to previous hunk' })
|
||||
# map({ 'n', 'v' }, '[c', function()
|
||||
# if vim.wo.diff then
|
||||
# return '[c'
|
||||
# end
|
||||
# vim.schedule(function()
|
||||
# gs.prev_hunk()
|
||||
# end)
|
||||
# return '<Ignore>'
|
||||
# end, { expr = true, desc = 'Jump to previous hunk' })
|
||||
|
||||
-- Actions
|
||||
-- visual mode
|
||||
map('v', '<leader>hs', function()
|
||||
gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
|
||||
end, { desc = 'stage git hunk' })
|
||||
map('v', '<leader>hr', function()
|
||||
gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
|
||||
end, { desc = 'reset git hunk' })
|
||||
-- normal mode
|
||||
map('n', '<leader>hs', gs.stage_hunk, { desc = 'git stage hunk' })
|
||||
map('n', '<leader>hr', gs.reset_hunk, { desc = 'git reset hunk' })
|
||||
map('n', '<leader>hS', gs.stage_buffer, { desc = 'git Stage buffer' })
|
||||
map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'undo stage hunk' })
|
||||
map('n', '<leader>hR', gs.reset_buffer, { desc = 'git Reset buffer' })
|
||||
map('n', '<leader>hp', gs.preview_hunk, { desc = 'preview git hunk' })
|
||||
map('n', '<leader>hb', function()
|
||||
gs.blame_line { full = false }
|
||||
end, { desc = 'git blame line' })
|
||||
map('n', '<leader>hd', gs.diffthis, { desc = 'git diff against index' })
|
||||
map('n', '<leader>hD', function()
|
||||
gs.diffthis '~'
|
||||
end, { desc = 'git diff against last commit' })
|
||||
# -- Actions
|
||||
# -- visual mode
|
||||
# map('v', '<leader>hs', function()
|
||||
# gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
|
||||
# end, { desc = 'stage git hunk' })
|
||||
# map('v', '<leader>hr', function()
|
||||
# gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
|
||||
# end, { desc = 'reset git hunk' })
|
||||
# -- normal mode
|
||||
# map('n', '<leader>hs', gs.stage_hunk, { desc = 'git stage hunk' })
|
||||
# map('n', '<leader>hr', gs.reset_hunk, { desc = 'git reset hunk' })
|
||||
# map('n', '<leader>hS', gs.stage_buffer, { desc = 'git Stage buffer' })
|
||||
# map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'undo stage hunk' })
|
||||
# map('n', '<leader>hR', gs.reset_buffer, { desc = 'git Reset buffer' })
|
||||
# map('n', '<leader>hp', gs.preview_hunk, { desc = 'preview git hunk' })
|
||||
# map('n', '<leader>hb', function()
|
||||
# gs.blame_line { full = false }
|
||||
# end, { desc = 'git blame line' })
|
||||
# map('n', '<leader>hd', gs.diffthis, { desc = 'git diff against index' })
|
||||
# map('n', '<leader>hD', function()
|
||||
# gs.diffthis '~'
|
||||
# end, { desc = 'git diff against last commit' })
|
||||
|
||||
-- Toggles
|
||||
map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = 'toggle git blame line' })
|
||||
map('n', '<leader>td', gs.toggle_deleted, { desc = 'toggle git show deleted' })
|
||||
# -- Toggles
|
||||
# map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = 'toggle git blame line' })
|
||||
# map('n', '<leader>td', gs.toggle_deleted, { desc = 'toggle git show deleted' })
|
||||
|
||||
-- Text object
|
||||
map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select git hunk' })
|
||||
end,
|
||||
})
|
||||
'';
|
||||
type = "lua";
|
||||
}
|
||||
# -- Text object
|
||||
# map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select git hunk' })
|
||||
# end,
|
||||
# })
|
||||
# '';
|
||||
# type = "lua";
|
||||
# }
|
||||
|
||||
# Cool color scheme
|
||||
{
|
||||
|
|
@ -150,39 +204,42 @@ let vp = pkgs.vimPlugins; in {
|
|||
type = "lua";
|
||||
}
|
||||
|
||||
# Add indentation guides even on blank lines
|
||||
{
|
||||
# See `:help ibl`
|
||||
plugin = vp.indent-blankline-nvim;
|
||||
config = ''
|
||||
require("ibl").setup({})
|
||||
'';
|
||||
type = "lua";
|
||||
}
|
||||
# # Add indentation guides even on blank lines
|
||||
# {
|
||||
# # See `:help ibl`
|
||||
# plugin = vp.indent-blankline-nvim;
|
||||
# config = ''
|
||||
# require("ibl").setup({})
|
||||
# '';
|
||||
# type = "lua";
|
||||
# }
|
||||
|
||||
# "gc" to comment visual regions/lines
|
||||
{
|
||||
plugin = vp.comment-nvim;
|
||||
config = ''
|
||||
require("Comment").setup({})
|
||||
'';
|
||||
type = "lua";
|
||||
}
|
||||
# # "gc" to comment visual regions/lines
|
||||
# {
|
||||
# plugin = vp.comment-nvim;
|
||||
# config = ''
|
||||
# require("Comment").setup({})
|
||||
# '';
|
||||
# type = "lua";
|
||||
# }
|
||||
|
||||
vp.plenary-nvim
|
||||
vp.telescope-fzf-native-nvim
|
||||
vp.telescope-nvim
|
||||
# vp.plenary-nvim
|
||||
# vp.telescope-fzf-native-nvim
|
||||
# vp.telescope-nvim
|
||||
|
||||
vp.nvim-treesitter-textobjects
|
||||
vp.nvim-treesitter
|
||||
# vp.nvim-treesitter-textobjects
|
||||
# vp.nvim-treesitter
|
||||
];
|
||||
# settings = { ignorecase = true; };
|
||||
# coc.enable = true;
|
||||
viAlias = true;
|
||||
vimAlias = true;
|
||||
vimdiffAlias = true;
|
||||
extraConfig = ''
|
||||
set mouse=a
|
||||
set encoding=UTF-8
|
||||
set guifont=FiraCode\ Nerd\ Font\ Mono\ 10
|
||||
let g:airline_powerline_fonts = 1
|
||||
'';
|
||||
extraLuaConfig = ''
|
||||
vim.g.mapleader = " "
|
||||
'';
|
||||
};
|
||||
}
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue