aboutsummaryrefslogtreecommitdiff
path: root/nvim/lua
diff options
context:
space:
mode:
authoreric.marin <maarin.eric@gmail.com>2025-09-07 21:17:26 +0200
committereric.marin <maarin.eric@gmail.com>2025-09-08 12:03:27 +0200
commitab6d61c5fc5f8adebd46691f94cf35c32ae631db (patch)
tree20c5bfde9157d0e840ab53fc5059c592656f9eac /nvim/lua
parente958146735f214509d3996a21a1adfb950e415b8 (diff)
downloaddotfiles-ab6d61c5fc5f8adebd46691f94cf35c32ae631db.tar.gz
dotfiles-ab6d61c5fc5f8adebd46691f94cf35c32ae631db.zip
changed a bunch of things
updated the Wallpaper Menu and adjusted other things
Diffstat (limited to '')
-rw-r--r--nvim/lua/plugins/lspsaga.lua63
-rw-r--r--nvim/lua/plugins/nvim-lspconfig.lua222
2 files changed, 141 insertions, 144 deletions
diff --git a/nvim/lua/plugins/lspsaga.lua b/nvim/lua/plugins/lspsaga.lua
index b87260a..48ac080 100644
--- a/nvim/lua/plugins/lspsaga.lua
+++ b/nvim/lua/plugins/lspsaga.lua
@@ -1,38 +1,35 @@
local config = function()
- vim.diagnostic.config({
- severity_sort = true,
- })
- require("lspsaga").setup({
- ui = {
- code_action = "",
- },
- outline = {
- keys = {
- toggle_or_jump = "<Enter>"
- }
- },
- finder = {
- keys = {
- toggle_or_open = "<Enter>",
- shuttle = "<Tab>",
- }
- },
- diagnostic = {
- diagnostic_only_current = true,
- }
- })
- vim.diagnostic.config({
- virtual_text = false
- })
+ vim.diagnostic.config({
+ severity_sort = true,
+ })
+ require("lspsaga").setup({
+ ui = {
+ code_action = "",
+ },
+ outline = {
+ keys = {
+ toggle_or_jump = "<Enter>"
+ }
+ },
+ finder = {
+ keys = {
+ toggle_or_open = "<Enter>",
+ shuttle = "<Tab>",
+ }
+ },
+ })
+ vim.diagnostic.config({
+ virtual_text = true
+ })
end
return {
- "nvimdev/lspsaga.nvim",
- lazy = true,
- event = { "BufReadPost", "BufWritePost", "BufNewFile" },
- config = config,
- dependencies = {
- "nvim-treesitter/nvim-treesitter", -- optional
- "nvim-tree/nvim-web-devicons", -- optional
- },
+ "nvimdev/lspsaga.nvim",
+ lazy = true,
+ event = { "BufReadPost", "BufWritePost", "BufNewFile" },
+ config = config,
+ dependencies = {
+ "nvim-treesitter/nvim-treesitter", -- optional
+ "nvim-tree/nvim-web-devicons", -- optional
+ },
}
diff --git a/nvim/lua/plugins/nvim-lspconfig.lua b/nvim/lua/plugins/nvim-lspconfig.lua
index 639734e..713a87b 100644
--- a/nvim/lua/plugins/nvim-lspconfig.lua
+++ b/nvim/lua/plugins/nvim-lspconfig.lua
@@ -1,122 +1,122 @@
local config = function()
- local lsp = vim.lsp
- local capabilities = require("cmp_nvim_lsp").default_capabilities()
+ local lsp = vim.lsp
+ local capabilities = require("cmp_nvim_lsp").default_capabilities()
- -- setting custom signs
- local signs = { Error = "", Warn = "", Hint = "", Info = "" }
- for type, icon in pairs(signs) do
- local hl = "DiagnosticSign" .. type
- vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
- end
+ -- setting custom signs
+ local signs = { Error = "", Warn = "", Hint = "", Info = "" }
+ for type, icon in pairs(signs) do
+ local hl = "DiagnosticSign" .. type
+ vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
+ end
- vim.api.nvim_create_autocmd('LspAttach', {
- callback = function(ev)
- local client = lsp.get_client_by_id(ev.data.client_id)
- local keymap = vim.keymap
- local opts = { noremap = true, silent = true, buffer = ev.buf, desc = "" }
+ vim.api.nvim_create_autocmd('LspAttach', {
+ callback = function(ev)
+ local client = lsp.get_client_by_id(ev.data.client_id)
+ local keymap = vim.keymap
+ local opts = { noremap = true, silent = true, buffer = ev.buf, desc = "" }
- -- setting custom keymaps
- opts.desc = "Finder"
- keymap.set("n", "<Space>lf", ":Lspsaga finder<Enter>", opts) -- go to definition
- opts.desc = "Peek Definition (Lspsaga)"
- keymap.set("n", "<Space>lp", ":Lspsaga peek_definition<Enter>", opts) -- peak definition
- opts.desc = "Goto Definition (Lspsaga)"
- keymap.set("n", "<Space>lg", ":Lspsaga goto_definition<Enter>", opts) -- go to definition
- opts.desc = "Code Action (Lspsaga)"
- keymap.set("n", "<Space>la", ":Lspsaga code_action<Enter>", opts) -- see available code actions
- opts.desc = "Rename (Lspsaga)"
- keymap.set("n", "<Space>lr", ":Lspsaga rename<Enter>", opts) -- smart rename
- opts.desc = "Hover Documentation (Lspsaga)"
- keymap.set("n", "<Space>lk", lsp.buf.hover, opts) -- show documentation for what is under cursor
- opts.desc = "Outline (Lspsaga)"
- keymap.set("n", "<Space>lo", ":Lspsaga outline<Enter>", opts) -- show outline
- opts.desc = "Diagnostic (Lspsaga)"
- keymap.set("n", "<Space>ld", ":Lspsaga show_workspace_diagnostics<Enter>", opts) -- show diagnostics
+ -- setting custom keymaps
+ opts.desc = "Finder"
+ keymap.set("n", "<Space>lf", ":Lspsaga finder<Enter>", opts) -- go to definition
+ opts.desc = "Peek Definition (Lspsaga)"
+ keymap.set("n", "<Space>lp", ":Lspsaga peek_definition<Enter>", opts) -- peak definition
+ opts.desc = "Goto Definition (Lspsaga)"
+ keymap.set("n", "<Space>lg", ":Lspsaga goto_definition<Enter>", opts) -- go to definition
+ opts.desc = "Code Action (Lspsaga)"
+ keymap.set("n", "<Space>la", ":Lspsaga code_action<Enter>", opts) -- see available code actions
+ opts.desc = "Rename (Lspsaga)"
+ keymap.set("n", "<Space>lr", ":Lspsaga rename<Enter>", opts) -- smart rename
+ opts.desc = "Hover Documentation (Lspsaga)"
+ keymap.set("n", "<Space>lk", lsp.buf.hover, opts) -- show documentation for what is under cursor
+ opts.desc = "Outline (Lspsaga)"
+ keymap.set("n", "<Space>lo", ":Lspsaga outline<Enter>", opts) -- show outline
+ opts.desc = "Diagnostic (Lspsaga)"
+ keymap.set("n", "<Space>ld", ":Lspsaga show_workspace_diagnostics<Enter>", opts) -- show diagnostics
- -- enable auto formatting on save
- if client ~= nil and client:supports_method("textDocument/formatting") then
- vim.api.nvim_create_autocmd("BufWritePre", {
- buffer = ev.buf,
- callback = function()
- lsp.buf.format({ async = true })
- end,
- })
- end
- end
- })
+ -- enable auto formatting on save
+ if client ~= nil and client:supports_method("textDocument/formatting") then
+ vim.api.nvim_create_autocmd("BufWritePre", {
+ buffer = ev.buf,
+ callback = function()
+ lsp.buf.format({ async = true })
+ end,
+ })
+ end
+ end
+ })
- vim.api.nvim_create_autocmd('LspDetach', {
- callback = function(ev)
- local client = lsp.get_client_by_id(ev.data.client_id)
- local keymap = vim.keymap
- keymap.del("n", "<Space>lf")
- keymap.del("n", "<Space>lp")
- keymap.del("n", "<Space>lg")
- keymap.del("n", "<Space>la")
- keymap.del("n", "<Space>lr")
- keymap.del("n", "<Space>lk")
- keymap.del("n", "<Space>lo")
- keymap.del("n", "<Space>ld")
- if client ~= nil and client:supports_method('textDocument/formatting') then
- vim.api.nvim_clear_autocmds({
- event = 'BufWritePre',
- buffer = ev.buf,
- })
- end
- end,
- })
+ vim.api.nvim_create_autocmd('LspDetach', {
+ callback = function(ev)
+ local client = lsp.get_client_by_id(ev.data.client_id)
+ local keymap = vim.keymap
+ keymap.del("n", "<Space>lf")
+ keymap.del("n", "<Space>lp")
+ keymap.del("n", "<Space>lg")
+ keymap.del("n", "<Space>la")
+ keymap.del("n", "<Space>lr")
+ keymap.del("n", "<Space>lk")
+ keymap.del("n", "<Space>lo")
+ keymap.del("n", "<Space>ld")
+ if client ~= nil and client:supports_method('textDocument/formatting') then
+ vim.api.nvim_clear_autocmds({
+ event = 'BufWritePre',
+ buffer = ev.buf,
+ })
+ end
+ end,
+ })
- -- C/C++
- lsp.enable("clangd")
- lsp.config("clangd", {
- capabilities = capabilities,
- })
- -- Rust
- lsp.enable("rust_analyzer")
- lsp.config("rust_analyzer", {
- capabilities = capabilities,
- })
- -- Haskell
- lsp.enable("hls")
- lsp.config("hls", {
- capabilities = capabilities,
- settings = {
- ['haskell'] = {
- cabalFormattingProvider = "cabal-fmt",
- formattingProvider = "ormolu"
- },
- },
- })
- -- Lua
- lsp.enable("lua_ls")
- lsp.config("lua_ls", {
- capabilities = capabilities,
- })
- -- JavaScript/Typescript
- lsp.enable("ts_ls")
- lsp.config("ts_ls", {
- capabilities = capabilities,
- })
- -- CSS
- lsp.enable("cssls")
- lsp.config("cssls", {
- capabilities = capabilities,
- })
- -- Meson
- lsp.enable("mesonlsp")
- lsp.config("mesonlsp", {
- capabilities = capabilities,
- })
- -- Zig
- lsp.enable("zls")
- lsp.config("zls", {
- capabilities = capabilities,
- })
+ -- C/C++
+ lsp.enable("clangd")
+ lsp.config("clangd", {
+ capabilities = capabilities,
+ })
+ -- Rust
+ lsp.enable("rust_analyzer")
+ lsp.config("rust_analyzer", {
+ capabilities = capabilities,
+ })
+ -- Haskell
+ lsp.enable("hls")
+ lsp.config("hls", {
+ capabilities = capabilities,
+ settings = {
+ ['haskell'] = {
+ cabalFormattingProvider = "cabalfmt",
+ formattingProvider = "ormolu"
+ },
+ },
+ })
+ -- Lua
+ lsp.enable("lua_ls")
+ lsp.config("lua_ls", {
+ capabilities = capabilities,
+ })
+ -- JavaScript/Typescript
+ lsp.enable("ts_ls")
+ lsp.config("ts_ls", {
+ capabilities = capabilities,
+ })
+ -- CSS
+ lsp.enable("cssls")
+ lsp.config("cssls", {
+ capabilities = capabilities,
+ })
+ -- Meson
+ lsp.enable("mesonlsp")
+ lsp.config("mesonlsp", {
+ capabilities = capabilities,
+ })
+ -- Zig
+ lsp.enable("zls")
+ lsp.config("zls", {
+ capabilities = capabilities,
+ })
end
return {
- "neovim/nvim-lspconfig",
- config = config,
- lazy = true,
- event = { "BufReadPost", "BufWritePost", "BufNewFile" }
+ "neovim/nvim-lspconfig",
+ config = config,
+ lazy = true,
+ event = { "BufReadPost", "BufWritePost", "BufNewFile" }
}