commit db8b509c443b246a584b49528bb2c83fb7c87393 · seiso.moe/nvim

init.lua

···

       1
        
       require "ptero.plugins"

     

       2
        
       require "ptero.keymaps"

     

       3
        
       require "ptero.options"

     

       0

···

       1
        
       require "ptero.plugins"

     

       2
        
       require "ptero.keymaps"

     

       3
        
       require "ptero.options"

     

       4
       +
       require "ptero.lsp"

+14 -4

lazy-lock.json

···

       1
        
       {

     

       2
        
         "catppuccin": { "branch": "main", "commit": "3020af75aae098a77737d91ee37c7147c8450d99" },

     

       3
       -
         "gitsigns.nvim": { "branch": "main", "commit": "d4f8c01280413919349f5df7daccd0c172143d7c" },

     

       4
       -
         "lazy.nvim": { "branch": "main", "commit": "e77be3cf3b01402b86464e1734fb5ead448ce12e" },

     

       5
       -
         "nvim-treesitter": { "branch": "master", "commit": "3e316204f8ec8450bbaace69d0bf8fe332633fec" },

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       6
        
         "plenary.nvim": { "branch": "master", "commit": "9d81624fbcedd3dd43b38d7e13a1e7b3f873d8cd" },

     

       7
        
         "telescope.nvim": { "branch": "master", "commit": "04af51dbfb17c2afa0b8d82b0e842e0638201ca9" },

     

       8
       -
         "which-key.nvim": { "branch": "main", "commit": "802219ba26409f325a5575e3b684b6cb054e2cc5" }

     

       9
        
       }

···

       1
        
       {

     

       2
        
         "catppuccin": { "branch": "main", "commit": "3020af75aae098a77737d91ee37c7147c8450d99" },

     

       3
       +
         "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },

     

       4
       +
         "cmp-nvim-lsp": { "branch": "main", "commit": "59224771f91b86d1de12570b4070fe4ad7cd1eeb" },

     

       5
       +
         "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },

     

       6
       +
         "cmp-tabnine": { "branch": "main", "commit": "ee1341c53e7b82f55c6e83287828f652c2ac35e1" },

     

       7
       +
         "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },

     

       8
       +
         "gitsigns.nvim": { "branch": "main", "commit": "114362a85e51918ab2965181ffa31932c181f32f" },

     

       9
       +
         "lazy.nvim": { "branch": "main", "commit": "ef87c24e8ede2a94cbeaea1667eaeb7f8ed40dc0" },

     

       10
       +
         "luasnip": { "branch": "master", "commit": "5d57303efde86fcb0959c52b1a6d40f923940f34" },

     

       11
       +
         "mason-lspconfig.nvim": { "branch": "main", "commit": "3751eb5c56c67b51e68a1f4a0da28ae74ab771c1" },

     

       12
       +
         "mason.nvim": { "branch": "main", "commit": "a4ebe1f14ba31242cd09f9e0709d5b1f9d2bcecb" },

     

       13
       +
         "nvim-cmp": { "branch": "main", "commit": "11a95792a5be0f5a40bab5fc5b670e5b1399a939" },

     

       14
       +
         "nvim-lspconfig": { "branch": "master", "commit": "7b98aadc6e85db4fc3af6c1ec22c4774d965506e" },

     

       15
       +
         "nvim-treesitter": { "branch": "master", "commit": "5b8b711926d1f3ef5c63fbe5db2d8f33b912025e" },

     

       16
        
         "plenary.nvim": { "branch": "master", "commit": "9d81624fbcedd3dd43b38d7e13a1e7b3f873d8cd" },

     

       17
        
         "telescope.nvim": { "branch": "master", "commit": "04af51dbfb17c2afa0b8d82b0e842e0638201ca9" },

     

       18
       +
         "which-key.nvim": { "branch": "main", "commit": "85f69b07afce4ea77c58ae9a3aeb4e6c918b4d34" }

     

       19
        
       }

+193

lua/ptero/configs/cmp.lua

