forked from nvim-lua/kickstart.nvim
-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Merge branch 'refs/heads/nvim-lua-master'
# Conflicts: # init.lua
- Loading branch information
Showing
7 changed files
with
189 additions
and
85 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,8 @@ | ||
| *************************************************************************** | ||
| **NOTE** | ||
| Please verify that the `base repository` above has the intended destination! | ||
| Github by default opens Pull Requests against the parent of a forked repository. | ||
| If this is your personal fork and you didn't intend to open a PR for contribution | ||
| to the original project then adjust the `base repository` accordingly. | ||
| ************************************************************************** | ||
|
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,16 @@ | ||
| -- autopairs | ||
| -- https://github.com/windwp/nvim-autopairs | ||
|
|
||
| return { | ||
| 'windwp/nvim-autopairs', | ||
| event = 'InsertEnter', | ||
| -- Optional dependency | ||
| dependencies = { 'hrsh7th/nvim-cmp' }, | ||
| config = function() | ||
| require('nvim-autopairs').setup {} | ||
| -- If you want to automatically add `(` after selecting a function or method | ||
| local cmp_autopairs = require 'nvim-autopairs.completion.cmp' | ||
| local cmp = require 'cmp' | ||
| cmp.event:on('confirm_done', cmp_autopairs.on_confirm_done()) | ||
| end, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,61 @@ | ||
| -- Adds git related signs to the gutter, as well as utilities for managing changes | ||
| -- NOTE: gitsigns is already included in init.lua but contains only the base | ||
| -- config. This will add also the recommended keymaps. | ||
|
|
||
| return { | ||
| { | ||
| 'lewis6991/gitsigns.nvim', | ||
| opts = { | ||
| on_attach = function(bufnr) | ||
| local gitsigns = require 'gitsigns' | ||
|
|
||
| local function map(mode, l, r, opts) | ||
| opts = opts or {} | ||
| opts.buffer = bufnr | ||
| vim.keymap.set(mode, l, r, opts) | ||
| end | ||
|
|
||
| -- Navigation | ||
| map('n', ']c', function() | ||
| if vim.wo.diff then | ||
| vim.cmd.normal { ']c', bang = true } | ||
| else | ||
| gitsigns.nav_hunk 'next' | ||
| end | ||
| end, { desc = 'Jump to next git [c]hange' }) | ||
|
|
||
| map('n', '[c', function() | ||
| if vim.wo.diff then | ||
| vim.cmd.normal { '[c', bang = true } | ||
| else | ||
| gitsigns.nav_hunk 'prev' | ||
| end | ||
| end, { desc = 'Jump to previous git [c]hange' }) | ||
|
|
||
| -- Actions | ||
| -- visual mode | ||
| map('v', '<leader>hs', function() | ||
| gitsigns.stage_hunk { vim.fn.line '.', vim.fn.line 'v' } | ||
| end, { desc = 'stage git hunk' }) | ||
| map('v', '<leader>hr', function() | ||
| gitsigns.reset_hunk { vim.fn.line '.', vim.fn.line 'v' } | ||
| end, { desc = 'reset git hunk' }) | ||
| -- normal mode | ||
| map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' }) | ||
| map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' }) | ||
| map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' }) | ||
| map('n', '<leader>hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' }) | ||
| map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' }) | ||
| map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' }) | ||
| map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' }) | ||
| map('n', '<leader>hd', gitsigns.diffthis, { desc = 'git [d]iff against index' }) | ||
| map('n', '<leader>hD', function() | ||
| gitsigns.diffthis '@' | ||
| end, { desc = 'git [D]iff against last commit' }) | ||
| -- Toggles | ||
| map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' }) | ||
| map('n', '<leader>tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' }) | ||
| end, | ||
| }, | ||
| }, | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,25 @@ | ||
| -- Neo-tree is a Neovim plugin to browse the file system | ||
| -- https://github.com/nvim-neo-tree/neo-tree.nvim | ||
|
|
||
| return { | ||
| 'nvim-neo-tree/neo-tree.nvim', | ||
| version = '*', | ||
| dependencies = { | ||
| 'nvim-lua/plenary.nvim', | ||
| 'nvim-tree/nvim-web-devicons', -- not strictly required, but recommended | ||
| 'MunifTanjim/nui.nvim', | ||
| }, | ||
| cmd = 'Neotree', | ||
| keys = { | ||
| { '\\', ':Neotree reveal<CR>', { desc = 'NeoTree reveal' } }, | ||
| }, | ||
| opts = { | ||
| filesystem = { | ||
| window = { | ||
| mappings = { | ||
| ['\\'] = 'close_window', | ||
| }, | ||
| }, | ||
| }, | ||
| }, | ||
| } |