update
This commit is contained in:
		
							parent
							
								
									464fc8ac81
								
							
						
					
					
						commit
						7ca0c57cf7
					
				
							
								
								
									
										12
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										12
									
								
								init.lua
								
								
								
								
							|  | @ -217,9 +217,6 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then | ||||||
| end ---@diagnostic disable-next-line: undefined-field | end ---@diagnostic disable-next-line: undefined-field | ||||||
| vim.opt.rtp:prepend(lazypath) | vim.opt.rtp:prepend(lazypath) | ||||||
| 
 | 
 | ||||||
| require 'custom.keymaps' |  | ||||||
| require 'custom.options' |  | ||||||
| 
 |  | ||||||
| -- [[ Configure and install plugins ]] | -- [[ Configure and install plugins ]] | ||||||
| -- | -- | ||||||
| --  To check the current status of your plugins, run | --  To check the current status of your plugins, run | ||||||
|  | @ -621,7 +618,7 @@ require('lazy').setup({ | ||||||
|       local servers = { |       local servers = { | ||||||
|         -- clangd = {}, |         -- clangd = {}, | ||||||
|         -- gopls = {}, |         -- gopls = {}, | ||||||
|         pyright = {}, |         pylsp = {}, | ||||||
|         -- rust_analyzer = {}, |         -- rust_analyzer = {}, | ||||||
|         -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs |         -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs | ||||||
|         -- |         -- | ||||||
|  | @ -661,6 +658,8 @@ require('lazy').setup({ | ||||||
|       local ensure_installed = vim.tbl_keys(servers or {}) |       local ensure_installed = vim.tbl_keys(servers or {}) | ||||||
|       vim.list_extend(ensure_installed, { |       vim.list_extend(ensure_installed, { | ||||||
|         'stylua', -- Used to format Lua code |         'stylua', -- Used to format Lua code | ||||||
|  |         'pylsp', | ||||||
|  |         'black', | ||||||
|       }) |       }) | ||||||
|       require('mason-tool-installer').setup { ensure_installed = ensure_installed } |       require('mason-tool-installer').setup { ensure_installed = ensure_installed } | ||||||
| 
 | 
 | ||||||
|  | @ -714,7 +713,7 @@ require('lazy').setup({ | ||||||
|       formatters_by_ft = { |       formatters_by_ft = { | ||||||
|         lua = { 'stylua' }, |         lua = { 'stylua' }, | ||||||
|         -- Conform can also run multiple formatters sequentially |         -- Conform can also run multiple formatters sequentially | ||||||
|         -- python = { "isort", "black" }, |         python = { 'isort', 'black' }, | ||||||
|         -- |         -- | ||||||
|         -- You can use 'stop_after_first' to run the first available formatter from the list |         -- You can use 'stop_after_first' to run the first available formatter from the list | ||||||
|         -- javascript = { "prettierd", "prettier", stop_after_first = true }, |         -- javascript = { "prettierd", "prettier", stop_after_first = true }, | ||||||
|  | @ -970,5 +969,8 @@ require('lazy').setup({ | ||||||
|   }, |   }, | ||||||
| }) | }) | ||||||
| 
 | 
 | ||||||
|  | require 'custom.keymaps' | ||||||
|  | require 'custom.options' | ||||||
|  | 
 | ||||||
| -- The line beneath this is called `modeline`. See `:help modeline` | -- The line beneath this is called `modeline`. See `:help modeline` | ||||||
| -- vim: ts=2 sts=2 sw=2 et | -- vim: ts=2 sts=2 sw=2 et | ||||||
|  |  | ||||||
|  | @ -1,2 +1,4 @@ | ||||||
|  | local builtin = require 'telescope.builtin' | ||||||
| vim.keymap.set('n', '<leader>sv', '<C-w>v', { desc = 'Open verticle split' }) | vim.keymap.set('n', '<leader>sv', '<C-w>v', { desc = 'Open verticle split' }) | ||||||
| vim.keymap.set('n', '<leader>sh', '<C-w>h', { desc = 'Open horizontal split' }) | vim.keymap.set('n', '<leader>sh', '<C-w>h', { desc = 'Open horizontal split' }) | ||||||
|  | vim.keymap.set('n', '<C-p>', builtin.git_files, {}) | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue