Merge pull request #1 from micaiah-effiong/update-from-upstream
update from upstream
This commit is contained in:
		
						commit
						3e30344843
					
				|  | @ -3,4 +3,4 @@ line_endings = "Unix" | ||||||
| indent_type = "Spaces" | indent_type = "Spaces" | ||||||
| indent_width = 2 | indent_width = 2 | ||||||
| quote_style = "AutoPreferSingle" | quote_style = "AutoPreferSingle" | ||||||
| no_call_parentheses = true | call_parentheses = "None" | ||||||
|  |  | ||||||
|  | @ -1,5 +1,7 @@ | ||||||
| # kickstart.nvim | # kickstart.nvim | ||||||
| 
 | 
 | ||||||
|  | https://github.com/kdheepak/kickstart.nvim/assets/1813121/f3ff9a2b-c31f-44df-a4fa-8a0d7b17cf7b | ||||||
|  | 
 | ||||||
| ### Introduction | ### Introduction | ||||||
| 
 | 
 | ||||||
| A starting point for Neovim that is: | A starting point for Neovim that is: | ||||||
|  | @ -9,7 +11,7 @@ A starting point for Neovim that is: | ||||||
| * Documented | * Documented | ||||||
| * Modular | * Modular | ||||||
| 
 | 
 | ||||||
| This repo is meant to be used as by **YOU** to begin your Neovim journey; remove the things you don't use and add what you miss. | This repo is meant to be used by **YOU** to begin your Neovim journey; remove the things you don't use and add what you miss. | ||||||
| 
 | 
 | ||||||
