add gitsigns and vim-figutive
remove neogit
This commit is contained in:
parent
10554c500d
commit
d17502e7a0
5 changed files with 10 additions and 25 deletions
|
@ -1,3 +1,7 @@
|
||||||
require('plugins')
|
require('plugins')
|
||||||
|
|
||||||
vim.g.mapleader = ";"
|
vim.g.mapleader = ";"
|
||||||
|
vim.o.signcolumn = "yes"
|
||||||
|
vim.wo.number = true
|
||||||
|
vim.wo.relativenumber = true
|
||||||
|
vim.wo.cursorline = true
|
||||||
|
|
|
@ -14,6 +14,9 @@ return require('packer').startup(function()
|
||||||
-- Easy LSP configurations
|
-- Easy LSP configurations
|
||||||
use 'neovim/nvim-lspconfig'
|
use 'neovim/nvim-lspconfig'
|
||||||
|
|
||||||
-- Git integration
|
-- Git line decorations
|
||||||
use { 'TimUntersberger/neogit', requires = 'nvim-lua/plenary.nvim' }
|
use 'lewis6991/gitsigns.nvim'
|
||||||
|
|
||||||
|
-- Git commands from vim
|
||||||
|
use 'tpope/vim-fugitive'
|
||||||
end)
|
end)
|
||||||
|
|
1
roles/neovim/files/plugin/gitsigns.lua
Normal file
1
roles/neovim/files/plugin/gitsigns.lua
Normal file
|
@ -0,0 +1 @@
|
||||||
|
require("gitsigns").setup()
|
|
@ -32,27 +32,6 @@ local on_attach = function(client, bufnr)
|
||||||
vim.keymap.set('n', '<leader>f', function() vim.lsp.buf.format { async = true } end, bufopts)
|
vim.keymap.set('n', '<leader>f', function() vim.lsp.buf.format { async = true } end, bufopts)
|
||||||
end
|
end
|
||||||
|
|
||||||
-- local lsp_flags = {
|
|
||||||
-- -- This is the default in Nvim 0.7+
|
|
||||||
-- debounce_text_changes = 150,
|
|
||||||
-- }
|
|
||||||
-- require('lspconfig')['pyright'].setup{
|
|
||||||
-- on_attach = on_attach,
|
|
||||||
-- flags = lsp_flags,
|
|
||||||
-- }
|
|
||||||
-- require('lspconfig')['tsserver'].setup{
|
|
||||||
-- on_attach = on_attach,
|
|
||||||
-- flags = lsp_flags,
|
|
||||||
-- }
|
|
||||||
-- require('lspconfig')['rust_analyzer'].setup{
|
|
||||||
-- on_attach = on_attach,
|
|
||||||
-- flags = lsp_flags,
|
|
||||||
-- -- Server-specific settings...
|
|
||||||
-- settings = {
|
|
||||||
-- ["rust-analyzer"] = {}
|
|
||||||
-- }
|
|
||||||
-- }
|
|
||||||
|
|
||||||
require("lspconfig").pylsp.setup{
|
require("lspconfig").pylsp.setup{
|
||||||
on_attach = on_attach
|
on_attach = on_attach
|
||||||
}
|
}
|
||||||
|
|
|
@ -1,2 +0,0 @@
|
||||||
local neogit = require('neogit')
|
|
||||||
neogit.setup {}
|
|
Reference in a new issue