Merge branch 'nvim-lua:master' into master
This commit is contained in:
		
						commit
						43f74be2b7
					
				|  | @ -1,6 +1,6 @@ | ||||||
| # Check Lua Formatting | # Check Lua Formatting | ||||||
| name: Check Lua Formatting | name: Check Lua Formatting | ||||||
| on: pull_request | on: pull_request_target | ||||||
| 
 | 
 | ||||||
| jobs: | jobs: | ||||||
|   stylua-check: |   stylua-check: | ||||||
|  | @ -9,6 +9,8 @@ jobs: | ||||||
|     steps: |     steps: | ||||||
|       - name: Checkout Code |       - name: Checkout Code | ||||||
|         uses: actions/checkout@v2 |         uses: actions/checkout@v2 | ||||||
|  |         with: | ||||||
|  |           ref: ${{ github.event.pull_request.head.sha }} | ||||||
|       - name: Stylua Check |       - name: Stylua Check | ||||||
|         uses: JohnnyMorganz/stylua-action@v3 |         uses: JohnnyMorganz/stylua-action@v3 | ||||||
|         with: |         with: | ||||||
|  |  | ||||||
|  | @ -71,6 +71,10 @@ If you would prefer to hide this step and run the plugin sync from the command l | ||||||
| nvim --headless "+Lazy! sync" +qa | nvim --headless "+Lazy! sync" +qa | ||||||
| ``` | ``` | ||||||
| 
 | 
 | ||||||
|  | ### Introduction | ||||||
|  | 
 | ||||||
|  | To get started, see [Effective Neovim: Instant IDE](https://youtu.be/stqUbv-5u2s), covering the previous version. Note: The install via init.lua is outdated, please follow the install instructions in this file instead. An updated video is coming soon. | ||||||
|  | 
 | ||||||
| ### Recommended Steps | ### Recommended Steps | ||||||
| 
 | 
 | ||||||
| [Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) this repo (so that you have your own copy that you can modify) and then installing you can install to your machine using the methods above. | [Fork](https://docs.github.com/en/get-started/quickstart/fork-a-repo) this repo (so that you have your own copy that you can modify) and then installing you can install to your machine using the methods above. | ||||||
|  | @ -163,9 +167,6 @@ Each PR, especially those which increase the line count, should have a descripti | ||||||
|     When you run Neovim using `nvim-kickstart` alias it will use the alternative config directory and the matching local directory `~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim distribution that you would like to try out. |     When you run Neovim using `nvim-kickstart` alias it will use the alternative config directory and the matching local directory `~/.local/share/nvim-kickstart`. You can apply this approach to any Neovim distribution that you would like to try out. | ||||||
| * What if I want to "uninstall" this configuration: | * What if I want to "uninstall" this configuration: | ||||||
|   * See [lazy.nvim uninstall](https://github.com/folke/lazy.nvim#-uninstalling) information |   * See [lazy.nvim uninstall](https://github.com/folke/lazy.nvim#-uninstalling) information | ||||||
| * Are there any cool videos about this plugin? |  | ||||||
|   * Current iteration of kickstart (coming soon) |  | ||||||
|   * Here is one about the previous iteration of kickstart: [video introduction to Kickstart.nvim](https://youtu.be/stqUbv-5u2s). Note the install via init.lua no longer works as specified. Please follow the install instructions in this file instead as they're up to date. |  | ||||||
| * Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files? | * Why is the kickstart `init.lua` a single file? Wouldn't it make sense to split it into multiple files? | ||||||
|   * The main purpose of kickstart is to serve as a teaching tool and a reference |   * The main purpose of kickstart is to serve as a teaching tool and a reference | ||||||
|     configuration that someone can easily `git clone` as a basis for their own. |     configuration that someone can easily `git clone` as a basis for their own. | ||||||
|  |  | ||||||
							
								
								
									
										4
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										4
									
								
								init.lua
								
								
								
								
							|  | @ -86,7 +86,7 @@ require('lazy').setup({ | ||||||
|     'neovim/nvim-lspconfig', |     'neovim/nvim-lspconfig', | ||||||
|     dependencies = { |     dependencies = { | ||||||
|       -- Automatically install LSPs to stdpath for neovim |       -- Automatically install LSPs to stdpath for neovim | ||||||
|       'williamboman/mason.nvim', |       { 'williamboman/mason.nvim', config = true }, | ||||||
|       'williamboman/mason-lspconfig.nvim', |       'williamboman/mason-lspconfig.nvim', | ||||||
| 
 | 
 | ||||||
|       -- Useful status updates for LSP |       -- Useful status updates for LSP | ||||||
|  | @ -657,7 +657,7 @@ cmp.setup { | ||||||
|   mapping = cmp.mapping.preset.insert { |   mapping = cmp.mapping.preset.insert { | ||||||
|     ['<C-n>'] = cmp.mapping.select_next_item(), |     ['<C-n>'] = cmp.mapping.select_next_item(), | ||||||
|     ['<C-p>'] = cmp.mapping.select_prev_item(), |     ['<C-p>'] = cmp.mapping.select_prev_item(), | ||||||
|     ['<C-d>'] = cmp.mapping.scroll_docs(-4), |     ['<C-b>'] = cmp.mapping.scroll_docs(-4), | ||||||
|     ['<C-f>'] = cmp.mapping.scroll_docs(4), |     ['<C-f>'] = cmp.mapping.scroll_docs(4), | ||||||
|     ['<C-Space>'] = cmp.mapping.complete {}, |     ['<C-Space>'] = cmp.mapping.complete {}, | ||||||
|     ['<CR>'] = cmp.mapping.confirm { |     ['<CR>'] = cmp.mapping.confirm { | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue