diff options
Diffstat (limited to 'config/nvim/lua')
| -rw-r--r-- | config/nvim/lua/mappings.lua | 5 | ||||
| -rw-r--r-- | config/nvim/lua/plugins.lua | 55 |
2 files changed, 60 insertions, 0 deletions
diff --git a/config/nvim/lua/mappings.lua b/config/nvim/lua/mappings.lua index 9b1f638..242b846 100644 --- a/config/nvim/lua/mappings.lua +++ b/config/nvim/lua/mappings.lua @@ -37,3 +37,8 @@ map('n', '<leader>l', '<cmd>SidewaysRight<cr>', {}) map('n', '<leader>h', '<cmd>SidewaysLeft<cr>', {}) map('n', '<leader>w', '<cmd>ArgWrap<cr>', {}) + +-- difftool +map('n', '<leader>1', '<cmd>diffget LOCAL<cr>', {}) +map('n', '<leader>2', '<cmd>diffget BASE<cr>', {}) +map('n', '<leader>3', '<cmd>diffget REMOTE<cr>', {}) diff --git a/config/nvim/lua/plugins.lua b/config/nvim/lua/plugins.lua index 6eae912..31a9a91 100644 --- a/config/nvim/lua/plugins.lua +++ b/config/nvim/lua/plugins.lua @@ -318,6 +318,22 @@ return require("packer").startup(function() run = ":TSUpdate", config = function() require("nvim-treesitter.configs").setup { + ensure_installed = { + "c", + "python", + "lua", + "rust", + "bash", + "commonlisp", + "cpp", + "glsl", + "haskell", + "json", + "markdown", + "query", + "vim", + "yaml", + }, highlight = { enable = true }, @@ -385,6 +401,45 @@ return require("packer").startup(function() end } + use { + "lewis6991/gitsigns.nvim", + tag = 'release', + config = function() + require("gitsigns").setup { + signcolumn = false, + numhl = true, + + on_attach = function(bufnr) + local opts = { silent = true, noremap = true, expr = true } + -- local map = function(...) vim.api.nvim_buf_set_keymap(bufnr, ...) end + local function map(mode, l, r) + opts.buffer = bufnr + vim.keymap.set(mode, l, r, opts) + end + local gs = package.loaded.gitsigns + map( + "n", + "]c", + function() + if vim.wo.diff then return "]c" end + vim.schedule(function() gs.next_hunk() end) + return "<Ignore>" + end + ) + map( + "n", + "[c", + function() + if vim.wo.diff then return "[c" end + vim.schedule(function() gs.prev_hunk() end) + return "<Ignore>" + end + ) + end + } + end + } + -- remote files and lsp use { "chipsenkbeil/distant.nvim", |