diff --git a/nvim/lua/user/icons.lua b/nvim/lua/user/icons.lua index 01dd131..db5447f 100644 --- a/nvim/lua/user/icons.lua +++ b/nvim/lua/user/icons.lua @@ -1,4 +1,3 @@ - return { prompt = "", current = " ", diff --git a/nvim/lua/user/keymaps.lua b/nvim/lua/user/keymaps.lua index 67a23eb..2955838 100644 --- a/nvim/lua/user/keymaps.lua +++ b/nvim/lua/user/keymaps.lua @@ -9,12 +9,13 @@ vim.keymap.set('n', 'Q', '') -- -- Editing -- -vim.keymap.set("n", "W", "lua vim.opt.list = not vim.opt.list._value", { silent = true, desc = "Toggle show whitespace" }) -vim.keymap.set({'n', 'i'}, '', vim.cmd.w, { desc = 'Save current buffer' }) +vim.keymap.set("n", "W", "lua vim.opt.list = not vim.opt.list._value", + { silent = true, desc = "Toggle show whitespace" }) +vim.keymap.set({ 'n', 'i' }, '', vim.cmd.w, { desc = 'Save current buffer' }) -- Indent -vim.keymap.set('n', '', '^=$') -vim.keymap.set('x', '', '=', { desc = 'auto indent selection' }) +vim.keymap.set('n', '', '^=$') +vim.keymap.set('x', '', '=', { desc = 'auto indent selection' }) vim.keymap.set('i', '', { desc = 'delete indent' }) @@ -31,14 +32,15 @@ vim.keymap.set('x', 'fha', [[:s/0x\(\x\{1\}\X\)/0x0\1/g]], { desc = "For vim.keymap.set('x', 'fhn', [[:s/\(\(0x\x\{1,2\}, \)\{8\}\)/\1\r/g]], { desc = "Format hex" }) -- Case formatting -vim.keymap.set("x", "fcsc", [[:s/\%V\([a-z]\+\)_\?/\u\1/g]], { desc = "Convert text from snake_case to CamelCase" }) +vim.keymap.set("x", "fcsc", [[:s/\%V\([a-z]\+\)_\?/\u\1/g]], + { desc = "Convert text from snake_case to CamelCase" }) -- copy/paste -vim.keymap.set({'n', 'v'}, 'y', [["+y]], {}) -vim.keymap.set({'n', 'v'}, 'p', [["+p]], {}) -vim.keymap.set('x', 'p', [["_dP]], {silent = true }) +vim.keymap.set({ 'n', 'v' }, 'y', [["+y]], {}) +vim.keymap.set({ 'n', 'v' }, 'p', [["+p]], {}) +vim.keymap.set('x', 'p', [["_dP]], { silent = true }) -- -- Navigation @@ -47,14 +49,14 @@ vim.keymap.set('x', 'p', [["_dP]], {silent = true }) -- Move text vim.keymap.set('n', '', [[:m -2v=]], { silent = true, desc = 'move current line one line up' }) vim.keymap.set('n', '', [[:m +1v=]], { silent = true, desc = 'move current line one line down' }) -vim.keymap.set('v', '', [[:m '<-2gv=gv]], { silent = true, desc = 'move current selection one line up' }) +vim.keymap.set('v', '', [[:m '<-2gv=gv]], { silent = true, desc = 'move current selection one line up' }) vim.keymap.set('v', '', [[:m '>+1gv=gv]], { silent = true, desc = 'move current selection one line down' }) -- Make half page jumps stay in the center of screen -vim.keymap.set('n', '', 'zz', { silent = true, desc = 'jump half a page up'}) -vim.keymap.set('n', '', 'zz', { silent = true, desc = 'jump half a page down'}) -vim.keymap.set('n', '', 'zz', { silent = true, desc = 'jump half a page up'}) -vim.keymap.set('n', '', 'zz', { silent = true, desc = 'jump half a page down'}) +vim.keymap.set('n', '', 'zz', { silent = true, desc = 'jump half a page up' }) +vim.keymap.set('n', '', 'zz', { silent = true, desc = 'jump half a page down' }) +vim.keymap.set('n', '', 'zz', { silent = true, desc = 'jump half a page up' }) +vim.keymap.set('n', '', 'zz', { silent = true, desc = 'jump half a page down' }) -- -- Buffers @@ -63,59 +65,58 @@ vim.keymap.set('n', '', 'zz', { silent = true, desc = 'jump hal -- vim.keymap.set('n', 'bb', vim.cmd.bp, { silent = true, desc = 'Move to previous buffer' }) -- vim.keymap.set('n', 'bd', vim.cmd.bd, { silent = true, desc = 'Close current buffer' }) -- vim.keymap.set('n', 'bd', 'bp | bd #', { silent = true, desc = 'Close current buffer' }) -vim.keymap.set('n', 'bd', buffers.CloseCurrent, { silent = true, desc = 'Close current buffer' }) -vim.keymap.set('n', 'bc', buffers.CloseOthers, { silent = true, desc = 'Close all other buffers' }) -vim.keymap.set('n', 'bD', buffers.CloseAll, { silent = true, desc = 'Close all buffers' }) +vim.keymap.set('n', 'bd', buffers.CloseCurrent, { silent = true, desc = 'Close current buffer' }) +vim.keymap.set('n', 'bc', buffers.CloseOthers, { silent = true, desc = 'Close all other buffers' }) +vim.keymap.set('n', 'bD', buffers.CloseAll, { silent = true, desc = 'Close all buffers' }) -- -- Diagnostics -- -vim.keymap.set('n', "dk", vim.diagnostic.open_float, {desc = "Show diagnostic message under cursor" }) -vim.keymap.set('n', "dn", vim.diagnostic.get_next, {desc = "Goto next" }) -vim.keymap.set('n', "dp", vim.diagnostic.get_prev, {desc = "Goto previous" }) -vim.keymap.set('n', "dd", "Telescope diagnostics", {desc = "Open workspace diagnostics" }) +vim.keymap.set('n', "dk", vim.diagnostic.open_float, { desc = "Show diagnostic message under cursor" }) +vim.keymap.set('n', "dn", vim.diagnostic.get_next, { desc = "Goto next" }) +vim.keymap.set('n', "dp", vim.diagnostic.get_prev, { desc = "Goto previous" }) +vim.keymap.set('n', "dd", "Telescope diagnostics", { desc = "Open workspace diagnostics" }) -- -- File explorer -- -vim.keymap.set('n', ".", "Neotree toggle", {desc = "Toggle Neotree" }) +vim.keymap.set('n', ".", "Neotree toggle", { desc = "Toggle Neotree" }) -- -- Git -- -vim.keymap.set('n', "gp", "Gitsigns preview_hunk", {desc = "Preview section at cursor" }) -vim.keymap.set('n', "gr", "Gitsigns reset_hunk", {desc = "Reset section at cursor" }) -vim.keymap.set('n', "gR", "Gitsigns reset_buffer", {desc = "Reset buffer" }) -vim.keymap.set('n', "gv", "Gitsigns select_hunk", {desc = "Select section under cursor" }) +vim.keymap.set('n', "gp", "Gitsigns preview_hunk", { desc = "Preview section at cursor" }) +vim.keymap.set('n', "gr", "Gitsigns reset_hunk", { desc = "Reset section at cursor" }) +vim.keymap.set('n', "gR", "Gitsigns reset_buffer", { desc = "Reset buffer" }) +vim.keymap.set('n', "gv", "Gitsigns select_hunk", { desc = "Select section under cursor" }) -- -- LSP -- -vim.keymap.set('n', 'go', 'Telescope lsp_type_definitions', {desc = 'Goto type definition' }) -vim.keymap.set('n', 'gd', 'Telescope lsp_definitions', {desc = 'Goto definition' }) -vim.keymap.set({'n', 'x'}, 'ca', 'lua vim.lsp.buf.code_action()', {desc = 'Code action' }) -vim.keymap.set('n', 'rs', 'lua vim.lsp.buf.rename()', {desc = 'Rename symbol'} ) +vim.keymap.set('n', 'go', 'Telescope lsp_type_definitions', { desc = 'Goto type definition' }) +vim.keymap.set('n', 'gd', 'Telescope lsp_definitions', { desc = 'Goto definition' }) +vim.keymap.set({ 'n', 'x' }, 'ca', 'lua vim.lsp.buf.code_action()', { desc = 'Code action' }) +vim.keymap.set('n', 'rs', 'lua vim.lsp.buf.rename()', { desc = 'Rename symbol' }) -- -- Search -- -vim.keymap.set('n', 'sf', 'Telescope find_files', { desc = 'Search files' }) -vim.keymap.set('n', 'sF', telescope.all_files, { desc = 'Search all files' }) -vim.keymap.set('n', 'sw', 'Telescope grep_string', { desc = 'Search for word under cursor' }) -vim.keymap.set('n', 'sa', 'Telescope live_grep', { desc = 'Search in files' }) -vim.keymap.set('n', 'sb', 'Telescope buffers', { desc = 'Search Buffers' }) -vim.keymap.set('n', 'sg', 'Telescope git_files', { desc = 'Search Git files' }) -vim.keymap.set('n', 'sG', 'Telescope git_status', { desc = 'Search Git status' }) -vim.keymap.set('n', 'sc', 'Telescope git_commits', { desc = 'Search Git commits' }) -vim.keymap.set('n', 'so', 'Telescope oldfiles', { desc = 'Search old files' }) -vim.keymap.set('n', 'sd', 'Telescope diagnostics', { desc = 'Search Diagnostics' }) -vim.keymap.set('n', 'sq', 'Telescope quickfix', { desc = 'Search Quickfix' }) -vim.keymap.set('n', 'sr', 'Telescope lsp_references', { desc = 'Search Reference' }) -vim.keymap.set('n', 'ss', 'Telescope lsp_document_symbols', { desc = 'Search document symbols' }) -vim.keymap.set('n', 'si', 'Telescope lsp_implementations', { desc = 'Search Inplementations' }) -vim.keymap.set('n', 'sp', 'Telescope lsp_workspace_symbols', { desc = 'Search Workspace symbols' }) -vim.keymap.set('n', 'sh', 'Telescope help', { desc = 'Search Neovim help' }) - +vim.keymap.set('n', 'sf', 'Telescope find_files', { desc = 'Search files' }) +vim.keymap.set('n', 'sF', telescope.all_files, { desc = 'Search all files' }) +vim.keymap.set('n', 'sw', 'Telescope grep_string', { desc = 'Search for word under cursor' }) +vim.keymap.set('n', 'sa', 'Telescope live_grep', { desc = 'Search in files' }) +vim.keymap.set('n', 'sb', 'Telescope buffers', { desc = 'Search Buffers' }) +vim.keymap.set('n', 'sg', 'Telescope git_files', { desc = 'Search Git files' }) +vim.keymap.set('n', 'sG', 'Telescope git_status', { desc = 'Search Git status' }) +vim.keymap.set('n', 'sc', 'Telescope git_commits', { desc = 'Search Git commits' }) +vim.keymap.set('n', 'so', 'Telescope oldfiles', { desc = 'Search old files' }) +vim.keymap.set('n', 'sd', 'Telescope diagnostics', { desc = 'Search Diagnostics' }) +vim.keymap.set('n', 'sq', 'Telescope quickfix', { desc = 'Search Quickfix' }) +vim.keymap.set('n', 'sr', 'Telescope lsp_references', { desc = 'Search Reference' }) +vim.keymap.set('n', 'ss', 'Telescope lsp_document_symbols', { desc = 'Search document symbols' }) +vim.keymap.set('n', 'si', 'Telescope lsp_implementations', { desc = 'Search Inplementations' }) +vim.keymap.set('n', 'sp', 'Telescope lsp_workspace_symbols', { desc = 'Search Workspace symbols' }) +vim.keymap.set('n', 'sh', 'Telescope help', { desc = 'Search Neovim help' }) diff --git a/nvim/lua/user/lazy.lua b/nvim/lua/user/lazy.lua index 595f933..25dc0b7 100644 --- a/nvim/lua/user/lazy.lua +++ b/nvim/lua/user/lazy.lua @@ -1,4 +1,3 @@ - local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim" ---@diagnostic disable-next-line: undefined-field if not (vim.uv or vim.loop).fs_stat(lazypath) then @@ -7,7 +6,7 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then if vim.v.shell_error ~= 0 then vim.api.nvim_echo({ { "Failed to clone lazy.nvim:\n", "ErrorMsg" }, - { out, "WarningMsg" }, + { out, "WarningMsg" }, { "\nPress any key to exit..." }, }, true, {}) vim.fn.getchar() diff --git a/nvim/lua/user/options.lua b/nvim/lua/user/options.lua index 011c947..98b55c9 100644 --- a/nvim/lua/user/options.lua +++ b/nvim/lua/user/options.lua @@ -1,4 +1,3 @@ - ------------------------------------------------------- -- Helper imports ------------------------------------------------------- @@ -17,15 +16,15 @@ vim.o.updatetime = 50 -- Displays which-key popup sooner vim.o.timeoutlen = 50 -vim.o.mouse="a" +vim.o.mouse = "a" vim.o.confirm = true ------------------------------------------------------- -- User interface ------------------------------------------------------- -vim.o.winblend = 5 -- how much floating windows should blend with background. -vim.o.pumblend = 5 -- popup blend +vim.o.winblend = 5 -- how much floating windows should blend with background. +vim.o.pumblend = 5 -- popup blend vim.o.pumheight = 15 -- popup height -- Configure how new splits should be opened @@ -77,7 +76,8 @@ vim.o.foldcolumn = "auto" vim.o.list = false vim.o.listchars = 'tab: »,space:·,eol:,nbsp:␣' -vim.o.fillchars = string.format([[eob: ,fold: ,foldopen:%s,foldsep:%s,foldclose:%s]], icons.fold.open, icons.fold.sep, icons.fold.close) +vim.o.fillchars = string.format([[eob: ,fold: ,foldopen:%s,foldsep:%s,foldclose:%s]], + icons.fold.open, icons.fold.sep, icons.fold.close) -- Spell stuff, because i cant English vim.o.spell = true diff --git a/nvim/lua/user/plugins/core/colorscheme.lua b/nvim/lua/user/plugins/core/colorscheme.lua index 7431b1f..a4ccf32 100644 --- a/nvim/lua/user/plugins/core/colorscheme.lua +++ b/nvim/lua/user/plugins/core/colorscheme.lua @@ -121,7 +121,7 @@ local options = { ["@lsp.type.property"] = { link = "@variable" }, -- Bash - ["@variable.parameter.bash"] = { fg=colors.rosewater }, + ["@variable.parameter.bash"] = { fg = colors.rosewater }, -- Makefile ["@function.make"] = { link = "Keyword" }, diff --git a/nvim/lua/user/plugins/editor.lua b/nvim/lua/user/plugins/editor.lua index ec663f1..21d622e 100644 --- a/nvim/lua/user/plugins/editor.lua +++ b/nvim/lua/user/plugins/editor.lua @@ -1,36 +1,36 @@ return { "echasnovski/mini.bufremove", { - "windwp/nvim-autopairs", - event = "InsertEnter", - config = true, - }, + "windwp/nvim-autopairs", + event = "InsertEnter", + config = true, + }, { - "lukas-reineke/indent-blankline.nvim", - main = "ibl", - opts = { - debounce = 10, - indent = { - char = "▏", - }, - scope = { - enabled = false, - }, - exclude = { - filetypes = { - "help", - "dashboard", - }, - }, - }, - config = function(_, opts) - require("ibl").setup(opts) + "lukas-reineke/indent-blankline.nvim", + main = "ibl", + opts = { + debounce = 10, + indent = { + char = "▏", + }, + scope = { + enabled = false, + }, + exclude = { + filetypes = { + "help", + "dashboard", + }, + }, + }, + config = function(_, opts) + require("ibl").setup(opts) - local hooks = require("ibl.hooks") - hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_tab_indent_level) - hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level) - end, - }, + local hooks = require("ibl.hooks") + hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_tab_indent_level) + hooks.register(hooks.type.WHITESPACE, hooks.builtin.hide_first_space_indent_level) + end, + }, -- Better folds { 'kevinhwang91/nvim-ufo', diff --git a/nvim/lua/user/plugins/editor/autocomplete.lua b/nvim/lua/user/plugins/editor/autocomplete.lua index c12a04f..dede5e9 100644 --- a/nvim/lua/user/plugins/editor/autocomplete.lua +++ b/nvim/lua/user/plugins/editor/autocomplete.lua @@ -1,93 +1,93 @@ return { - "hrsh7th/nvim-cmp", - version = false, - event = "InsertEnter", - dependencies = { - "hrsh7th/cmp-buffer", -- autocomplete from buffer - "hrsh7th/cmp-path", -- autocomplete from filesystem + "hrsh7th/nvim-cmp", + version = false, + event = "InsertEnter", + dependencies = { + "hrsh7th/cmp-buffer", -- autocomplete from buffer + "hrsh7th/cmp-path", -- autocomplete from filesystem "f3fora/cmp-spell", - }, - opts = function() - local cmp = require("cmp") - local utils = require("user.utils.cmp") + }, + opts = function() + local cmp = require("cmp") + local utils = require("user.utils.cmp") local format = require("user.utils.cmp_format") - -- local lspkind = require("user.utils.lspkind") - local icons = require("user.icons") + -- local lspkind = require("user.utils.lspkind") + local icons = require("user.icons") - local selectPrev = utils.selectPrev({ behavior = cmp.SelectBehavior.Insert }) - local selectNext = utils.selectNext({ behavior = cmp.SelectBehavior.Insert }) + local selectPrev = utils.selectPrev({ behavior = cmp.SelectBehavior.Insert }) + local selectNext = utils.selectNext({ behavior = cmp.SelectBehavior.Insert }) - return { - preselect = false, - completion = { - completeopt = "menu,menuone,longest,popup", - }, - view = { - entries = { name = "custom", selection_order = "near_cursor" }, - }, - window = { - documentation = { - border = { "", "", "", "", "", "", "", " " }, - }, - completion = { - scrolloff = 4, - }, - }, - mapping = { - [""] = selectPrev, - [""] = selectPrev, - [""] = selectNext, - [""] = selectNext, - [""] = cmp.mapping.abort(), - [""] = utils.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), - }, - -- snippet = { - -- expand = function(args) - -- require("luasnip").lsp_expand(args.body) - -- end, - -- }, - formatting = { - fields = { "abbr", "kind", "menu" }, - format = format({ - symbol_map = icons.symbols, + return { + preselect = false, + completion = { + completeopt = "menu,menuone,longest,popup", + }, + view = { + entries = { name = "custom", selection_order = "near_cursor" }, + }, + window = { + documentation = { + border = { "", "", "", "", "", "", "", " " }, + }, + completion = { + scrolloff = 4, + }, + }, + mapping = { + [""] = selectPrev, + [""] = selectPrev, + [""] = selectNext, + [""] = selectNext, + [""] = cmp.mapping.abort(), + [""] = utils.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = true }), + }, + -- snippet = { + -- expand = function(args) + -- require("luasnip").lsp_expand(args.body) + -- end, + -- }, + formatting = { + fields = { "abbr", "kind", "menu" }, + format = format({ + symbol_map = icons.symbols, widths = { menu = 0, } - }), - }, - sources = { - { name = "nvim_lsp" }, + }), + }, + sources = { + { name = "nvim_lsp" }, { name = 'nvim_lsp_signature_help' }, - { name = "luasnip" }, - { name = "buffer" }, - { name = "path" }, - { - name = "spell", + { name = "luasnip" }, + { name = "buffer" }, + { name = "path" }, + { + name = "spell", keyword_length = 3, - option = { - keep_all_entries = false, - enable_in_context = function() - return require('cmp.config.context').in_treesitter_capture('spell') - end, - preselect_correct_word = true, - }, - }, - }, - -- experimental = { - -- ghost_text = { - -- hl_group = "NonText", - -- }, - -- }, - } - end, - config = function(_, opts) - local cmp = require("cmp") - cmp.setup(opts) + option = { + keep_all_entries = false, + enable_in_context = function() + return require('cmp.config.context').in_treesitter_capture('spell') + end, + preselect_correct_word = true, + }, + }, + }, + -- experimental = { + -- ghost_text = { + -- hl_group = "NonText", + -- }, + -- }, + } + end, + config = function(_, opts) + local cmp = require("cmp") + cmp.setup(opts) - -- insert () on function completion using autopairs - local has_autopair, autopair = pcall(require, "nvim-autopairs.completion.cmp") - if has_autopair then - cmp.event:on("confirm_done", autopair.on_confirm_done()) - end - end, + -- insert () on function completion using autopairs + local has_autopair, autopair = pcall(require, "nvim-autopairs.completion.cmp") + if has_autopair then + cmp.event:on("confirm_done", autopair.on_confirm_done()) + end + end, } diff --git a/nvim/lua/user/plugins/lsp.lua b/nvim/lua/user/plugins/lsp.lua index 2e4ab87..caa68d2 100644 --- a/nvim/lua/user/plugins/lsp.lua +++ b/nvim/lua/user/plugins/lsp.lua @@ -53,7 +53,6 @@ return { local augroup = vim.api.nvim_create_augroup("Lsp", {}) for name, server_opts in pairs(opts.servers) do - local on_attach = function(_, bufnr) vim.api.nvim_clear_autocmds({ group = augroup, buffer = bufnr })