Skip to content

Commit 0190285

Browse files
authored
Merge branch 'nvim-lua:master' into master
2 parents 4e10040 + 94f551b commit 0190285

File tree

3 files changed

+21
-11
lines changed

3 files changed

+21
-11
lines changed

README.md

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -211,14 +211,14 @@ sudo apt update
211211
sudo apt install make gcc ripgrep unzip git xclip curl
212212
213213
# Now we install nvim
214-
curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux64.tar.gz
215-
sudo rm -rf /opt/nvim-linux64
216-
sudo mkdir -p /opt/nvim-linux64
217-
sudo chmod a+rX /opt/nvim-linux64
218-
sudo tar -C /opt -xzf nvim-linux64.tar.gz
214+
curl -LO https://github.com/neovim/neovim/releases/latest/download/nvim-linux-x86_64.tar.gz
215+
sudo rm -rf /opt/nvim-linux-x86_64
216+
sudo mkdir -p /opt/nvim-linux-x86_64
217+
sudo chmod a+rX /opt/nvim-linux-x86_64
218+
sudo tar -C /opt -xzf nvim-linux-x86_64.tar.gz
219219
220220
# make it available in /usr/local/bin, distro installs to /usr/bin
221-
sudo ln -sf /opt/nvim-linux64/bin/nvim /usr/local/bin/
221+
sudo ln -sf /opt/nvim-linux-x86_64/bin/nvim /usr/local/bin/
222222
```
223223
</details>
224224
<details><summary>Fedora Install Steps</summary>

init.lua

Lines changed: 13 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -149,12 +149,22 @@ require('lazy').setup({
149149
-- with the first argument being the link and the following
150150
-- keys can be used to configure plugin behavior/loading/etc.
151151
--
152-
-- Use `opts = {}` to force a plugin to be loaded.
152+
-- Use `opts = {}` to automatically pass options to a plugin's `setup()` function, forcing the plugin to be loaded.
153153
--
154154

155+
-- Alternatively, use `config = function() ... end` for full control over the configuration.
156+
-- If you prefer to call `setup` explicitly, use:
157+
-- {
158+
-- 'lewis6991/gitsigns.nvim',
159+
-- config = function()
160+
-- require('gitsigns').setup({
161+
-- -- Your gitsigns configuration here
162+
-- })
163+
-- end,
164+
-- }
165+
--
155166
-- Here is a more advanced example where we pass configuration
156-
-- options to `gitsigns.nvim`. This is equivalent to the following Lua:
157-
-- require('gitsigns').setup({ ... })
167+
-- options to `gitsigns.nvim`.
158168
--
159169
-- See `:help gitsigns` to understand what the configuration keys do
160170
{ -- Adds git related signs to the gutter, as well as utilities for managing changes

lua/kickstart/plugins/gitsigns.lua

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -44,7 +44,7 @@ return {
4444
map('n', '<leader>hs', gitsigns.stage_hunk, { desc = 'git [s]tage hunk' })
4545
map('n', '<leader>hr', gitsigns.reset_hunk, { desc = 'git [r]eset hunk' })
4646
map('n', '<leader>hS', gitsigns.stage_buffer, { desc = 'git [S]tage buffer' })
47-
map('n', '<leader>hu', gitsigns.undo_stage_hunk, { desc = 'git [u]ndo stage hunk' })
47+
map('n', '<leader>hu', gitsigns.stage_hunk, { desc = 'git [u]ndo stage hunk' })
4848
map('n', '<leader>hR', gitsigns.reset_buffer, { desc = 'git [R]eset buffer' })
4949
map('n', '<leader>hp', gitsigns.preview_hunk, { desc = 'git [p]review hunk' })
5050
map('n', '<leader>hb', gitsigns.blame_line, { desc = 'git [b]lame line' })
@@ -54,7 +54,7 @@ return {
5454
end, { desc = 'git [D]iff against last commit' })
5555
-- Toggles
5656
map('n', '<leader>tb', gitsigns.toggle_current_line_blame, { desc = '[T]oggle git show [b]lame line' })
57-
map('n', '<leader>tD', gitsigns.toggle_deleted, { desc = '[T]oggle git show [D]eleted' })
57+
map('n', '<leader>tD', gitsigns.preview_hunk_inline, { desc = '[T]oggle git show [D]eleted' })
5858
end,
5959
},
6060
},

0 commit comments

Comments
 (0)