Upstream merge

init.lua

@@ -0,0 +1,7 @@
+-- Common settings.
+require('utils')
+require('settings')
+require('maps')
+
+-- Load plugins and their settings.
+require('plugins')

lua/maps.lua

@@ -0,0 +1,23 @@
+-- Map K to split line.
+utils.map { 'n', 'K', 'i<CR><Esc>==' }
+
+-- Alignment extension.
+utils.map { 'x', 'ga', '<Plug>(EasyAlign)' }
+utils.map { 'n', 'ga', '<Plug>(EasyAlign)' }
+
+-- Allow pasting multiple times without yanking the replaced text.
+utils.map { 'x', 'p', 'pgvy' }
+
+vim.cmd([[
+" Jump forward or backward
+imap <expr> <Tab>   vsnip#jumpable(1)   ? '<Plug>(vsnip-jump-next)'      : '<Tab>'
+smap <expr> <Tab>   vsnip#jumpable(1)   ? '<Plug>(vsnip-jump-next)'      : '<Tab>'
+imap <expr> <S-Tab> vsnip#jumpable(-1)  ? '<Plug>(vsnip-jump-prev)'      : '<S-Tab>'
+smap <expr> <S-Tab> vsnip#jumpable(-1)  ? '<Plug>(vsnip-jump-prev)'      : '<S-Tab>'
+]])
+
+-- Remap Ctrl+w, <hjkl> to Ctrl+<hjkl>
+utils.map { 'n', '<c-h>', '<c-w>h' }
+utils.map { 'n', '<c-j>', '<c-w>j' }
+utils.map { 'n', '<c-k>', '<c-w>k' }
+utils.map { 'n', '<c-l>', '<c-w>l' }

lua/plugins/gitsigns.lua

@@ -0,0 +1,9 @@
+require('gitsigns').setup {
+	signs = {
+		add          = {hl = 'GitSignsAdd'   , text = '▌', numhl='GitSignsAddNr'   , linehl='GitSignsAddLn'},
+		change       = {hl = 'GitSignsChange', text = '▌', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
+		delete       = {hl = 'GitSignsDelete', text = '▁', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
+		topdelete    = {hl = 'GitSignsDelete', text = '▁', numhl='GitSignsDeleteNr', linehl='GitSignsDeleteLn'},
+		changedelete = {hl = 'GitSignsChange', text = '▌', numhl='GitSignsChangeNr', linehl='GitSignsChangeLn'},
+	},
+}

lua/plugins/gruvbox.lua

@@ -0,0 +1,22 @@
+vim.o.background = 'dark'
+vim.g.gruvbox_sign_column = 'bg0'
+vim.g.gruvbox_contrast_dark = 'hard'
+vim.opt.termguicolors = true
+
+vim.cmd([[
+colorscheme gruvbox
+
+" Show operators (+, -, =, etc.) in blue for easier reading.
+hi link Operator GruvboxBlue
+
+" Show selected tab in darker color.
+hi TabLineSel guibg=GruvboxBg0
+
+" Change color of nvim-tree.
+hi! link NvimTreeEmptyFolderName GruvboxAqua
+hi! link NvimTreeFolderName GruvboxAqua
+hi! link NvimTreeOpenedFolderName GruvboxAqua
+hi! link NvimTreeRootFolder GruvboxGreen
+hi! link NvimTreeGitDirty GruvboxOrange
+hi! link NvimTreeExecFile GruvboxGreen
+]])

lua/plugins/impatient.lua

@@ -0,0 +1 @@
+require('impatient').enable_profile()