diff --git a/home/profiles/nvim/amp-plugin.nix b/home/profiles/nvim/amp-plugin.nix deleted file mode 100644 index 91c177aa..00000000 --- a/home/profiles/nvim/amp-plugin.nix +++ /dev/null @@ -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; -} diff --git a/home/profiles/nvim/amp.lua b/home/profiles/nvim/amp.lua deleted file mode 100644 index 4098774a..00000000 --- a/home/profiles/nvim/amp.lua +++ /dev/null @@ -1,5 +0,0 @@ --- amp.nvim configuration -require('amp').setup({ - auto_start = true, - log_level = "info" -}) diff --git a/home/profiles/nvim/default.nix b/home/profiles/nvim/default.nix index 943376b7..a8867bb0 100644 --- a/home/profiles/nvim/default.nix +++ b/home/profiles/nvim/default.nix @@ -17,9 +17,10 @@ let owner = "sourcegraph"; repo = "amp.nvim"; rev = "main"; - sha256 = "1n6d8nbakyg6yiq8mhhrvmsp9z0zb8cb67820jsg3wl6vqd1vwv5"; + sha256 = "Sm/SQEIZlnqu/sD+MhZzgGm3bf+HnADOOimZ2Q++MXU="; }; - } + }; + my-lspsaga = pkgs.vimUtils.buildVimPlugin { name = "lspsaga.nvim"; src = pkgs.fetchFromGitHub { @@ -326,10 +327,10 @@ in let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.8 } } " lsp commands - nnoremap vgd :lua vim.lsp.buf.definition() - nnoremap vi :lua require('telescope.builtin').lsp_implementation() - nnoremap vsh :lua vim.lsp.buf.signature_help() - nnoremap vrr :lua require('telescope.builtin').lsp_references() + nnoremap gd :lua vim.lsp.buf.definition() + nnoremap gI :lua require('telescope.builtin').lsp_implementation() + nnoremap gK :lua vim.lsp.buf.signature_help() + nnoremap gr :lua require('telescope.builtin').lsp_references() " nnoremap vrn :lua vim.lsp.buf.rename() " nnoremap vh :lua vim.lsp.buf.hover() " nnoremap vca :lua vim.lsp.buf.code_action() @@ -338,9 +339,9 @@ in " nnoremap va :lua require('telescope.builtin').lsp_code_actions(require('telescope.themes').get_cursor()) " lspsaga stuff doesn't work nnoremap vd :Lspsaga peek_definition - nnoremap vrn :Lspsaga rename - nnoremap vh :Lspsaga hover_doc - nnoremap vca :Lspsaga code_action + nnoremap cr :Lspsaga rename + nnoremap K :Lspsaga hover_doc + nnoremap ca :Lspsaga code_action nnoremap vsd :Lspsaga show_line_diagnostics nnoremap vs :Dasht nnoremap vn :Lspsaga diagnostic_jump_prev @@ -928,7 +929,7 @@ in map("n", "zl", "ZkLinks", opts) -- Preview a linked note. - map("n", "K", "lua vim.lsp.buf.hover()", opts) + map("n", "ck", "lua vim.lsp.buf.hover()", opts) -- Open the code actions for a visual selection. map("v", "za", ":'<,'>lua vim.lsp.buf.range_code_action()", opts) @@ -1257,7 +1258,7 @@ in ] ++ lib.optionals pkgs.stdenv.isLinux [ # Linux-only plugins vim-tidal # requires SuperCollider which is Linux-only - ] + ]; withPython3 = true; extraPython3Packages = pkgs: with pkgs; [ tasklib six packaging ]; vimAlias = true;