Skip to content

Commit b168a4b

Browse files
committed
Merge branch 'master' of https://github.com/step4/kickstart.nvim
2 parents e6e7a13 + e21d495 commit b168a4b

File tree

2 files changed

+62
-3
lines changed

2 files changed

+62
-3
lines changed

init.lua

Lines changed: 31 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -267,13 +267,38 @@ require('lazy').setup({
267267
-- Configuration here, or leave empty to use defaults
268268
})
269269
end
270-
}
270+
},
271+
{
272+
'windwp/nvim-autopairs',
273+
event = "InsertEnter",
274+
opts = {} -- this is equalent to setup({}) function
275+
},
276+
{
277+
"chrisgrieser/nvim-spider",
278+
keys = {
279+
{ -- example for lazy-loading and keymap
280+
"<leader>e",
281+
"<cmd>lua require('spider').motion('e')<CR>",
282+
mode = { "n", "o", "x" },
283+
},
284+
{
285+
"<leader>w",
286+
"<cmd>lua require('spider').motion('w')<CR>",
287+
mode = { "n", "o", "x" },
288+
},
289+
{
290+
"<leader>b",
291+
"<cmd>lua require('spider').motion('b')<CR>",
292+
mode = { "n", "o", "x" },
293+
},
294+
},
295+
},
271296

272297

273298
-- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
274299
-- These are some example plugins that I've included in the kickstart repository.
275300
-- Uncomment any of the lines below to enable them.
276-
-- require 'kickstart.plugins.autoformat',
301+
require 'kickstart.plugins.autoformat',
277302
-- require 'kickstart.plugins.debug',
278303

279304
-- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
@@ -293,7 +318,8 @@ require('lazy').setup({
293318
vim.o.hlsearch = false
294319

295320
-- Make line numbers default
296-
vim.wo.rnu = true
321+
vim.o.rnu = true
322+
vim.o.number = true
297323

298324
-- Enable mouse mode
299325
vim.o.mouse = 'a'
@@ -326,6 +352,8 @@ vim.o.completeopt = 'menuone,noselect'
326352
-- NOTE: You should make sure your terminal supports this
327353
vim.o.termguicolors = true
328354

355+
vim.o.scrolloff = 7
356+
329357
-- [[ Basic Keymaps ]]
330358

331359
-- Keymaps for better default experience

lazy-lock.json

Lines changed: 31 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,31 @@
1+
{
2+
"Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
3+
"LuaSnip": { "branch": "master", "commit": "1def35377854535bb3b0f4cc7a33c083cdb12571" },
4+
"cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
5+
"cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
6+
"fidget.nvim": { "branch": "main", "commit": "785efc604f6ffe3c3fdd2ea86262804d48863ee1" },
7+
"friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
8+
"gitsigns.nvim": { "branch": "main", "commit": "6ef8c54fb526bf3a0bc4efb0b2fe8e6d9a7daed2" },
9+
"indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" },
10+
"kanagawa.nvim": { "branch": "master", "commit": "c19b9023842697ec92caf72cd3599f7dd7be4456" },
11+
"lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
12+
"lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
13+
"mason-lspconfig.nvim": { "branch": "main", "commit": "41674c9d50f23cfa3e11f0ca964eb9100c2a8922" },
14+
"mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
15+
"neodev.nvim": { "branch": "main", "commit": "1676d2c24186fc30005317e0306d20c639b2351b" },
16+
"nvim-autopairs": { "branch": "master", "commit": "0f04d78619cce9a5af4f355968040f7d675854a1" },
17+
"nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
18+
"nvim-lspconfig": { "branch": "master", "commit": "fcf153fbbf1facd16a71d46b92be8be495123a9f" },
19+
"nvim-spider": { "branch": "main", "commit": "e0eeac5480704cc3fdd5bdadd4901ca5409d7838" },
20+
"nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" },
21+
"nvim-treesitter": { "branch": "master", "commit": "1e64838ff575405c32b447b68762649289e8d73c" },
22+
"nvim-treesitter-textobjects": { "branch": "master", "commit": "c71406807b545f4a2c17310197a8c88b976f338d" },
23+
"plenary.nvim": { "branch": "master", "commit": "366b0837486f60ae0e7550c15de8ff66d057c4cd" },
24+
"substitute.nvim": { "branch": "main", "commit": "17ffaeb5a1dc2dbef39cf0865d8a4b6000836714" },
25+
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
26+
"telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
27+
"vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
28+
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
29+
"vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
30+
"which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
31+
}

0 commit comments

Comments
 (0)