| Kickstart.nvim targets *only* the latest ['stable'](https://github.com/neovim/neovim/releases/tag/stable) and latest ['nightly'](https://github.com/neovim/neovim/releases/tag/nightly) of Neovim. If you are experiencing issues, please make sure you have the latest versions. | Kickstart.nvim targets *only* the latest ['stable'](https://github.com/neovim/neovim/releases/tag/stable) and latest ['nightly'](https://github.com/neovim/neovim/releases/tag/nightly) of Neovim. If you are experiencing issues, please make sure you have the latest versions. | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										9
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										9
									
								
								init.lua
								
								
								
								
							|  | @ -91,7 +91,7 @@ require('lazy').setup({ | ||||||
| 
 | 
 | ||||||
|       -- Useful status updates for LSP |       -- Useful status updates for LSP | ||||||
|       -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` |       -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})` | ||||||
|       { 'j-hui/fidget.nvim',       opts = {} }, |       { 'j-hui/fidget.nvim', tag = 'legacy', opts = {} }, | ||||||
| 
 | 
 | ||||||
|       -- Additional lua configuration, makes nvim stuff amazing! |       -- Additional lua configuration, makes nvim stuff amazing! | ||||||
|       'folke/neodev.nvim', |       'folke/neodev.nvim', | ||||||
|  | @ -205,9 +205,10 @@ require('lazy').setup({ | ||||||
|   -- require 'kickstart.plugins.autoformat', |   -- require 'kickstart.plugins.autoformat', | ||||||
|   -- require 'kickstart.plugins.debug', |   -- require 'kickstart.plugins.debug', | ||||||
| 
 | 
 | ||||||
|   -- NOTE: The import below automatically adds your own plugins, configuration, etc from `lua/custom/plugins/*.lua` |   -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua` | ||||||
|   --    You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping |   --    You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping | ||||||
|   --    up-to-date with whatever is in the kickstart repo. |   --    up-to-date with whatever is in the kickstart repo. | ||||||
|  |   --    Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. | ||||||
|   -- |   -- | ||||||
|   --    For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins |   --    For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins | ||||||
|   { import = 'custom.plugins' }, |   { import = 'custom.plugins' }, | ||||||
|  | @ -237,7 +238,7 @@ vim.o.breakindent = true | ||||||
| -- Save undo history | -- Save undo history | ||||||
| vim.o.undofile = true | vim.o.undofile = true | ||||||
| 
 | 
 | ||||||
| -- Case insensitive searching UNLESS /C or capital in search | -- Case-insensitive searching UNLESS \C or capital in search | ||||||
| vim.o.ignorecase = true | vim.o.ignorecase = true | ||||||
| vim.o.smartcase = true | vim.o.smartcase = true | ||||||
| 
 | 
 | ||||||
|  | @ -320,7 +321,7 @@ require('nvim-treesitter.configs').setup { | ||||||
|   auto_install = false, |   auto_install = false, | ||||||
| 
 | 
 | ||||||
|   highlight = { enable = true }, |   highlight = { enable = true }, | ||||||
|   indent = { enable = true, disable = { 'python' } }, |   indent = { enable = true }, | ||||||
|   incremental_selection = { |   incremental_selection = { | ||||||
|     enable = true, |     enable = true, | ||||||
|     keymaps = { |     keymaps = { | ||||||
|  |  | ||||||
|  | @ -1,9 +1,8 @@ | ||||||
| -- for tablines | -- for tablines | ||||||
| 
 | 
 | ||||||
| 
 |  | ||||||
| return { | return { | ||||||
| 	'akinsho/bufferline.nvim', | 	'akinsho/bufferline.nvim', | ||||||
| 	tag = "v3.*", | 	version = "*", | ||||||
| 	dependencies = { 'nvim-tree/nvim-web-devicons' }, | 	dependencies = { 'nvim-tree/nvim-web-devicons' }, | ||||||
| 	config = function() | 	config = function() | ||||||
| 		require('bufferline').setup { | 		require('bufferline').setup { | ||||||
|  |  | ||||||
|  | @ -43,14 +43,14 @@ return { | ||||||
|     } |     } | ||||||
| 
 | 
 | ||||||
|     -- Basic debugging keymaps, feel free to change to your liking! |     -- Basic debugging keymaps, feel free to change to your liking! | ||||||
|     vim.keymap.set('n', '<F5>', dap.continue) |     vim.keymap.set('n', '<F5>', dap.continue, { desc = 'Debug: Start/Continue' }) | ||||||
|     vim.keymap.set('n', '<F1>', dap.step_into) |     vim.keymap.set('n', '<F1>', dap.step_into, { desc = 'Debug: Step Into' }) | ||||||
|     vim.keymap.set('n', '<F2>', dap.step_over) |     vim.keymap.set('n', '<F2>', dap.step_over, { desc = 'Debug: Step Over' }) | ||||||
|     vim.keymap.set('n', '<F3>', dap.step_out) |     vim.keymap.set('n', '<F3>', dap.step_out, { desc = 'Debug: Step Out' }) | ||||||
|     vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint) |     vim.keymap.set('n', '<leader>b', dap.toggle_breakpoint, { desc = 'Debug: Toggle Breakpoint' }) | ||||||
|     vim.keymap.set('n', '<leader>B', function() |     vim.keymap.set('n', '<leader>B', function() | ||||||
|       dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') |       dap.set_breakpoint(vim.fn.input 'Breakpoint condition: ') | ||||||
|     end) |     end, { desc = 'Debug: Set Breakpoint' }) | ||||||
| 
 | 
 | ||||||
|     -- Dap UI setup |     -- Dap UI setup | ||||||
|     -- For more information, see |:help nvim-dap-ui| |     -- For more information, see |:help nvim-dap-ui| | ||||||
|  | @ -69,12 +69,13 @@ return { | ||||||
|           step_back = 'b', |           step_back = 'b', | ||||||
|           run_last = '▶▶', |           run_last = '▶▶', | ||||||
|           terminate = '⏹', |           terminate = '⏹', | ||||||
|           disconnect = "⏏", |           disconnect = '⏏', | ||||||
|         }, |         }, | ||||||
|       }, |       }, | ||||||
|     } |     } | ||||||
|     -- toggle to see last session result. Without this ,you can't see session output in case of unhandled exception. | 
 | ||||||
|     vim.keymap.set("n", "<F7>", dapui.toggle) |     -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception. | ||||||
|  |     vim.keymap.set('n', '<F7>', dapui.toggle, { desc = 'Debug: See last session result.' }) | ||||||
| 
 | 
 | ||||||
|     dap.listeners.after.event_initialized['dapui_config'] = dapui.open |     dap.listeners.after.event_initialized['dapui_config'] = dapui.open | ||||||
|     dap.listeners.before.event_terminated['dapui_config'] = dapui.close |     dap.listeners.before.event_terminated['dapui_config'] = dapui.close | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue