diff --git a/dot_config/nvim/lua/config/lspsaga.lua b/dot_config/nvim/lua/config/lspsaga.lua index 7d43d41..959458b 100644 --- a/dot_config/nvim/lua/config/lspsaga.lua +++ b/dot_config/nvim/lua/config/lspsaga.lua @@ -8,8 +8,16 @@ Nmap("K", "Lspsaga hover_doc") Nmap("go", "Lspsaga show_line_diagnostics") Nmap("gj", "Lspsaga diagnostic_jump_next") Nmap("gk", "Lspsaga diagnostic_jump_prev") -Nmap("", "lua require('lspsaga.action').smart_scroll_with_saga(-1, '')", {}) -Nmap("", "lua require('lspsaga.action').smart_scroll_with_saga(1, '')", {}) +-- Nmap("", "lua require('lspsaga.action').smart_scroll_with_saga(-1, '')", {}) +-- Nmap("", "lua require('lspsaga.action').smart_scroll_with_saga(1, '')", {}) + +-- vim.keymap.set("n", "", function() +-- require("lspsaga.action").smart_scroll_with_saga(1) +-- end) +-- -- scroll up +-- vim.keymap.set("n", "", function() +-- require("lspsaga.action").smart_scroll_with_saga(-1) +-- end) vim.cmd([[ nnoremap lua require('lspsaga.floaterm').open_float_terminal() diff --git a/dot_config/nvim/lua/lsp.lua b/dot_config/nvim/lua/lsp.lua index d466c9b..528a277 100644 --- a/dot_config/nvim/lua/lsp.lua +++ b/dot_config/nvim/lua/lsp.lua @@ -16,7 +16,11 @@ vim.opt.completeopt = "menu,menuone,noselect" -- vim.lsp.set_log_level("debug") -- Setup nvim-cmp. -local cmp = require("cmp") +local present, cmp = pcall(require, "cmp") +if not present then + return +end + cmp.setup({ snippet = { expand = function(args) @@ -113,8 +117,11 @@ local common_config = { capabilities = capabilities, } -local lsp = require("lspconfig") --- joke language +local present, lsp = pcall(require, "lspconfig") +if not present then + return +end + lsp.sumneko_lua.setup({ on_attach = on_attach, capabilities = capabilities, @@ -233,5 +240,3 @@ lsp.yamlls.setup({ --- Documentation lsp.ltex.setup(common_config) --- lsp.marksman.setup(common_config) --- lsp.prosemd_lsp.setup(common_config) diff --git a/dot_config/nvim/lua/plugins.lua b/dot_config/nvim/lua/plugins.lua index b0c4f3f..a865a25 100644 --- a/dot_config/nvim/lua/plugins.lua +++ b/dot_config/nvim/lua/plugins.lua @@ -461,7 +461,7 @@ return packer.startup(function(use) ---@diagnostic disable-next-line: assign-type-mismatch update_interval = 1000, set_dark_mode = function() - vim.cmd("Catppuccin mocha") + vim.cmd("Catppuccin frappe") end, set_light_mode = function() vim.cmd("Catppuccin latte")