|
|
@@ -33,9 +33,6 @@ vim.g.maplocalleader = ' '
|
|
|
|
|
|
require("lazy").setup({
|
|
|
spec = {
|
|
|
- "nvim-tree/nvim-tree.lua",
|
|
|
- "nvim-tree/nvim-web-devicons",
|
|
|
- "nvim-lualine/lualine.nvim",
|
|
|
-- color theme
|
|
|
{
|
|
|
"catppuccin/nvim",
|
|
|
@@ -49,6 +46,11 @@ require("lazy").setup({
|
|
|
end,
|
|
|
},
|
|
|
|
|
|
+
|
|
|
+ "nvim-tree/nvim-tree.lua",
|
|
|
+ "nvim-tree/nvim-web-devicons",
|
|
|
+ "nvim-lualine/lualine.nvim",
|
|
|
+
|
|
|
-- LSP
|
|
|
{
|
|
|
"mason-org/mason-lspconfig.nvim",
|
|
|
@@ -140,9 +142,7 @@ require("lazy").setup({
|
|
|
-- Highlight, edit, and navigate code
|
|
|
{
|
|
|
'nvim-treesitter/nvim-treesitter',
|
|
|
- dependencies = {
|
|
|
- 'nvim-treesitter/nvim-treesitter-textobjects',
|
|
|
- },
|
|
|
+ lazy = false,
|
|
|
build = ':TSUpdate',
|
|
|
},
|
|
|
|
|
|
@@ -174,6 +174,12 @@ vim.opt.shiftwidth = 2
|
|
|
|
|
|
require("lualine").setup({})
|
|
|
|
|
|
+-- Configure Treesitter
|
|
|
+require('nvim-treesitter').install {
|
|
|
+ 'haskell', 'c', 'cpp', 'go', 'glsl', 'lua', 'python', 'rust', 'tsx',
|
|
|
+ 'typescript', 'javascript', 'vimdoc', 'vim', 'zig'
|
|
|
+}
|
|
|
+
|
|
|
require("nvim-tree").setup({
|
|
|
view = {
|
|
|
width = 30,
|
|
|
@@ -232,8 +238,6 @@ vim.keymap.set('n', '<leader>ff', require('telescope.builtin').find_files, { des
|
|
|
|
|
|
|
|
|
|
|
|
--- Configure Treesitter
|
|
|
-require('nvim-treesitter').install { 'haskell', 'c', 'cpp', 'go', 'glsl', 'lua', 'python', 'rust', 'tsx', 'typescript', 'javascript', 'vimdoc', 'vim', 'zig' }
|
|
|
|
|
|
-- Diagnostic keymaps
|
|
|
vim.keymap.set('n', '<Leader>dp',
|