fix: nvim build
This commit is contained in:
parent
75c8e9b64b
commit
7d9c921f21
|
@ -1,8 +0,0 @@
|
||||||
{ pkgs }:
|
|
||||||
|
|
||||||
# Remove the conditional entirely for now to test
|
|
||||||
pkgs.vimUtils.buildVimPlugin {
|
|
||||||
pname = "amp-nvim";
|
|
||||||
version = "unstable";
|
|
||||||
src = /Users/anishlakhwara/usr/amp.nvim;
|
|
||||||
}
|
|
|
@ -1,5 +0,0 @@
|
||||||
-- amp.nvim configuration
|
|
||||||
require('amp').setup({
|
|
||||||
auto_start = true,
|
|
||||||
log_level = "info"
|
|
||||||
})
|
|
|
@ -17,9 +17,10 @@ let
|
||||||
owner = "sourcegraph";
|
owner = "sourcegraph";
|
||||||
repo = "amp.nvim";
|
repo = "amp.nvim";
|
||||||
rev = "main";
|
rev = "main";
|
||||||
sha256 = "1n6d8nbakyg6yiq8mhhrvmsp9z0zb8cb67820jsg3wl6vqd1vwv5";
|
sha256 = "Sm/SQEIZlnqu/sD+MhZzgGm3bf+HnADOOimZ2Q++MXU=";
|
||||||
};
|
};
|
||||||
}
|
};
|
||||||
|
|
||||||
my-lspsaga = pkgs.vimUtils.buildVimPlugin {
|
my-lspsaga = pkgs.vimUtils.buildVimPlugin {
|
||||||
name = "lspsaga.nvim";
|
name = "lspsaga.nvim";
|
||||||
src = pkgs.fetchFromGitHub {
|
src = pkgs.fetchFromGitHub {
|
||||||
|
@ -326,10 +327,10 @@ in
|
||||||
let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.8 } }
|
let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.8 } }
|
||||||
|
|
||||||
" lsp commands
|
" lsp commands
|
||||||
nnoremap <leader>vgd :lua vim.lsp.buf.definition()<CR>
|
nnoremap gd :lua vim.lsp.buf.definition()<CR>
|
||||||
nnoremap <leader>vi :lua require('telescope.builtin').lsp_implementation()<CR>
|
nnoremap gI :lua require('telescope.builtin').lsp_implementation()<CR>
|
||||||
nnoremap <leader>vsh :lua vim.lsp.buf.signature_help()<CR>
|
nnoremap gK :lua vim.lsp.buf.signature_help()<CR>
|
||||||
nnoremap <leader>vrr :lua require('telescope.builtin').lsp_references()<CR>
|
nnoremap gr :lua require('telescope.builtin').lsp_references()<CR>
|
||||||
" nnoremap <leader>vrn :lua vim.lsp.buf.rename()<CR>
|
" nnoremap <leader>vrn :lua vim.lsp.buf.rename()<CR>
|
||||||
" nnoremap <leader>vh :lua vim.lsp.buf.hover()<CR>
|
" nnoremap <leader>vh :lua vim.lsp.buf.hover()<CR>
|
||||||
" nnoremap <leader>vca :lua vim.lsp.buf.code_action()<CR>
|
" nnoremap <leader>vca :lua vim.lsp.buf.code_action()<CR>
|
||||||
|
@ -338,9 +339,9 @@ in
|
||||||
" nnoremap <leader>va :lua require('telescope.builtin').lsp_code_actions(require('telescope.themes').get_cursor())<cr>
|
" nnoremap <leader>va :lua require('telescope.builtin').lsp_code_actions(require('telescope.themes').get_cursor())<cr>
|
||||||
" lspsaga stuff doesn't work
|
" lspsaga stuff doesn't work
|
||||||
nnoremap <leader>vd :Lspsaga peek_definition<CR>
|
nnoremap <leader>vd :Lspsaga peek_definition<CR>
|
||||||
nnoremap <leader>vrn :Lspsaga rename<CR><CR>
|
nnoremap <leader>cr :Lspsaga rename<CR><CR>
|
||||||
nnoremap <leader>vh :Lspsaga hover_doc<CR>
|
nnoremap K :Lspsaga hover_doc<CR>
|
||||||
nnoremap <leader>vca :Lspsaga code_action<CR>
|
nnoremap <leader>ca :Lspsaga code_action<CR>
|
||||||
nnoremap <leader>vsd :Lspsaga show_line_diagnostics<CR>
|
nnoremap <leader>vsd :Lspsaga show_line_diagnostics<CR>
|
||||||
nnoremap <leader>vs :Dasht<Space>
|
nnoremap <leader>vs :Dasht<Space>
|
||||||
nnoremap <leader>vn :Lspsaga diagnostic_jump_prev<CR>
|
nnoremap <leader>vn :Lspsaga diagnostic_jump_prev<CR>
|
||||||
|
@ -928,7 +929,7 @@ in
|
||||||
map("n", "<leader>zl", "<Cmd>ZkLinks<CR>", opts)
|
map("n", "<leader>zl", "<Cmd>ZkLinks<CR>", opts)
|
||||||
|
|
||||||
-- Preview a linked note.
|
-- Preview a linked note.
|
||||||
map("n", "K", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts)
|
map("n", "<leader>ck", "<Cmd>lua vim.lsp.buf.hover()<CR>", opts)
|
||||||
-- Open the code actions for a visual selection.
|
-- Open the code actions for a visual selection.
|
||||||
map("v", "<leader>za", ":'<,'>lua vim.lsp.buf.range_code_action()<CR>", opts)
|
map("v", "<leader>za", ":'<,'>lua vim.lsp.buf.range_code_action()<CR>", opts)
|
||||||
|
|
||||||
|
@ -1257,7 +1258,7 @@ in
|
||||||
] ++ lib.optionals pkgs.stdenv.isLinux [
|
] ++ lib.optionals pkgs.stdenv.isLinux [
|
||||||
# Linux-only plugins
|
# Linux-only plugins
|
||||||
vim-tidal # requires SuperCollider which is Linux-only
|
vim-tidal # requires SuperCollider which is Linux-only
|
||||||
]
|
];
|
||||||
withPython3 = true;
|
withPython3 = true;
|
||||||
extraPython3Packages = pkgs: with pkgs; [ tasklib six packaging ];
|
extraPython3Packages = pkgs: with pkgs; [ tasklib six packaging ];
|
||||||
vimAlias = true;
|
vimAlias = true;
|
||||||
|
|
Loading…
Reference in a new issue