Update nvim settings/plugins

master
Ian Mancini 3 years ago
parent 60064b1c49
commit 395543dab4

@ -12,12 +12,21 @@ return require('packer').startup(function()
} }
-- File explorer -- File explorer
use {'kevinhwang91/rnvimr', config = [[require('plugins.rnvimr')]]} use {
'kevinhwang91/rnvimr',
config = [[require('plugins.rnvimr')]]
}
use {'kyazdani42/nvim-tree.lua', config = [[require('plugins.nvim-tree')]]} use {
'kyazdani42/nvim-tree.lua',
config = [[require('plugins.nvim-tree')]]
}
-- LSP config -- LSP config
use {'neovim/nvim-lspconfig', config = [[require('plugins.lsp')]]} use {
'neovim/nvim-lspconfig',
config = [[require('plugins.lsp')]]
}
use {'williamboman/nvim-lsp-installer'} use {'williamboman/nvim-lsp-installer'}
-- Langugage specific LSP plugins -- Langugage specific LSP plugins
@ -38,7 +47,10 @@ return require('packer').startup(function()
use {'stevearc/aerial.nvim'} use {'stevearc/aerial.nvim'}
-- Diagnostics -- Diagnostics
use {'folke/trouble.nvim', config = [[require('plugins.trouble-nvim')]]} use {
'folke/trouble.nvim',
config = [[require('plugins.trouble-nvim')]]
}
-- Tree-sitter -- Tree-sitter
use { use {
@ -58,7 +70,10 @@ return require('packer').startup(function()
} }
-- Completion -- Completion
use {'hrsh7th/nvim-compe', config = [[require('plugins.nvim-compe')]]} use {
'hrsh7th/nvim-compe',
config = [[require('plugins.nvim-compe')]]
}
-- Snippets -- Snippets
use {'hrsh7th/vim-vsnip'} use {'hrsh7th/vim-vsnip'}
@ -77,7 +92,10 @@ return require('packer').startup(function()
config = [[require('plugins.gitsigns-nvim')]] config = [[require('plugins.gitsigns-nvim')]]
} }
use {'tpope/vim-fugitive'} use {'tpope/vim-fugitive'}
use {'kdheepak/lazygit.nvim', config = [[require('plugins.lazygit-nvim')]]} use {
'kdheepak/lazygit.nvim',
config = [[require('plugins.lazygit-nvim')]]
}
-- Indent lines -- Indent lines
use { use {
@ -101,7 +119,10 @@ return require('packer').startup(function()
use { use {
'hoob3rt/lualine.nvim', 'hoob3rt/lualine.nvim',
requires = {'kyazdani42/nvim-web-devicons', opt = true}, requires = {
'kyazdani42/nvim-web-devicons',
opt = true
},
config = [[require('plugins.lualine')]] config = [[require('plugins.lualine')]]
} }
@ -112,7 +133,10 @@ return require('packer').startup(function()
use {'norcalli/nvim-colorizer.lua'} use {'norcalli/nvim-colorizer.lua'}
-- Colorschemes -- Colorschemes
use {'Th3Whit3Wolf/onebuddy', requires = {'tjdevries/colorbuddy.vim'}} use {
'Th3Whit3Wolf/onebuddy',
requires = {'tjdevries/colorbuddy.vim'}
}
use {'RRethy/nvim-base16'} use {'RRethy/nvim-base16'}
use {'NTBBloodbath/doom-one.nvim'} use {'NTBBloodbath/doom-one.nvim'}
use {'folke/tokyonight.nvim'} use {'folke/tokyonight.nvim'}
@ -128,8 +152,17 @@ return require('packer').startup(function()
} }
-- Python -- Python
use {'petobens/poet-v', config = [[require('plugins.poet-v')]]} use {
'petobens/poet-v',
config = [[require('plugins.poet-v')]]
}
-- Blade -- Blade
use {'Eduruiz/vim-blade'} use {'Eduruiz/vim-blade'}
-- org-mode
use {
'kristijanhusak/orgmode.nvim',
config = [[require('plugins.orgmode-nvim')]]
}
end) end)

@ -4,13 +4,18 @@ require("toggleterm").setup {
shade_terminals = true, shade_terminals = true,
shading_factor = 1, shading_factor = 1,
start_in_insert = true, start_in_insert = true,
direction = 'float', direction = 'tab',
close_on_exit = false, close_on_exit = false,
float_opts = {winblend = 0, border = 'single'} float_opts = {
winblend = 0,
border = 'single'
}
} }
function _G.set_terminal_keymaps() function _G.set_terminal_keymaps()
local opts = {noremap = true} local opts = {
noremap = true
}
vim.api.nvim_buf_set_keymap(0, 't', '<esc>', [[<C-\><C-n>]], opts) vim.api.nvim_buf_set_keymap(0, 't', '<esc>', [[<C-\><C-n>]], opts)
end end

@ -0,0 +1,27 @@
local parser_config = require"nvim-treesitter.parsers".get_parser_configs()
parser_config.org = {
install_info = {
url = 'https://github.com/milisims/tree-sitter-org',
revision = 'main',
files = {'src/parser.c', 'src/scanner.cc'}
},
filetype = 'org'
}
require'nvim-treesitter.configs'.setup {
-- If TS highlights are not enabled at all, or disabled via `disable` prop, highlighting will fallback to default Vim syntax highlighting
highlight = {
enable = true,
-- disable = {'org'}, -- Remove this to use TS highlighter for some of the highlights (Experimental)
additional_vim_regex_highlighting = {'org'} -- Required since TS highlighter doesn't support all syntax features (conceal)
},
ensure_installed = {'org'} -- Or run :TSUpdate org
}
require('orgmode').setup({
org_agenda_files = {
'~/.org/work/*', '~/org/learning/*', "~/.org/projects/*",
"~/.org/calendars/*", "~/.org/conferences/*"
},
org_default_notes_file = '~/.org/refile.org'
})

@ -1,7 +1,7 @@
local utils = require('utils') local utils = require('utils')
local cmd = vim.cmd local cmd = vim.cmd
local indent = 4 local indent = 2
cmd 'syntax enable' cmd 'syntax enable'
cmd 'filetype plugin indent on' cmd 'filetype plugin indent on'
@ -9,6 +9,7 @@ utils.opt('b', 'expandtab', true)
utils.opt('b', 'shiftwidth', indent) utils.opt('b', 'shiftwidth', indent)
utils.opt('b', 'smartindent', false) utils.opt('b', 'smartindent', false)
utils.opt('b', 'autoindent', true) utils.opt('b', 'autoindent', true)
utils.opt('b', 'softtabstop', indent)
utils.opt('b', 'tabstop', indent) utils.opt('b', 'tabstop', indent)
utils.opt('o', 'hidden', true) utils.opt('o', 'hidden', true)
utils.opt('w', 'wrap', true) utils.opt('w', 'wrap', true)
@ -23,7 +24,7 @@ utils.opt('w', 'number', true)
utils.opt('w', 'relativenumber', true) utils.opt('w', 'relativenumber', true)
utils.opt('w', 'foldlevel', 99) utils.opt('w', 'foldlevel', 99)
utils.opt('w', 'cursorline', true) utils.opt('w', 'cursorline', true)
utils.opt('o', 'clipboard','unnamed,unnamedplus') utils.opt('o', 'clipboard', 'unnamed,unnamedplus')
utils.opt('o', 'lazyredraw', true) utils.opt('o', 'lazyredraw', true)
utils.opt('b', 'undofile', true) utils.opt('b', 'undofile', true)

Loading…
Cancel
Save