Compare commits

...

4 Commits

4 changed files with 30 additions and 5 deletions

View File

@ -145,7 +145,7 @@ require('nvim-treesitter.configs').setup {
ensure_installed = { 'c', 'cpp', 'rust', 'go', 'lua', 'python', 'rust', 'typescript', 'help', 'vim' },
highlight = { enable = true },
indent = { enable = true, disable = { 'python' } },
indent = { enable = true, disable = { 'python', 'c', 'cpp' } },
incremental_selection = {
enable = true,
keymaps = {
@ -214,7 +214,7 @@ local servers = {
rust_analyzer = {},
-- tsserver = {},
sumneko_lua = {
lua_ls = {
Lua = {
workspace = { checkThirdParty = false },
telemetry = { enable = false },

View File

@ -4,6 +4,9 @@ vim.keymap.set('n', '<leader>w', '<esc>:w<cr>', {desc = 'Write buffer', silent =
-- quit keymap
vim.keymap.set('n', '<leader>q', '<esc>:q<cr>', {desc = 'Quit', silent = true})
-- close buffer keymap
vim.keymap.set('n', '<leader>c', '<esc>:BufDel<cr>', {desc = 'Close buffer', silent = true})
-- open nvimtree
vim.keymap.set('n', '<leader>e', '<esc>:NvimTreeToggle<cr>', {desc = 'Open file explorer', silent = true})
@ -44,6 +47,7 @@ vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { de
-- Diagnostic keymaps
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev)
vim.keymap.set('n', ']d', vim.diagnostic.goto_next)
vim.keymap.set('n', '<leader>ld', '<esc>:TroubleToggle<cr>', {desc = 'Buffer diagnostics', silent = true})
-- vim.keymap.set('n', '<leader>ld', vim.diagnostic.open_float)
-- vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist)

View File

@ -9,7 +9,8 @@ vim.o.shiftwidth = 4
vim.o.hlsearch = false
-- Make line numbers default
vim.wo.number = true
-- vim.wo.number = true
vim.wo.relativenumber = true
-- Enable mouse mode
vim.o.mouse = 'a'

View File

@ -7,7 +7,7 @@ if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
vim.cmd [[packadd packer.nvim]]
end
require('packer').startup(function(use)
require('packer').startup({function(use)
-- Package manager
use 'wbthomason/packer.nvim'
@ -25,6 +25,18 @@ require('packer').startup(function(use)
'folke/neodev.nvim',
},
}
-- lsp diagnostics
use {
"folke/trouble.nvim",
requires = "nvim-tree/nvim-web-devicons",
config = function()
require("trouble").setup {
-- your configuration comes here
-- or leave it empty to use the default settings
-- refer to the configuration section below
}
end
}
use { -- Autocompletion
'hrsh7th/nvim-cmp',
@ -81,6 +93,9 @@ require('packer').startup(function(use)
-- bufferline
use {'akinsho/bufferline.nvim', tag = "v3.*", requires = 'nvim-tree/nvim-web-devicons'}
-- close buffers
use {'ojroques/nvim-bufdel'}
-- toggleterm
use {"akinsho/toggleterm.nvim", tag = '*', config = function()
require("toggleterm").setup{
@ -128,7 +143,12 @@ require('packer').startup(function(use)
if is_bootstrap then
require('packer').sync()
end
end)
end,
config = {
display = {
open_fn = require('packer.util').float,
}
}})
-- When we are bootstrapping a configuration, it doesn't
-- make sense to execute the rest of the init.lua.