diff options
Diffstat (limited to 'config/nvim')
| -rw-r--r-- | config/nvim/init.lua | 59 | ||||
| -rw-r--r-- | config/nvim/lua/mappings.lua | 1 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 75 |
3 files changed, 71 insertions, 64 deletions
diff --git a/config/nvim/init.lua b/config/nvim/init.lua index 7988cee..c4125fc 100644 --- a/config/nvim/init.lua +++ b/config/nvim/init.lua @@ -43,69 +43,12 @@ vim.opt.laststatus=2 -- always a statusline (all window) vim.opt.showcmd = true -- show current partial command in the bottom right vim.opt.showmode = false -- dont show current mode (i.e --INSERT--) --- colorscheme -vim.opt.termguicolors = true -vim.opt.background = "dark" -vim.cmd [[ colorscheme gruvbox ]] -vim.g.gruvbox_italic = 1 -vim.g.gruvbox_bold = 1 -vim.g.gruvbox_termcolors = 256 -vim.g.gruvbox_contrast_dark = 'medium' -vim.g.gruvbox_contrast_light = 'hard' -vim.g.gruvbox_invert_selection = 0 - -local actions = require('telescope.actions') -require('telescope').setup { - defaults = { - mappings = { - i = { - ['<C-j>'] = actions.move_selection_next, - ['<C-k>'] = actions.move_selection_previous, - ['<esc>'] = actions.close, - ['kj'] = actions.close, - } - }, - } -} - -require('lualine').setup { - options = { - theme = 'gruvbox', - icons_enabled = true, - section_separators = '', - component_separators = '' - } -} - -require('nvim-treesitter.configs').setup { - highlight = { - enable = true - }, - -- indent = { - -- enable = true - -- }, - incremental_selection = { - enable = true, - keymaps = { - init_selection = "gnn", - node_incremental = "grn", - scope_incremental = "grc", - node_decremental = "grm", - } - } -} -vim.cmd [[ highlight link pythonTSKeywordOperator Keyword ]] -- require 'nvim-treesitter.highlight' -- local hlmap = vim.treesitter.TSHighlighter.hl_map -- hlmap.error = nil - -require('nvim_comment').setup() - --- require('todo-comments').setup { - --- } +-- require('nvim_comment').setup() -- local on_attach = function(_, bufnr) -- local opts = {noremap = true, silent = true } diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua index 990c4df..a99a478 100644 --- a/config/nvim/lua/mappings.lua +++ b/config/nvim/lua/mappings.lua @@ -59,4 +59,3 @@ map('n', '<leader>w', '<cmd>ArgWrap<cr>', {}) map('n', '<C-p>', '<cmd>Telescope git_files<cr>', {}) map('n', '<leader>H', '<cmd>Telescope help_tags<cr>', {}) map('n', '<leader>;', '<cmd>Telescope commands<cr>', {}) -map('n', '<leader>;', '<cmd>Telescope commands<cr>', {}) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index c1c9bf3..7356e43 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -2,7 +2,6 @@ vim.cmd [[ packadd packer.nvim ]] return require('packer').startup(function() use 'wbthomason/packer.nvim' -- plugin manager (can manage itself) - use 'terrortylor/nvim-comment' -- comments use 'junegunn/vim-easy-align' -- align use 'AndrewRadev/sideways.vim' -- Move arguments sideways use 'FooSoft/vim-argwrap' -- Put arguments on multiple lines @@ -10,17 +9,67 @@ return require('packer').startup(function() use 'romainl/vim-cool' -- only highlight search matches when searching use 'neovim/nvim-lspconfig' -- nvim lsp configuration + use { + 'numToStr/Comment.nvim', + config = function() + require('Comment').setup() + end + } + -- color scheme - use {'ellisonleao/gruvbox.nvim', requires = {'rktjmp/lush.nvim'}} + use { + 'ellisonleao/gruvbox.nvim', + requires = {'rktjmp/lush.nvim'}, + config = function() + vim.opt.termguicolors = true + vim.opt.background = "dark" + vim.cmd [[ colorscheme gruvbox ]] + vim.g.gruvbox_italic = 1 + vim.g.gruvbox_bold = 1 + vim.g.gruvbox_termcolors = 256 + vim.g.gruvbox_contrast_dark = 'medium' + vim.g.gruvbox_contrast_light = 'hard' + vim.g.gruvbox_invert_selection = 0 + end + } -- status line use { 'nvim-lualine/lualine.nvim', - requires = {'kyazdani42/nvim-web-devicons', opt = true} + requires = {'kyazdani42/nvim-web-devicons', opt = true}, + config = function() + require('lualine').setup { + options = { + theme = 'gruvbox', + icons_enabled = true, + section_separators = '', + component_separators = '' + } + } + end } -- better syntax highlight for everything use { 'nvim-treesitter/nvim-treesitter', - run = ':TSUpdate' + run = ':TSUpdate', + config = function() + require('nvim-treesitter.configs').setup { + highlight = { + enable = true + }, + -- indent = { enable = true }, + -- TODO: could be neat + -- incremental_selection = { + -- enable = true, + -- keymaps = { + -- init_selection = "gnn", + -- node_incremental = "grn", + -- scope_incremental = "grc", + -- node_decremental = "grm", + -- } + -- } + } + vim.cmd [[ highlight link pythonTSKeywordOperator Keyword ]] + end } -- fuzzy finder (replace fzf.vim or ctrlp.vim) use { @@ -28,7 +77,23 @@ return require('packer').startup(function() requires = { {'nvim-lua/plenary.nvim'}, {'kyazdani42/nvim-web-devicons', opt = true}, - } + }, + config = function() + local actions = require('telescope.actions') + require('telescope').setup { + defaults = { + mappings = { + i = { + ['<C-j>'] = actions.move_selection_next, + ['<C-k>'] = actions.move_selection_previous, + ['<esc>'] = actions.close, + ['kj'] = actions.close, + } + }, + } + } + end + } -- todos,fix,etc.. highlight and list use { |