diff --git a/flake.lock b/flake.lock index ed44f3c..18b52d9 100644 --- a/flake.lock +++ b/flake.lock @@ -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", diff --git a/flake.nix b/flake.nix index e6be918..6a8b7d5 100644 --- a/flake.nix +++ b/flake.nix @@ -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 = diff --git a/modules/programs/nvim/default.nix b/modules/programs/nvim/default.nix index 697bd7b..e7888e4 100644 --- a/modules/programs/nvim/default.nix +++ b/modules/programs/nvim/default.nix @@ -52,7 +52,6 @@ in gitsigns-nvim lsp_lines-nvim lspkind-nvim - lspsaga-nvim-original lualine-lsp-progress lualine-nvim luasnip diff --git a/modules/programs/nvim/init.lua b/modules/programs/nvim/init.lua index 0a47715..042b6aa 100644 --- a/modules/programs/nvim/init.lua +++ b/modules/programs/nvim/init.lua @@ -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 = { "Lspsaga hover_doc ++quiet", "show info" }, + K = { vim.lsp.buf.hover, "show info" }, [""] = { l = { name = "lsp", - d = { "Lspsaga show_cursor_diagnostics", "open diagnostic window" }, - n = { "Lspsaga diagnostic_jump_next", "next error" }, - p = { "Lspsaga diagnostic_jump_prev", "prev error" }, - c = { "Lspsaga code_action", "code action" }, - r = { "Lspsaga rename", "rename" }, - i = { "Lspsaga hover_doc ++keep", "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 = { "Lspsaga peek_definition", "definition" }, - t = { "Lspsaga peek_type_definition", "type defininition" }, - h = { "Lspsaga lsp_finder", "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 diff --git a/overlays/default.nix b/overlays/default.nix index 8d802d2..960d029 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -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 {