@@ -29,7 +29,7 @@ What is Kickstart?
2929 what your configuration is doing, and modify it to suit your needs.
3030
3131 Once you've done that, you can start exploring, configuring and tinkering to
32- make Neovim your own! That might mean leaving kickstart just the way it is for a while
32+ make Neovim your own! That might mean leaving Kickstart just the way it is for a while
3333 or immediately breaking it into modular pieces. It's up to you!
3434
3535 If you don't know anything about Lua, I recommend taking some time to read through
@@ -51,32 +51,32 @@ Kickstart Guide:
5151 - Tutor
5252 - <enter key>
5353
54- (If you already know how the Neovim basics, you can skip this step)
54+ (If you already know the Neovim basics, you can skip this step. )
5555
5656 Once you've completed that, you can continue working through **AND READING** the rest
57- of the kickstart init.lua
57+ of the kickstart init.lua.
5858
5959 Next, run AND READ `:help`.
6060 This will open up a help window with some basic information
6161 about reading, navigating and searching the builtin help documentation.
6262
6363 This should be the first place you go to look when you're stuck or confused
64- with something. It's one of my favorite neovim features.
64+ with something. It's one of my favorite Neovim features.
6565
6666 MOST IMPORTANTLY, we provide a keymap "<space>sh" to [s]earch the [h]elp documentation,
67- which is very useful when you're not sure exactly what you're looking for.
67+ which is very useful when you're not exactly sure of what you're looking for.
6868
6969 I have left several `:help X` comments throughout the init.lua
7070 These are hints about where to find more information about the relevant settings,
71- plugins or neovim features used in kickstart .
71+ plugins or Neovim features used in Kickstart .
7272
7373 NOTE: Look for lines like this
7474
75- Throughout the file. These are for you, the reader, to help understand what is happening.
75+ Throughout the file. These are for you, the reader, to help you understand what is happening.
7676 Feel free to delete them once you know what you're doing, but they should serve as a guide
77- for when you are first encountering a few different constructs in your nvim config.
77+ for when you are first encountering a few different constructs in your Neovim config.
7878
79- If you experience any errors while trying to install kickstart, run `:checkhealth` for more info
79+ If you experience any errors while trying to install kickstart, run `:checkhealth` for more info.
8080
8181I hope you enjoy your Neovim journey,
8282- TJ
@@ -100,14 +100,14 @@ vim.g.have_nerd_font = false
100100
101101-- Make line numbers default
102102vim .opt .number = true
103- -- You can also add relative line numbers, for help with jumping.
103+ -- You can also add relative line numbers, to help with jumping.
104104-- Experiment for yourself to see if you like it!
105105-- vim.opt.relativenumber = true
106106
107107-- Enable mouse mode, can be useful for resizing splits for example!
108108vim .opt .mouse = ' a'
109109
110- -- Don't show the mode, since it's already in status line
110+ -- Don't show the mode, since it's already in the status line
111111vim .opt .showmode = false
112112
113113-- Sync clipboard between OS and Neovim.
@@ -121,7 +121,7 @@ vim.opt.breakindent = true
121121-- Save undo history
122122vim .opt .undofile = true
123123
124- -- Case-insensitive searching UNLESS \C or capital in search
124+ -- Case-insensitive searching UNLESS \C or one or more capital letters in the search term
125125vim .opt .ignorecase = true
126126vim .opt .smartcase = true
127127
@@ -139,7 +139,7 @@ vim.opt.timeoutlen = 300
139139vim .opt .splitright = true
140140vim .opt .splitbelow = true
141141
142- -- Sets how neovim will display certain whitespace in the editor.
142+ -- Sets how neovim will display certain whitespace characters in the editor.
143143-- See `:help 'list'`
144144-- and `:help 'listchars'`
145145vim .opt .list = true
@@ -220,7 +220,7 @@ vim.opt.rtp:prepend(lazypath)
220220--
221221-- You can press `?` in this menu for help. Use `:q` to close the window
222222--
223- -- To update plugins, you can run
223+ -- To update plugins you can run
224224-- :Lazy update
225225--
226226-- NOTE: Here is where you install your plugins.
@@ -241,7 +241,7 @@ require('lazy').setup({
241241 { ' numToStr/Comment.nvim' , opts = {} },
242242
243243 -- Here is a more advanced example where we pass configuration
244- -- options to `gitsigns.nvim`. This is equivalent to the following lua :
244+ -- options to `gitsigns.nvim`. This is equivalent to the following Lua :
245245 -- require('gitsigns').setup({ ... })
246246 --
247247 -- See `:help gitsigns` to understand what the configuration keys do
@@ -258,7 +258,7 @@ require('lazy').setup({
258258 },
259259 },
260260
261- -- NOTE: Plugins can also be configured to run lua code when they are loaded.
261+ -- NOTE: Plugins can also be configured to run Lua code when they are loaded.
262262 --
263263 -- This is often very useful to both group configuration, as well as handle
264264 -- lazy loading plugins that don't need to be loaded immediately at startup.
@@ -303,7 +303,7 @@ require('lazy').setup({
303303 branch = ' 0.1.x' ,
304304 dependencies = {
305305 ' nvim-lua/plenary.nvim' ,
306- { -- If encountering errors, see telescope-fzf-native README for install instructions
306+ { -- If encountering errors, see telescope-fzf-native README for installation instructions
307307 ' nvim-telescope/telescope-fzf-native.nvim' ,
308308
309309 -- `build` is used to run some command when the plugin is installed/updated.
@@ -326,19 +326,19 @@ require('lazy').setup({
326326 -- it can fuzzy find! It's more than just a "file finder", it can search
327327 -- many different aspects of Neovim, your workspace, LSP, and more!
328328 --
329- -- The easiest way to use telescope , is to start by doing something like:
329+ -- The easiest way to use Telescope , is to start by doing something like:
330330 -- :Telescope help_tags
331331 --
332332 -- After running this command, a window will open up and you're able to
333- -- type in the prompt window. You'll see a list of help_tags options and
333+ -- type in the prompt window. You'll see a list of ` help_tags` options and
334334 -- a corresponding preview of the help.
335335 --
336- -- Two important keymaps to use while in telescope are:
336+ -- Two important keymaps to use while in Telescope are:
337337 -- - Insert mode: <c-/>
338338 -- - Normal mode: ?
339339 --
340340 -- This opens a window that shows you all of the keymaps for the current
341- -- telescope picker. This is really useful to discover what Telescope can
341+ -- Telescope picker. This is really useful to discover what Telescope can
342342 -- do as well as how to actually do it!
343343
344344 -- [[ Configure Telescope ]]
@@ -360,7 +360,7 @@ require('lazy').setup({
360360 },
361361 }
362362
363- -- Enable telescope extensions, if they are installed
363+ -- Enable Telescope extensions if they are installed
364364 pcall (require (' telescope' ).load_extension , ' fzf' )
365365 pcall (require (' telescope' ).load_extension , ' ui-select' )
366366
@@ -379,14 +379,14 @@ require('lazy').setup({
379379
380380 -- Slightly advanced example of overriding default behavior and theme
381381 vim .keymap .set (' n' , ' <leader>/' , function ()
382- -- You can pass additional configuration to telescope to change theme, layout, etc.
382+ -- You can pass additional configuration to Telescope to change the theme, layout, etc.
383383 builtin .current_buffer_fuzzy_find (require (' telescope.themes' ).get_dropdown {
384384 winblend = 10 ,
385385 previewer = false ,
386386 })
387387 end , { desc = ' [/] Fuzzily search in current buffer' })
388388
389- -- Also possible to pass additional configuration options.
389+ -- It's also possible to pass additional configuration options.
390390 -- See `:help telescope.builtin.live_grep()` for information about particular keys
391391 vim .keymap .set (' n' , ' <leader>s/' , function ()
392392 builtin .live_grep {
@@ -395,7 +395,7 @@ require('lazy').setup({
395395 }
396396 end , { desc = ' [S]earch [/] in Open Files' })
397397
398- -- Shortcut for searching your neovim configuration files
398+ -- Shortcut for searching your Neovim configuration files
399399 vim .keymap .set (' n' , ' <leader>sn' , function ()
400400 builtin .find_files { cwd = vim .fn .stdpath ' config' }
401401 end , { desc = ' [S]earch [N]eovim files' })
@@ -405,7 +405,7 @@ require('lazy').setup({
405405 { -- LSP Configuration & Plugins
406406 ' neovim/nvim-lspconfig' ,
407407 dependencies = {
408- -- Automatically install LSPs and related tools to stdpath for neovim
408+ -- Automatically install LSPs and related tools to stdpath for Neovim
409409 ' williamboman/mason.nvim' ,
410410 ' williamboman/mason-lspconfig.nvim' ,
411411 ' WhoIsSethDaniel/mason-tool-installer.nvim' ,
@@ -419,15 +419,15 @@ require('lazy').setup({
419419 { ' folke/neodev.nvim' , opts = {} },
420420 },
421421 config = function ()
422- -- Brief Aside : **What is LSP?**
422+ -- Brief aside : **What is LSP?**
423423 --
424- -- LSP is an acronym you've probably heard, but might not understand what it is.
424+ -- LSP is an initialism you've probably heard, but might not understand what it is.
425425 --
426426 -- LSP stands for Language Server Protocol. It's a protocol that helps editors
427427 -- and language tooling communicate in a standardized fashion.
428428 --
429429 -- In general, you have a "server" which is some tool built to understand a particular
430- -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc). These Language Servers
430+ -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc. ). These Language Servers
431431 -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone
432432 -- processes that communicate with some "client" - in this case, Neovim!
433433 --
@@ -451,9 +451,8 @@ require('lazy').setup({
451451 vim .api .nvim_create_autocmd (' LspAttach' , {
452452 group = vim .api .nvim_create_augroup (' kickstart-lsp-attach' , { clear = true }),
453453 callback = function (event )
454- -- NOTE: Remember that lua is a real programming language, and as such it is possible
455- -- to define small helper and utility functions so you don't have to repeat yourself
456- -- many times.
454+ -- NOTE: Remember that Lua is a real programming language, and as such it is possible
455+ -- to define small helper and utility functions so you don't have to repeat yourself.
457456 --
458457 -- In this case, we create a function that lets us more easily define mappings specific
459458 -- for LSP related items. It sets the mode, buffer and description for us each time.
@@ -482,11 +481,11 @@ require('lazy').setup({
482481 -- Symbols are things like variables, functions, types, etc.
483482 map (' <leader>ds' , require (' telescope.builtin' ).lsp_document_symbols , ' [D]ocument [S]ymbols' )
484483
485- -- Fuzzy find all the symbols in your current workspace
486- -- Similar to document symbols, except searches over your whole project.
484+ -- Fuzzy find all the symbols in your current workspace.
485+ -- Similar to document symbols, except searches over your entire project.
487486 map (' <leader>ws' , require (' telescope.builtin' ).lsp_dynamic_workspace_symbols , ' [W]orkspace [S]ymbols' )
488487
489- -- Rename the variable under your cursor
488+ -- Rename the variable under your cursor.
490489 -- Most Language Servers support renaming across files, etc.
491490 map (' <leader>rn' , vim .lsp .buf .rename , ' [R]e[n]ame' )
492491
@@ -495,11 +494,11 @@ require('lazy').setup({
495494 map (' <leader>ca' , vim .lsp .buf .code_action , ' [C]ode [A]ction' )
496495
497496 -- Opens a popup that displays documentation about the word under your cursor
498- -- See `:help K` for why this keymap
497+ -- See `:help K` for why this keymap.
499498 map (' K' , vim .lsp .buf .hover , ' Hover Documentation' )
500499
501500 -- WARN: This is not Goto Definition, this is Goto Declaration.
502- -- For example, in C this would take you to the header
501+ -- For example, in C this would take you to the header.
503502 map (' gD' , vim .lsp .buf .declaration , ' [G]oto [D]eclaration' )
504503
505504 -- The following two autocommands are used to highlight references of the
@@ -523,7 +522,7 @@ require('lazy').setup({
523522 })
524523
525524 -- LSP servers and clients are able to communicate to each other what features they support.
526- -- By default, Neovim doesn't support everything that is in the LSP Specification .
525+ -- By default, Neovim doesn't support everything that is in the LSP specification .
527526 -- When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
528527 -- So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
529528 local capabilities = vim .lsp .protocol .make_client_capabilities ()
@@ -573,14 +572,14 @@ require('lazy').setup({
573572 -- other tools, you can run
574573 -- :Mason
575574 --
576- -- You can press `g?` for help in this menu
575+ -- You can press `g?` for help in this menu.
577576 require (' mason' ).setup ()
578577
579578 -- You can add other tools here that you want Mason to install
580579 -- for you, so that they are available from within Neovim.
581580 local ensure_installed = vim .tbl_keys (servers or {})
582581 vim .list_extend (ensure_installed , {
583- ' stylua' , -- Used to format lua code
582+ ' stylua' , -- Used to format Lua code
584583 })
585584 require (' mason-tool-installer' ).setup { ensure_installed = ensure_installed }
586585
@@ -633,9 +632,9 @@ require('lazy').setup({
633632 {
634633 ' L3MON4D3/LuaSnip' ,
635634 build = (function ()
636- -- Build Step is needed for regex support in snippets
637- -- This step is not supported in many windows environments
638- -- Remove the below condition to re-enable on windows
635+ -- Build Step is needed for regex support in snippets.
636+ -- This step is not supported in many windows environments.
637+ -- Remove the below condition to re-enable on windows.
639638 if vim .fn .has ' win32' == 1 or vim .fn .executable ' make' == 0 then
640639 return
641640 end
@@ -685,7 +684,7 @@ require('lazy').setup({
685684 -- Select the [p]revious item
686685 [' <C-p>' ] = cmp .mapping .select_prev_item (),
687686
688- -- scroll the documentation window [b]ack / [f]orward
687+ -- Scroll the documentation window [b]ack / [f]orward
689688 [' <C-b>' ] = cmp .mapping .scroll_docs (- 4 ),
690689 [' <C-f>' ] = cmp .mapping .scroll_docs (4 ),
691690
@@ -718,7 +717,7 @@ require('lazy').setup({
718717 end
719718 end , { ' i' , ' s' }),
720719
721- -- For more advanced luasnip keymaps (e.g. selecting choice nodes, expansion) see:
720+ -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see:
722721 -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps
723722 },
724723 sources = {
@@ -732,18 +731,18 @@ require('lazy').setup({
732731
733732 { -- You can easily change to a different colorscheme.
734733 -- Change the name of the colorscheme plugin below, and then
735- -- change the command in the config to whatever the name of that colorscheme is
734+ -- change the command in the config to whatever the name of that colorscheme is.
736735 --
737- -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`
736+ -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
738737 ' folke/tokyonight.nvim' ,
739- priority = 1000 , -- make sure to load this before all the other start plugins
738+ priority = 1000 , -- Make sure to load this before all the other start plugins.
740739 init = function ()
741740 -- Load the colorscheme here.
742741 -- Like many other themes, this one has different styles, and you could load
743742 -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
744743 vim .cmd .colorscheme ' tokyonight-night'
745744
746- -- You can configure highlights by doing something like
745+ -- You can configure highlights by doing something like:
747746 vim .cmd .hi ' Comment gui=none'
748747 end ,
749748 },
@@ -788,7 +787,6 @@ require('lazy').setup({
788787 -- Check out: https://github.com/echasnovski/mini.nvim
789788 end ,
790789 },
791-
792790 { -- Highlight, edit, and navigate code
793791 ' nvim-treesitter/nvim-treesitter' ,
794792 build = ' :TSUpdate' ,
@@ -822,11 +820,11 @@ require('lazy').setup({
822820
823821 -- The following two comments only work if you have downloaded the kickstart repo, not just copy pasted the
824822 -- init.lua. If you want these files, they are in the repository, so you can just download them and
825- -- put them in the right spots if you want .
823+ -- place them in the correct locations .
826824
827- -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for kickstart
825+ -- NOTE: Next step on your Neovim journey: Add/Configure additional plugins for Kickstart
828826 --
829- -- Here are some example plugins that I've included in the kickstart repository.
827+ -- Here are some example plugins that I've included in the Kickstart repository.
830828 -- Uncomment any of the lines below to enable them (you will need to restart nvim).
831829 --
832830 -- require 'kickstart.plugins.debug',
@@ -841,8 +839,8 @@ require('lazy').setup({
841839 -- { import = 'custom.plugins' },
842840}, {
843841 ui = {
844- -- If you have a Nerd Font, set icons to an empty table which will use the
845- -- default lazy.nvim defined Nerd Font icons otherwise define a unicode icons table
842+ -- If you are using a Nerd Font: set icons to an empty table which will use the
843+ -- default lazy.nvim defined Nerd Font icons, otherwise define a unicode icons table
846844 icons = vim .g .have_nerd_font and {} or {
847845 cmd = ' ⌘' ,
848846 config = ' 🛠' ,
0 commit comments