aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--.config/nvim/lua/eugenetriguba/options.lua5
-rw-r--r--.config/nvim/lua/eugenetriguba/plugins/blink.lua36
-rw-r--r--.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua66
-rw-r--r--.config/nvim/lua/eugenetriguba/plugins/init.lua2
-rw-r--r--.config/nvim/lua/eugenetriguba/plugins/lsp.lua6
-rw-r--r--.config/nvim/nvim-pack-lock.json9
6 files changed, 118 insertions, 6 deletions
diff --git a/.config/nvim/lua/eugenetriguba/options.lua b/.config/nvim/lua/eugenetriguba/options.lua
index 6b70422..a0c794b 100644
--- a/.config/nvim/lua/eugenetriguba/options.lua
+++ b/.config/nvim/lua/eugenetriguba/options.lua
@@ -89,8 +89,3 @@ opt.inccommand = 'split'
-- Enable project-local configuration
vim.o.exrc = true
-
--- Enable completions
-vim.opt.complete:prepend 'o' -- include omnifunc (LSP) as a source
-vim.opt.completeopt:append { 'menuone', 'noselect', 'popup', 'fuzzy' }
-vim.o.autocomplete = true
diff --git a/.config/nvim/lua/eugenetriguba/plugins/blink.lua b/.config/nvim/lua/eugenetriguba/plugins/blink.lua
new file mode 100644
index 0000000..fc30cbd
--- /dev/null
+++ b/.config/nvim/lua/eugenetriguba/plugins/blink.lua
@@ -0,0 +1,36 @@
+vim.pack.add {
+ {
+ name = 'blink.cmp',
+ src = 'https://github.com/saghen/blink.cmp',
+ version = 'v1.10.1',
+ },
+ {
+ name = 'lazydev.nvim',
+ src = 'https://github.com/folke/lazydev.nvim',
+ },
+}
+
+require('blink.cmp').setup {
+ keymap = {
+ preset = 'default',
+ },
+ appearance = {
+ nerd_font_variant = 'mono',
+ },
+ completion = {
+ documentation = { auto_show = true, auto_show_delay_ms = 500 },
+ },
+ sources = {
+ default = {
+ 'lsp',
+ 'omni',
+ 'path',
+ 'lazydev',
+ },
+ providers = {
+ lazydev = { module = 'lazydev.integrations.blink', score_offset = 100 },
+ },
+ },
+ fuzzy = { implementation = 'lua' },
+ signature = { enabled = true },
+}
diff --git a/.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua b/.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua
new file mode 100644
index 0000000..315337f
--- /dev/null
+++ b/.config/nvim/lua/eugenetriguba/plugins/gitsigns.lua
@@ -0,0 +1,66 @@
+vim.pack.add {
+ {
+ name = 'gitsigns',
+ src = 'https://github.com/lewis6991/gitsigns.nvim',
+ },
+}
+
+require('gitsigns').setup {
+ signs = {
+ add = { text = '+' },
+ change = { text = '~' },
+ delete = { text = '_' },
+ topdelete = { text = '‾' },
+ changedelete = { text = '~' },
+ },
+ on_attach = function(bufnr)
+ local gitsigns = require 'gitsigns'
+
+ local function map(mode, l, r, opts)
+ opts = opts or {}
+ opts.buffer = bufnr
+ vim.keymap.set(mode, l, r, opts)
+ end
+
+ -- Navigation
+ map('n', ']c', function()
+ if vim.wo.diff then
+ vim.cmd.normal { ']c', bang = true }
+ else
+ gitsigns.nav_hunk 'next'
+ end
+ end, { desc = 'Jump to next git [c]hange' })
+
+ map('n', '[c', function()
+ if vim.wo.diff then
+ vim.cmd.normal { '[c', bang = true }
+ else
+ gitsigns.nav_hunk 'prev'
+ end
+ end, { desc = 'Jump to previous git [c]hange' })
+
+ -- Actions
+ -- visual mode
+ map('v', '<leader>hs', function()
+ gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
+ end, { desc = 'git [s]tage hunk' })
+ map('v', '<leader>hr', function()
+ gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
+ end, { desc = 'git [r]eset hunk' })
+ -- normal mode
+ map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
+ map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
+ map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
+ map('n', '<leader>hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' })
+ map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
+ map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
+ map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
+ map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' })
+ map('n', '<leader>hD', function()
+ gitsigns.diffthis '@'
+ end, { desc = 'git [D]iff against last commit' })
+ -- Toggles
+ map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
+ map('n', '<leader>tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })
+ end,
+}
diff --git a/.config/nvim/lua/eugenetriguba/plugins/init.lua b/.config/nvim/lua/eugenetriguba/plugins/init.lua
index 200cc98..8f2cdd8 100644
--- a/.config/nvim/lua/eugenetriguba/plugins/init.lua
+++ b/.config/nvim/lua/eugenetriguba/plugins/init.lua
@@ -4,5 +4,7 @@ require 'eugenetriguba.plugins.fzf-lua'
require 'eugenetriguba.plugins.mini'
require 'eugenetriguba.plugins.oil'
require 'eugenetriguba.plugins.conform'
+require 'eugenetriguba.plugins.blink'
require 'eugenetriguba.plugins.lsp'
+require 'eugenetriguba.plugins.gitsigns'
require 'eugenetriguba.plugins.vim-tmux-navigator'
diff --git a/.config/nvim/lua/eugenetriguba/plugins/lsp.lua b/.config/nvim/lua/eugenetriguba/plugins/lsp.lua
index f5ff7d5..45ca093 100644
--- a/.config/nvim/lua/eugenetriguba/plugins/lsp.lua
+++ b/.config/nvim/lua/eugenetriguba/plugins/lsp.lua
@@ -110,4 +110,8 @@ vim.diagnostic.config {
virtual_text = false,
}
-vim.lsp.enable { 'lua_ls', 'clangd', 'bashls' }
+vim.lsp.config('*', {
+ capabilities = require('blink.cmp').get_lsp_capabilities(),
+})
+
+vim.lsp.enable { 'lua_ls', 'clangd' }
diff --git a/.config/nvim/nvim-pack-lock.json b/.config/nvim/nvim-pack-lock.json
index 91e3f2d..d47dfa9 100644
--- a/.config/nvim/nvim-pack-lock.json
+++ b/.config/nvim/nvim-pack-lock.json
@@ -1,5 +1,10 @@
{
"plugins": {
+ "blink.cmp": {
+ "rev": "451168851e8e2466bc97ee3e026c3dcb9141ce07",
+ "src": "https://github.com/saghen/blink.cmp",
+ "version": "'v1.10.1'"
+ },
"conform.nvim": {
"rev": "016802de402556da54c36bd7359b441266b01cdd",
"src": "https://github.com/stevearc/conform.nvim"
@@ -12,6 +17,10 @@
"rev": "c67fadd9a24230417267e4f9068227e093c0be2b",
"src": "https://github.com/ibhagwan/fzf-lua"
},
+ "gitsigns": {
+ "rev": "fd780920613e541cbdfac41bf711583ed49f9249",
+ "src": "https://github.com/lewis6991/gitsigns.nvim"
+ },
"lazydev.nvim": {
"rev": "ff2cbcba459b637ec3fd165a2be59b7bbaeedf0d",
"src": "https://github.com/folke/lazydev.nvim"