···

       1
       +
       local cmp_ok, cmp = pcall(require, "cmp")

     

       2
       +
       if not cmp_ok then

     

       3
       +
         vim.notify('cmp not loaded')

     

       4
       +
         return

     

       5
       +
       end

     

       6
       +
       

     

       7
       +
       local compare_ok, compare = pcall(require, "cmp.config.compare")

     

       8
       +
       if not compare_ok then

     

       9
       +
         vim.notify('cmp.config.compare not loaded')

     

       10
       +
         return

     

       11
       +
       end

     

       12
       +
       

     

       13
       +
       local compare_tabnine_ok, compare_tabnine = pcall(require, "cmp_tabnine.compare")

     

       14
       +
       if not compare_tabnine_ok then

     

       15
       +
         vim.notify('cmp_tabnine.compare not loaded')

     

       16
       +
         return

     

       17
       +
       end

     

       18
       +
       

     

       19
       +
       local luasnip_ok, luasnip = pcall(require, "luasnip")

     

       20
       +
       if not luasnip_ok then

     

       21
       +
         vim.notify('luasnip not loaded')

     

       22
       +
       end

     

       23
       +
       

     

       24
       +
       require("luasnip.loaders.from_vscode").lazy_load()

     

       25
       +
       

     

       26
       +
       local icons = require("ptero.icons")

     

       27
       +
       local border = require("ptero.borders").style

     

       28
       +
       

     

       29
       +
       -- Used by nvim-cmp to override the completion menu popups.

     

       30
       +
       -- FloatBorder is removed to leave it as the default.

     

       31
       +
       -- Default: "Normal:Normal,FloatBorder:Normal,CursorLine:Visual,Search:None"

     

       32
       +
       -- NOTE: This is related to the theme. So maybe consider defining this in theme.lua.

     

       33
       +
       local winhighlight = "Normal:NormalFloat,CursorLine:Visual,Search:None"

     

       34
       +
       

     

       35
       +
       local source_names = {

     

       36
       +
         cmp_tabnine = "[T9]",

     

       37
       +
         nvim_lsp = "[LSP]",

     

       38
       +
         path = "[P]",

     

       39
       +
         luasnip = "[S]",

     

       40
       +
         buffer = "[B]",

     

       41
       +
       }

     

       42
       +
       

     

       43
       +
       local duplicates = {

     

       44
       +
         nvim_lsp = 0,

     

       45
       +
         path = 1,

     

       46
       +
         luasnip = 1,

     

       47
       +
         buffer = 1,

     

       48
       +
       }

     

       49
       +
       

     

       50
       +
       local has_words_before = function()

     

       51
       +
         local line, col = unpack(vim.api.nvim_win_get_cursor(0))

     

       52
       +
         return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil

     

       53
       +
       end

     

       54
       +
       

     

       55
       +
       cmp.setup({

     

       56
       +
         preselect = cmp.PreselectMode.None,

     

       57
       +
         experimental = {

     

       58
       +
           ghost_text = true,

     

       59
       +
         },

     

       60
       +
         formatting = {

     

       61
       +
           fields = { "kind", "abbr", "menu" },

     

       62
       +
           format = function(entry, vim_item)

     

       63
       +
             vim_item.kind = icons.kind[vim_item.kind]

     

       64
       +
             vim_item.menu = source_names[entry.source.name]

     

       65
       +
             vim_item.dup = duplicates[entry.source.name] or 0

     

       66
       +
       

     

       67
       +
             -- Set custom kind icons for specific sources.

     

       68
       +
             if entry.source.name == "cmp_tabnine" then

     

       69
       +
               vim_item.kind = icons.kind.Event

     

       70
       +
               local detail = (entry.completion_item.data or {}).detail

     

       71
       +
               if detail and detail:find(".*%%.*") then

     

       72
       +
                 vim_item.kind = vim_item.kind .. " " .. detail

     

       73
       +
               end

     

       74
       +
       

     

       75
       +
               if (entry.completion_item.data or {}).multiline then

     

       76
       +
                 vim_item.kind = vim_item.kind .. " " .. "[ML]"

     

       77
       +
               end

     

       78
       +
             end

     

       79
       +
       

     

       80
       +
             local max_width = 80

     

       81
       +
             if #vim_item.abbr > max_width then

     

       82
       +
               vim_item.abbr = string.sub(vim_item.abbr, 1, max_width - 1) .. icons.ui.Ellipsis

     

       83
       +
             end

     

       84
       +
       

     

       85
       +
             return vim_item

     

       86
       +
           end,

     

       87
       +
         },

     

       88
       +
         snippet = {

     

       89
       +
           expand = function(args)

     

       90
       +
             luasnip.lsp_expand(args.body)

     

       91
       +
           end,

     

       92
       +
         },

     

       93
       +
         window = {

     

       94
       +
           completion = cmp.config.window.bordered({

     

       95
       +
             border = border,

     

       96
       +
             winhighlight = winhighlight,

     

       97
       +
           }),

     

       98
       +
           documentation = cmp.config.window.bordered({

     

       99
       +
             border = border,

     

       100
       +
             winhighlight = winhighlight,

     

       101
       +
           }),

     

       102
       +
         },

     

       103
       +
         sources = {

     

       104
       +
           {

     

       105
       +
             name = "cmp_tabnine",

     

       106
       +
             max_item_count = 5,

     

       107
       +
             trigger_characters = {

     

       108
       +
               ".",

     

       109
       +
               ":",

     

       110
       +
               "(",

     

       111
       +
               "'",

     

       112
       +
               '"',

     

       113
       +
               "[",

     

       114
       +
               ",",

     

       115
       +
               "#",

     

       116
       +
               "*",

     

       117
       +
               "@",

     

       118
       +
               "|",

     

       119
       +
               "=",

     

       120
       +
               "-",

     

       121
       +
               "{",

     

       122
       +
               "/",

     

       123
       +
               "\\",

     

       124
       +
               "+",

     

       125
       +
               "?",

     

       126
       +
               " ",

     

       127
       +
             },

     

       128
       +
           },

     

       129
       +
           { name = "nvim_lsp" },

     

       130
       +
           { name = "path" },

     

       131
       +
           { name = "luasnip" },

     

       132
       +
           { name = "buffer" },

     

       133
       +
         },

     

       134
       +
         sorting = {

     

       135
       +
           priority_weight = 2,

     

       136
       +
           comparators = {

     

       137
       +
             compare_tabnine,

     

       138
       +
             compare.offset,

     

       139
       +
             compare.exact,

     

       140
       +
             compare.score,

     

       141
       +
             compare.recently_used,

     

       142
       +
             compare.locality,

     

       143
       +
             compare.kind,

     

       144
       +
             compare.sort_text,

     

       145
       +
             compare.length,

     

       146
       +
             compare.order,

     

       147
       +
           },

     

       148
       +
         },

     

       149
       +
         mapping = cmp.mapping.preset.insert({

     

       150
       +
           ["<C-k>"] = cmp.mapping.select_prev_item(),

     

       151
       +
           ["<C-j>"] = cmp.mapping.select_next_item(),

     

       152
       +
           ["<Down>"] = cmp.mapping(cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Select }), { "i" }),

     

       153
       +
           ["<Up>"] = cmp.mapping(cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Select }), { "i" }),

     

       154
       +
           ["<C-d>"] = cmp.mapping.scroll_docs(4),

     

       155
       +
           ["<C-u>"] = cmp.mapping.scroll_docs(-4),

     

       156
       +
           ["<C-Space>"] = cmp.mapping.complete(),

     

       157
       +
           ["<C-e>"] = cmp.mapping.abort(),

     

       158
       +
           ["<CR>"] = cmp.mapping.confirm({ select = false }),

     

       159
       +
       

     

       160
       +
           ["<C-y>"] = cmp.mapping({

     

       161
       +
             i = cmp.mapping.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false }),

     

       162
       +
             c = function(fallback)

     

       163
       +
               if cmp.visible() then

     

       164
       +
                 cmp.confirm({ behavior = cmp.ConfirmBehavior.Replace, select = false })

     

       165
       +
               else

     

       166
       +
                 fallback()

     

       167
       +
               end

     

       168
       +
             end,

     

       169
       +
           }),

     

       170
       +
       

     

       171
       +
           ["<Tab>"] = cmp.mapping(function(fallback)

     

       172
       +
             if cmp.visible() then

     

       173
       +
               cmp.select_next_item()

     

       174
       +
             elseif luasnip.expand_or_jumpable() then

     

       175
       +
               luasnip.expand_or_jump()

     

       176
       +
             elseif has_words_before() then

     

       177
       +
               cmp.complete()

     

       178
       +
             else

     

       179
       +
               fallback()

     

       180
       +
             end

     

       181
       +
           end, { "i", "s" }),

     

       182
       +
       

     

       183
       +
           ["<S-Tab>"] = cmp.mapping(function(fallback)

     

       184
       +
             if cmp.visible() then

     

       185
       +
               cmp.select_prev_item()

     

       186
       +
             elseif luasnip.jumpable(-1) then

     

       187
       +
               luasnip.jump(-1)

     

       188
       +
             else

     

       189
       +
               fallback()

     

       190
       +
             end

     

       191
       +
           end, { "i", "s" }),

     

       192
       +
         }),

     

       193
       +
       })

