From 395543dab4dd39b1b975422ce36cf0311de60de9 Mon Sep 17 00:00:00 2001 From: Ian Mancini Date: Sun, 19 Dec 2021 14:27:12 -0300 Subject: [PATCH] Update nvim settings/plugins --- .../nvim/.config/nvim/lua/plugins/init.lua | 51 +++++++++++++++---- .../nvim/lua/plugins/nvim-toggleterm.lua | 11 ++-- .../.config/nvim/lua/plugins/orgmode-nvim.lua | 27 ++++++++++ .../base/nvim/.config/nvim/lua/settings.lua | 5 +- 4 files changed, 80 insertions(+), 14 deletions(-) create mode 100644 filesets/base/nvim/.config/nvim/lua/plugins/orgmode-nvim.lua diff --git a/filesets/base/nvim/.config/nvim/lua/plugins/init.lua b/filesets/base/nvim/.config/nvim/lua/plugins/init.lua index c754f66..d7bf202 100644 --- a/filesets/base/nvim/.config/nvim/lua/plugins/init.lua +++ b/filesets/base/nvim/.config/nvim/lua/plugins/init.lua @@ -12,12 +12,21 @@ return require('packer').startup(function() } -- 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 - use {'neovim/nvim-lspconfig', config = [[require('plugins.lsp')]]} + use { + 'neovim/nvim-lspconfig', + config = [[require('plugins.lsp')]] + } use {'williamboman/nvim-lsp-installer'} -- Langugage specific LSP plugins @@ -38,7 +47,10 @@ return require('packer').startup(function() use {'stevearc/aerial.nvim'} -- Diagnostics - use {'folke/trouble.nvim', config = [[require('plugins.trouble-nvim')]]} + use { + 'folke/trouble.nvim', + config = [[require('plugins.trouble-nvim')]] + } -- Tree-sitter use { @@ -58,7 +70,10 @@ return require('packer').startup(function() } -- Completion - use {'hrsh7th/nvim-compe', config = [[require('plugins.nvim-compe')]]} + use { + 'hrsh7th/nvim-compe', + config = [[require('plugins.nvim-compe')]] + } -- Snippets use {'hrsh7th/vim-vsnip'} @@ -77,7 +92,10 @@ return require('packer').startup(function() config = [[require('plugins.gitsigns-nvim')]] } use {'tpope/vim-fugitive'} - use {'kdheepak/lazygit.nvim', config = [[require('plugins.lazygit-nvim')]]} + use { + 'kdheepak/lazygit.nvim', + config = [[require('plugins.lazygit-nvim')]] + } -- Indent lines use { @@ -101,7 +119,10 @@ return require('packer').startup(function() use { 'hoob3rt/lualine.nvim', - requires = {'kyazdani42/nvim-web-devicons', opt = true}, + requires = { + 'kyazdani42/nvim-web-devicons', + opt = true + }, config = [[require('plugins.lualine')]] } @@ -112,7 +133,10 @@ return require('packer').startup(function() use {'norcalli/nvim-colorizer.lua'} -- Colorschemes - use {'Th3Whit3Wolf/onebuddy', requires = {'tjdevries/colorbuddy.vim'}} + use { + 'Th3Whit3Wolf/onebuddy', + requires = {'tjdevries/colorbuddy.vim'} + } use {'RRethy/nvim-base16'} use {'NTBBloodbath/doom-one.nvim'} use {'folke/tokyonight.nvim'} @@ -128,8 +152,17 @@ return require('packer').startup(function() } -- Python - use {'petobens/poet-v', config = [[require('plugins.poet-v')]]} + use { + 'petobens/poet-v', + config = [[require('plugins.poet-v')]] + } -- Blade use {'Eduruiz/vim-blade'} + + -- org-mode + use { + 'kristijanhusak/orgmode.nvim', + config = [[require('plugins.orgmode-nvim')]] + } end) diff --git a/filesets/base/nvim/.config/nvim/lua/plugins/nvim-toggleterm.lua b/filesets/base/nvim/.config/nvim/lua/plugins/nvim-toggleterm.lua index d671a40..bcb006d 100644 --- a/filesets/base/nvim/.config/nvim/lua/plugins/nvim-toggleterm.lua +++ b/filesets/base/nvim/.config/nvim/lua/plugins/nvim-toggleterm.lua @@ -4,13 +4,18 @@ require("toggleterm").setup { shade_terminals = true, shading_factor = 1, start_in_insert = true, - direction = 'float', + direction = 'tab', close_on_exit = false, - float_opts = {winblend = 0, border = 'single'} + float_opts = { + winblend = 0, + border = 'single' + } } function _G.set_terminal_keymaps() - local opts = {noremap = true} + local opts = { + noremap = true + } vim.api.nvim_buf_set_keymap(0, 't', '', [[]], opts) end diff --git a/filesets/base/nvim/.config/nvim/lua/plugins/orgmode-nvim.lua b/filesets/base/nvim/.config/nvim/lua/plugins/orgmode-nvim.lua new file mode 100644 index 0000000..a3b22cf --- /dev/null +++ b/filesets/base/nvim/.config/nvim/lua/plugins/orgmode-nvim.lua @@ -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' +}) diff --git a/filesets/base/nvim/.config/nvim/lua/settings.lua b/filesets/base/nvim/.config/nvim/lua/settings.lua index ed1ae5b..b64ec9d 100644 --- a/filesets/base/nvim/.config/nvim/lua/settings.lua +++ b/filesets/base/nvim/.config/nvim/lua/settings.lua @@ -1,7 +1,7 @@ local utils = require('utils') local cmd = vim.cmd -local indent = 4 +local indent = 2 cmd 'syntax enable' cmd 'filetype plugin indent on' @@ -9,6 +9,7 @@ utils.opt('b', 'expandtab', true) utils.opt('b', 'shiftwidth', indent) utils.opt('b', 'smartindent', false) utils.opt('b', 'autoindent', true) +utils.opt('b', 'softtabstop', indent) utils.opt('b', 'tabstop', indent) utils.opt('o', 'hidden', true) utils.opt('w', 'wrap', true) @@ -23,7 +24,7 @@ utils.opt('w', 'number', true) utils.opt('w', 'relativenumber', true) utils.opt('w', 'foldlevel', 99) utils.opt('w', 'cursorline', true) -utils.opt('o', 'clipboard','unnamed,unnamedplus') +utils.opt('o', 'clipboard', 'unnamed,unnamedplus') utils.opt('o', 'lazyredraw', true) utils.opt('b', 'undofile', true)