Compare commits

..

No commits in common. "17085b4a1b557ae12bdc9c1fb63cc0ff46c4d1ec" and "55ccb1d06c3c95d64e418b309038a1203b032c33" have entirely different histories.

5 changed files with 16 additions and 49 deletions

View File

@ -512,22 +512,6 @@
"type": "github"
}
},
"lspsaga-nvim": {
"flake": false,
"locked": {
"lastModified": 1677497543,
"narHash": "sha256-xFba/hXqc0qyJH9Hd9XtXteXIqjJnIgYIy8Y5l9QPQQ=",
"owner": "glepnir",
"repo": "lspsaga.nvim",
"rev": "291629b704ba8fdd0134ef4204fb118050bca363",
"type": "github"
},
"original": {
"owner": "glepnir",
"repo": "lspsaga.nvim",
"type": "github"
}
},
"master": {
"locked": {
"lastModified": 1677259386,
@ -854,7 +838,6 @@
"hypr-contrib": "hypr-contrib",
"hyprland": "hyprland",
"hyprpaper": "hyprpaper",
"lspsaga-nvim": "lspsaga-nvim",
"master": "master",
"neovim": "neovim",
"nil": "nil",

View File

@ -77,22 +77,17 @@
flake = false;
};
copilot-lua = {
url = "github:zbirenbaum/copilot.lua";
flake = false;
};
lspsaga-nvim = {
url = "github:glepnir/lspsaga.nvim";
flake = false;
};
attic = {
url = "github:zhaofengli/attic";
inputs.nixpkgs.follows = "nixpkgs";
inputs.nixpkgs-stable.follows = "stable";
inputs.flake-utils.follows = "flake-utils";
};
copilot-lua = {
url = "github:zbirenbaum/copilot.lua";
flake = false;
};
};
outputs =

View File

@ -52,7 +52,6 @@ in
gitsigns-nvim
lsp_lines-nvim
lspkind-nvim
lspsaga-nvim-original
lualine-lsp-progress
lualine-nvim
luasnip

View File

@ -259,25 +259,18 @@ vim.diagnostic.config({
-- The nvim-cmp almost supports LSP's capabilities so You should advertise it to LSP servers..
local capabilities = require("cmp_nvim_lsp").default_capabilities()
require("lspsaga").setup({
symbol_in_winbar = {
enable = false,
},
})
local lspconfig = require("lspconfig")
local on_attach_def = function(_, bufnr)
wk.register({
K = { "<cmd>Lspsaga hover_doc ++quiet<cr>", "show info" },
K = { vim.lsp.buf.hover, "show info" },
["<leader>"] = {
l = {
name = "lsp",
d = { "<cmd>Lspsaga show_cursor_diagnostics<cr>", "open diagnostic window" },
n = { "<cmd>Lspsaga diagnostic_jump_next<CR>", "next error" },
p = { "<cmd>Lspsaga diagnostic_jump_prev<CR>", "prev error" },
c = { "<cmd>Lspsaga code_action<cr>", "code action" },
r = { "<cmd>Lspsaga rename<cr>", "rename" },
i = { "<cmd>Lspsaga hover_doc ++keep<cr>", "show info (sticky)" },
d = { vim.diagnostic.open_float, "open diagnostic window" },
n = { vim.diagnostic.goto_next, "next error" },
p = { vim.diagnostic.goto_prev, "prev error" },
c = { vim.lsp.buf.code_action, "code action" },
r = { vim.lsp.buf.rename, "rename" },
f = {
function()
vim.lsp.buf.format({ async = true })
@ -304,9 +297,11 @@ local on_attach_def = function(_, bufnr)
},
g = {
name = "goto",
d = { "<cmd>Lspsaga peek_definition<cr>", "definition" },
t = { "<cmd>Lspsaga peek_type_definition<cr>", "type defininition" },
h = { "<cmd>Lspsaga lsp_finder<CR>", "lsp finder" },
r = { vim.lsp.buf.references, "references" },
d = { vim.lsp.buf.definition, "definition" },
D = { vim.lsp.buf.declaration, "declaration" },
i = { vim.lsp.buf.implementation, "implementation" },
t = { vim.lsp.buf.type_definition, "type defininition" },
},
}, { buffer = bufnr, silent = true })
end

View File

@ -49,11 +49,6 @@ in
version = mkVersionInput inputs.copilot-lua;
src = inputs.copilot-lua;
});
lspsaga-nvim-original = prev.vimPlugins.lspsaga-nvim-original.overrideAttrs (old: {
version = mkVersionInput inputs.lspsaga-nvim;
src = inputs.lspsaga-nvim;
});
};
master = import inputs.master {