+12

lua/ptero/configs/mason.lua

···

       1
       +
       local ok, mason = pcall(require, "mason")

     

       2
       +
       if not ok then

     

       3
       +
         return

     

       4
       +
       end

     

       5
       +
       

     

       6
       +
       local border = require("ptero.borders").style

     

       7
       +
       

     

       8
       +
       mason.setup({

     

       9
       +
         ui = {

     

       10
       +
           border = border,

     

       11
       +
         },

     

       12
       +
       })

lua/ptero/configs/tabnine.lua

···

       1
       +
       local tabnine_ok, tabnine = pcall(require, "tabnine")

     

       2
       +
       if not tabnine_ok then

     

       3
       +
         return

     

       4
       +
       end

     

       5
       +
       

     

       6
       +
       tabnine:setup()

+30

lua/ptero/lsp/config.lua

···

       1
       +
       local icons = require("ptero.icons")

     

       2
       +
       local border = require("ptero.borders").style

     

       3
       +
       

     

       4
       +
       local sign = function(name, text)

     

       5
       +
         vim.fn.sign_define(na,e, {texthl = name, text=text, numhl=name })

     

       6
       +
       end

     

       7
       +
       

     

       8
       +
       sign("DiagnosticSignError", icons.diagnostics.Error)

     

       9
       +
       sign("DiagnosticSignWarn", icons.diagnostics.Warning)

     

       10
       +
       sign("DiagnosticSignHint", icons.diagnostics.Hint)

     

       11
       +
       sign("DiagnosticSignInfo", icons.diagnostics.Information)

     

       12
       +
       

     

       13
       +
       vim.diagnostic.config({

     

       14
       +
         virtual_text = false,

     

       15
       +
         signs = true,

     

       16
       +
         underline = true,

     

       17
       +
         update_in_insert = false,

     

       18
       +
         severity_sort = true,

     

       19
       +
         float = {

     

       20
       +
           focusable = false,

     

       21
       +
           style = "minimal",

     

       22
       +
           border = border,

     

       23
       +
           source = "always",

     

       24
       +
           header = "",

     

       25
       +
           prefix = "",

     

       26
       +
         },

     

       27
       +
       })

     

       28
       +
       

     

       29
       +
       vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = border })

     

       30
       +
       vim.lsp.handlers["textDocument/signatureHelp"] = vim.lsp.with(vim.lsp.handlers.signature_help, { border = border })

