diff --git a/init.lua b/init.lua index 07323e1..d153a52 100644 --- a/init.lua +++ b/init.lua @@ -36,7 +36,7 @@ g.mapleader = "," -- opt.fillchars = { eob = "~" } opt.scrolloff = 4 opt.spelllang = "fr" -opt.colorcolumn = {100} +opt.colorcolumn = { 100 } opt.textwidth = 100 opt.timeoutlen = 1000 opt.breakindent = true @@ -53,7 +53,7 @@ require("lazy").setup(plugins) vim.cmd.colorscheme "catppuccin" -- if $XDG_STATE_HOME/darkmode exists, set dark background, light other wise -local path = ( vim.fn.getenv("XDG_STATE_HOME") or "~/.local/state" ) .. "/darkmode" +local path = (vim.fn.getenv("XDG_STATE_HOME") or "~/.local/state") .. "/darkmode" if vim.fn.filereadable(path) == 1 then opt.background = "dark" else diff --git a/lua/configs/dap.lua b/lua/configs/dap.lua index 64b7bda..2aef09b 100644 --- a/lua/configs/dap.lua +++ b/lua/configs/dap.lua @@ -1,4 +1,3 @@ - local dap = require("dap") -- dap.configurations.c = { -- { diff --git a/lua/configs/lualine.lua b/lua/configs/lualine.lua index 3300480..04b0d72 100644 --- a/lua/configs/lualine.lua +++ b/lua/configs/lualine.lua @@ -19,7 +19,7 @@ local opts = { } }, sections = { - lualine_a = { 'mode', {hydra.get_name, cond = hydra.is_active}}, + lualine_a = { 'mode', { hydra.get_name, cond = hydra.is_active } }, lualine_b = { 'branch', 'diff' }, lualine_c = { 'filename', diff --git a/lua/mappings.lua b/lua/mappings.lua index 1f67779..203f8de 100644 --- a/lua/mappings.lua +++ b/lua/mappings.lua @@ -49,7 +49,7 @@ vim.keymap.set({ 'n', 'v' }, 'f', " HopWord ", { desc = "HopWord" }) -- marks vim.keymap.set({ 'n' }, "", "mA", { desc = "Set mark A", remap = true }) -vim.keymap.set({ 'n' }, "", "g'A", { desc = "Jump to mark A", remap = true}) +vim.keymap.set({ 'n' }, "", "g'A", { desc = "Jump to mark A", remap = true }) vim.keymap.set({ 'n' }, "", "mZ", { desc = "Set mark Z" }) vim.keymap.set({ 'n' }, "", "g'Z", { desc = "Jump to mark Z" }) vim.keymap.set({ 'n' }, "", "mE", { desc = "Set mark E" }) @@ -90,22 +90,26 @@ vim.api.nvim_create_autocmd('LspAttach', { -- Descriptions for lspconfig mappings local wk = require("which-key") wk.add({ - {"e", vim.diagnostic.open_float, desc = "Show diagnostics" }, - {"[[", vim.diagnostic.goto_prev, desc = "Previous diagnostic" }, - {"]]", vim.diagnostic.goto_next, desc = "Next diagnostic" }, - {"q", vim.diagnostic.setloclist, desc = "Set location list" }, - {"gD", vim.lsp.buf.declaration, desc = "Goto declaration" }, - {"gd", vim.lsp.buf.definition, desc = "Goto definition" }, - {"K", vim.lsp.buf.hover, desc = "Hover" }, - {"gi", vim.lsp.buf.implementation, desc = "Goto implementation" }, - {"", vim.lsp.buf.signature_help, desc = "Signature help" }, - {"D", vim.lsp.buf.type_definition, desc = "Goto type definition" }, - {"ra", vim.lsp.buf.rename, desc = "Rename" }, - {"ca", vim.lsp.buf.code_action, desc = "Code action" }, - {"gr", vim.lsp.buf.references, desc = "Goto references" }, - {"fm", function() - vim.lsp.buf.format { async = true } - end, desc = "Format" }, + { "e", vim.diagnostic.open_float, desc = "Show diagnostics" }, + { "[[", vim.diagnostic.goto_prev, desc = "Previous diagnostic" }, + { "]]", vim.diagnostic.goto_next, desc = "Next diagnostic" }, + { "q", vim.diagnostic.setloclist, desc = "Set location list" }, + { "gD", vim.lsp.buf.declaration, desc = "Goto declaration" }, + { "gd", vim.lsp.buf.definition, desc = "Goto definition" }, + { "K", vim.lsp.buf.hover, desc = "Hover" }, + { "gi", vim.lsp.buf.implementation, desc = "Goto implementation" }, + { "", vim.lsp.buf.signature_help, desc = "Signature help" }, + { "D", vim.lsp.buf.type_definition, desc = "Goto type definition" }, + { "ra", vim.lsp.buf.rename, desc = "Rename" }, + { "ca", vim.lsp.buf.code_action, desc = "Code action" }, + { "gr", vim.lsp.buf.references, desc = "Goto references" }, + { + "fm", + function() + vim.lsp.buf.format { async = true } + end, + desc = "Format" + }, }) -- DAP @@ -147,12 +151,12 @@ Hydra({ { 'c', dap.continue, { desc = "Continue" } }, { 'r', dap.restart, { desc = "Restart" } }, -- { 'i', dap.pause, { desc = "Pause" } }, - { 'I', nil, { } }, + { 'I', nil, {} }, { 's', dap.step_into, { desc = "Step into" } }, { 'a', dap.step_over, { desc = "Step over" } }, { 'A', dap.step_out, { desc = "Step out" } }, { 'x', dap.repl.toggle, { desc = "repl" } }, - { 't', dap_sb_threads.toggle, { desc = "Threads" } }, + { 't', dap_sb_threads.toggle, { desc = "Threads" } }, { 'f', dap_sb_frames.toggle, { desc = "Frames" } }, { 'v', dap_sb_scopes.toggle, { desc = "Scopes" } }, -- { 'z', dap_sb_session.toggle, { desc = "Session" } }, diff --git a/lua/plugins.lua b/lua/plugins.lua index fd503e9..de5fcfe 100644 --- a/lua/plugins.lua +++ b/lua/plugins.lua @@ -228,7 +228,7 @@ local plugins = { { "olimorris/persisted.nvim", lazy = false, -- make sure the plugin is always loaded at startup - config = function () + config = function() require("persisted").setup({ autosave = true, autoload = true, @@ -375,11 +375,11 @@ local plugins = { "sindrets/diffview.nvim", -- optional "ibhagwan/fzf-lua", -- optional }, - config = function () + config = function() require("neogit").setup({ sections = { untracked = { - folded = true; + folded = true, } } }) @@ -487,11 +487,11 @@ local plugins = { -- require("dapui").setup() -- end -- }, - { + { "theHamsta/nvim-dap-virtual-text", lazy = false, dependencies = { "mfussenegger/nvim-dap", "nvim-treesitter/nvim-treesitter" }, - config = function () + config = function() require("configs.dap") require("nvim-dap-virtual-text").setup() end