diff --git a/dot_config/nvim/init.lua b/dot_config/nvim/init.lua index 9f488b5..77ec8b3 100644 --- a/dot_config/nvim/init.lua +++ b/dot_config/nvim/init.lua @@ -4,9 +4,13 @@ require('options') -- packages require('pack') +-- keymaps +require('mappings') + -- plugin stuff require('plugins.setups') require('plugins.telescope') require('plugins.lspconfig') +require('plugins.hardline') require('plugins.treesitter') require('plugins.compe') diff --git a/dot_config/nvim/lua/mappings.lua b/dot_config/nvim/lua/mappings.lua new file mode 100644 index 0000000..1345016 --- /dev/null +++ b/dot_config/nvim/lua/mappings.lua @@ -0,0 +1,8 @@ +local set_keymap = require('common').set_keymap + +-- reload vimrc +set_keymap('n', 'sv', 'Reload') + +-- hop +set_keymap('n', 'hw', 'HopWord') +set_keymap('n', 'hl', 'HopLine') diff --git a/dot_config/nvim/lua/pack.lua b/dot_config/nvim/lua/pack.lua index cc11b77..6e002fa 100644 --- a/dot_config/nvim/lua/pack.lua +++ b/dot_config/nvim/lua/pack.lua @@ -16,12 +16,30 @@ paq 'rmagatti/auto-session' -- auto session paq 'rmagatti/session-lens' -- session lens for telescope paq 'crispgm/telescope-heading.nvim' -- markdown heading for telescope +-- views +paq 'ojroques/nvim-hardline' -- status line +paq 'crispgm/nvim-tabline' -- tab line +paq 'dstein64/nvim-scrollview' -- scrollbar +paq 'google/vim-searchindex' -- search index +paq 'editorconfig/editorconfig-vim' -- editorconfig support +paq 'RRethy/vim-illuminate' -- word highlighting +paq 'lewis6991/gitsigns.nvim' -- git gutter + +-- edit +paq 'phaazon/hop.nvim' -- hopping around +paq 'tpope/vim-surround' -- change surrounds +paq 'tpope/vim-commentary' -- comment stuff out/in +paq 'christoomey/vim-system-copy' -- copy n paste into system clipboard +paq 'steelsojka/pears.nvim' -- auto bracket match and other stuff + -- language paq {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'} -- treesitter paq 'nvim-treesitter/playground' -- ts playground paq 'nvim-treesitter/nvim-treesitter-textobjects' -- ts textobjects paq 'neovim/nvim-lspconfig' -- lsp client config paq 'hrsh7th/nvim-compe' -- completion +paq 'rust-lang/rust.vim' -- rust support +paq 'elixir-editors/vim-elixir' -- elixir support -- misc -paq 'elixir-editors/vim-elixir' -- elixir support +paq 'famiu/nvim-reload' -- reloading the vimrc diff --git a/dot_config/nvim/lua/plugins/hardline.lua b/dot_config/nvim/lua/plugins/hardline.lua new file mode 100644 index 0000000..0234573 --- /dev/null +++ b/dot_config/nvim/lua/plugins/hardline.lua @@ -0,0 +1,16 @@ +require('hardline').setup { + bufferline = false, + sections = { + {class = 'mode', item = require('hardline.parts.mode').get_item}, + {class = 'high', item = require('hardline.parts.git').get_item, hide = 80}, + '%<', + {class = 'med', item = require('hardline.parts.filename').get_item}, + {class = 'med', item ='%='}, + {class = 'low', item = require('hardline.parts.wordcount').get_item, hide = 80}, + {class = 'error', item = require('hardline.parts.lsp').get_error}, + {class = 'warning', item = require('hardline.parts.lsp').get_warning}, + {class = 'warning', item = require('hardline.parts.whitespace').get_item}, + {class = 'high', item = require('hardline.parts.filetype').get_item, hide = 80}, + {class = 'mode', item = require('hardline.parts.line').get_item}, + }, +} diff --git a/dot_config/nvim/lua/plugins/setups.lua b/dot_config/nvim/lua/plugins/setups.lua index e5a84cf..a8e8747 100644 --- a/dot_config/nvim/lua/plugins/setups.lua +++ b/dot_config/nvim/lua/plugins/setups.lua @@ -1,3 +1,5 @@ local vim = vim +require('tabline').setup{} +require('gitsigns').setup() vim.api.nvim_command('colorscheme fairyfloss')