+29

lua/ptero/lsp/handlers.lua

···

       1
       +
       local M = {}

     

       2
       +
       

     

       3
       +
       -- Helper function to set keymap for specific buffer with a description.

     

       4
       +
       local keymap = function(bufnr, mode, lhs, rhs, desc)

     

       5
       +
         vim.keymap.set(mode, lhs, rhs, { buffer = bufnr, desc = desc, silent = true })

     

       6
       +
       end

     

       7
       +
       

     

       8
       +
       -- capabilities handler

     

       9
       +
       local cmp_ok, cmp_nvim_lsp = pcall(require, "cmp_nvim_lsp")

     

       10
       +
       if cmp_ok then

     

       11
       +
         M.capabilities = cmp_nvim_lsp.default_capabilities()

     

       12
       +
       else

     

       13
       +
         M.capabilities = vim.lsp.protocol.make_client_capabilities()

     

       14
       +
       end

     

       15
       +
       

     

       16
       +
       -- on_attach handler

     

       17
       +
       M.on_attach = function(_, bufnr)

     

       18
       +
         keymap(bufnr, "n", "K", vim.lsp.buf.hover, "Show Hover")

     

       19
       +
         keymap(bufnr, "n", "gd", vim.lsp.buf.definition, "Goto Definition")

     

       20
       +
         keymap(bufnr, "n", "gD", vim.lsp.buf.declaration, "Goto Declaration")

     

       21
       +
         keymap(bufnr, "n", "gr", vim.lsp.buf.references, "Goto References")

     

       22
       +
         keymap(bufnr, "n", "gI", vim.lsp.buf.implementation, "Goto Implementation")

     

       23
       +
         keymap(bufnr, "n", "gs", vim.lsp.buf.signature_help, "Show Signature Help")

     

       24
       +
         keymap(bufnr, "n", "gl", vim.diagnostic.open_float, "Show Line Diagnostics")

     

       25
       +
         keymap(bufnr, "n", "]d", vim.diagnostic.goto_next, "Next Diagnostic")

     

       26
       +
         keymap(bufnr, "n", "[d", vim.diagnostic.goto_prev, "Prev Diagnostic")

     

       27
       +
       end

     

       28
       +
       

     

       29
       +
       return M

+39

lua/ptero/lsp/init.lua

···

       1
       +
       local lspconfig_ok, lspconfig = pcall(require, "lspconfig")

     

       2
       +
       if not lspconfig_ok then

     

       3
       +
         return

     

       4
       +
       end

     

       5
       +
       

     

       6
       +
       local mason_lsp_config_ok, mason_lspconfig = pcall(require, "mason-lspconfig")

     

       7
       +
       if not mason_lspconfig_ok then

     

       8
       +
         return

     

       9
       +
       end

     

       10
       +
       

     

       11
       +
       require("ptero.lsp.config")

     

       12
       +
       

     

       13
       +
       local servers = {

     

       14
       +
         "bashls",

     

       15
       +
         "dockerls",

     

       16
       +
         "gopls",

     

       17
       +
         "html",

     

       18
       +
         "jsonls",

     

       19
       +
         "pyright",

     

       20
       +
         "rust_analyzer",

     

       21
       +
         "tsserver",

     

       22
       +
       }

     

       23
       +
       

     

       24
       +
       local handlers = require("ptero.lsp.handlers")

     

       25
       +
       local opts = {

     

       26
       +
         on_attach = handlers.on_attach,

     

       27
       +
         capabilities = handlers.capabilities,

     

       28
       +
       }

     

       29
       +
       

     

       30
       +
       mason_lspconfig.setup({

     

       31
       +
         ensure_installed = servers,

     

       32
       +
         automatic_installation = true,

     

       33
       +
       })

     

       34
       +
       

     

       35
       +
       mason_lspconfig.setup_handlers({

     

       36
       +
         function(server_name)

     

       37
       +
           lspconfig[server_name].setup(opts)

     

       38
       +
         end,

     

       39
       +
       })

+44 -8

lua/ptero/plugins.lua

···

       1
        
       local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"

     

       2
        
       if not vim.loop.fs_stat(lazypath) then

     

       3
       -
         vim.fn.system({

     

       4
       -
           "git",

     

       5
       -
           "clone",

     

       6
       -
           "--filter=blob:none",

     

       7
       -
           "https://github.com/folke/lazy.nvim.git",

     

       8
       -
           "--branch=stable", -- latest stable release

     

       9
       -
           lazypath,

     

       10
       -
         })

     

       11
        
       end

     

       12
        
       vim.opt.rtp:prepend(lazypath)

     

       13
        
       

     
···

       36
        
       		config=function() require("ptero.configs.gitsigns") end

     

       37
        
       	},

     

       38
        
       

     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       0
        
       
     

       39
        
       	"folke/which-key.nvim"

     

       40
        
       })

···

       1
        
       local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"

     

       2
        
       if not vim.loop.fs_stat(lazypath) then

     

       3
       +
       	vim.fn.system({

     

       4
       +
       		"git",

     

       5
       +
       		"clone",

     

       6
       +
       		"--filter=blob:none",

     

       7
       +
       		"https://github.com/folke/lazy.nvim.git",

     

       8
       +
       		"--branch=stable", -- latest stable release

     

       9
       +
       		lazypath,

     

       10
       +
       	})

     

       11
        
       end

     

       12
        
       vim.opt.rtp:prepend(lazypath)

     

       13
        
       

     
···

       36
        
       		config=function() require("ptero.configs.gitsigns") end

     

       37
        
       	},

     

       38
        
       

     

       39
       +
       	-- completeion

     

       40
       +
       	{

     

       41
       +
       		"hrsh7th/nvim-cmp",

     

       42
       +
           config=function() require('ptero.configs.cmp') end,

     

       43
       +
       		dependencies = {

     

       44
       +
       			"hrsh7th/cmp-buffer",

     

       45
       +
       			"hrsh7th/cmp-nvim-lsp",

     

       46
       +
       			"hrsh7th/cmp-path",

     

       47
       +
             {

     

       48
       +
               "saadparwaiz1/cmp_luasnip",

     

       49
       +
               dependencies = {

     

       50
       +
                 "L3MON4D3/luasnip"

     

       51
       +
               }

     

       52
       +
             },

     

       53
       +
             {

     

       54
       +
               "tzachar/cmp-tabnine",

     

       55
       +
               build="./install.sh",

     

       56
       +
               config=function() require('ptero.configs.tabnine') end

     

       57
       +
             },

     

       58
       +
       		},

     

       59
       +
       	},

     

       60
       +
       

     

       61
       +
         -- lsp

     

       62
       +
       

     

       63
       +
         "neovim/nvim-lspconfig",

     

       64
       +
       

     

       65
       +
         {

     

       66
       +
           "williamboman/mason.nvim",

     

       67
       +
           config=function() require('ptero.configs.mason') end,

     

       68
       +
           dependencies = {

     

       69
       +
             "williamboman/mason-lspconfig.nvim"

     

       70
       +
           }

     

       71
       +
         },

     

       72
       +
       

     

       73
       +
       

     

       74
       +
       	-- visual keybindings

     

       75
        
       	"folke/which-key.nvim"

     

       76
        
       })