tweak updated config
This commit is contained in:
		
							parent
							
								
									42c67dd74f
								
							
						
					
					
						commit
						b7dc63d25a
					
				|  | @ -1,13 +0,0 @@ | ||||||
| require("lualine").setup({ |  | ||||||
| 	options = { |  | ||||||
| 		theme = "tokyonight", |  | ||||||
| 		tabline = { |  | ||||||
| 			lualine_a = { "buffers" }, |  | ||||||
| 			lualine_b = { "branch" }, |  | ||||||
| 			lualine_c = { "filename" }, |  | ||||||
| 			lualine_x = {}, |  | ||||||
| 			lualine_y = {}, |  | ||||||
| 			lualine_z = { "tabs" }, |  | ||||||
| 		}, |  | ||||||
| 	}, |  | ||||||
| }) |  | ||||||
|  | @ -170,10 +170,10 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagn | ||||||
| vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' }) | vim.keymap.set('t', '<Esc><Esc>', '<C-\\><C-n>', { desc = 'Exit terminal mode' }) | ||||||
| 
 | 
 | ||||||
| -- TIP: Disable arrow keys in normal mode | -- TIP: Disable arrow keys in normal mode | ||||||
| -- vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>') | vim.keymap.set('n', '<left>', '<cmd>echo "Use h to move!!"<CR>') | ||||||
| -- vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>') | vim.keymap.set('n', '<right>', '<cmd>echo "Use l to move!!"<CR>') | ||||||
| -- vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>') | vim.keymap.set('n', '<up>', '<cmd>echo "Use k to move!!"<CR>') | ||||||
| -- vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>') | vim.keymap.set('n', '<down>', '<cmd>echo "Use j to move!!"<CR>') | ||||||
| 
 | 
 | ||||||
| -- Keybinds to make split navigation easier. | -- Keybinds to make split navigation easier. | ||||||
| --  Use CTRL+<hjkl> to switch between windows | --  Use CTRL+<hjkl> to switch between windows | ||||||
|  | @ -315,7 +315,7 @@ require('lazy').setup { | ||||||
|       -- Useful for getting pretty icons, but requires special font. |       -- Useful for getting pretty icons, but requires special font. | ||||||
|       --  If you already have a Nerd Font, or terminal set up with fallback fonts |       --  If you already have a Nerd Font, or terminal set up with fallback fonts | ||||||
|       --  you can enable this |       --  you can enable this | ||||||
|       -- { 'nvim-tree/nvim-web-devicons' } |       { 'nvim-tree/nvim-web-devicons' }, | ||||||
|     }, |     }, | ||||||
|     config = function() |     config = function() | ||||||
|       -- Telescope is a fuzzy finder that comes with a lot of different things that |       -- Telescope is a fuzzy finder that comes with a lot of different things that | ||||||
|  | @ -534,14 +534,14 @@ require('lazy').setup { | ||||||
|         -- clangd = {}, |         -- clangd = {}, | ||||||
|         -- gopls = {}, |         -- gopls = {}, | ||||||
|         -- pyright = {}, |         -- pyright = {}, | ||||||
|         -- 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 | ||||||
|         -- |         -- | ||||||
|         -- Some languages (like typescript) have entire language plugins that can be useful: |         -- Some languages (like typescript) have entire language plugins that can be useful: | ||||||
|         --    https://github.com/pmizio/typescript-tools.nvim |         --    https://github.com/pmizio/typescript-tools.nvim | ||||||
|         -- |         -- | ||||||
|         -- But for many setups, the LSP (`tsserver`) will work just fine |         -- But for many setups, the LSP (`tsserver`) will work just fine | ||||||
|         -- tsserver = {}, |         tsserver = {}, | ||||||
|         -- |         -- | ||||||
| 
 | 
 | ||||||
|         lua_ls = { |         lua_ls = { | ||||||
|  | @ -652,7 +652,7 @@ require('lazy').setup { | ||||||
|       --    you can use this plugin to help you. It even has snippets |       --    you can use this plugin to help you. It even has snippets | ||||||
|       --    for various frameworks/libraries/etc. but you will have to |       --    for various frameworks/libraries/etc. but you will have to | ||||||
|       --    set up the ones that are useful for you. |       --    set up the ones that are useful for you. | ||||||
|       -- 'rafamadriz/friendly-snippets', |       'rafamadriz/friendly-snippets', | ||||||
|     }, |     }, | ||||||
|     config = function() |     config = function() | ||||||
|       -- See `:help cmp` |       -- See `:help cmp` | ||||||
|  | @ -806,7 +806,7 @@ require('lazy').setup { | ||||||
|   --  Here are some example plugins that I've included in the kickstart repository. |   --  Here are some example plugins that I've included in the kickstart repository. | ||||||
|   --  Uncomment any of the lines below to enable them (you will need to restart nvim). |   --  Uncomment any of the lines below to enable them (you will need to restart nvim). | ||||||
|   -- |   -- | ||||||
|   -- require 'kickstart.plugins.debug', |   require 'kickstart.plugins.debug', | ||||||
|   -- require 'kickstart.plugins.indent_line', |   -- require 'kickstart.plugins.indent_line', | ||||||
| 
 | 
 | ||||||
|   -- NOTE: The import below can automatically add 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` | ||||||
|  | @ -814,7 +814,7 @@ require('lazy').setup { | ||||||
|   -- |   -- | ||||||
|   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. |   --  Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. | ||||||
|   --    For additional information see: :help lazy.nvim-lazy.nvim-structuring-your-plugins |   --    For additional information see: :help lazy.nvim-lazy.nvim-structuring-your-plugins | ||||||
|   -- { import = 'custom.plugins' }, |   { import = 'custom.plugins' }, | ||||||
| } | } | ||||||
| 
 | 
 | ||||||
| -- The line beneath this is called `modeline`. See `:help modeline` | -- The line beneath this is called `modeline`. See `:help modeline` | ||||||
|  |  | ||||||
|  | @ -1,39 +1,39 @@ | ||||||
| { | { | ||||||
|   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, |   "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" }, | ||||||
|   "LuaSnip": { "branch": "master", "commit": "cdbf6f41381e5ee4810b4b09284b603d8f18365d" }, |   "LuaSnip": { "branch": "master", "commit": "f3b3d3446bcbfa62d638b1903ff00a78b2b730a1" }, | ||||||
|   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, |   "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" }, | ||||||
|   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, |   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" }, | ||||||
|   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, |   "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" }, | ||||||
|  |   "conform.nvim": { "branch": "master", "commit": "2a769b950526acf62a71de89b876d14862988ee5" }, | ||||||
|   "fidget.nvim": { "branch": "main", "commit": "60404ba67044c6ab01894dd5bf77bd64ea5e09aa" }, |   "fidget.nvim": { "branch": "main", "commit": "60404ba67044c6ab01894dd5bf77bd64ea5e09aa" }, | ||||||
|   "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, |   "friendly-snippets": { "branch": "main", "commit": "dcd4a586439a1c81357d5b9d26319ae218cc9479" }, | ||||||
|   "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, |   "git-worktree.nvim": { "branch": "master", "commit": "f247308e68dab9f1133759b05d944569ad054546" }, | ||||||
|   "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, |   "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" }, | ||||||
|   "lazy.nvim": { "branch": "main", "commit": "28126922c9b54e35a192ac415788f202c3944c9f" }, |   "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" }, | ||||||
|   "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" }, |  | ||||||
|   "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, |   "mason-lspconfig.nvim": { "branch": "main", "commit": "21d33d69a81f6351e5a5f49078b2e4f0075c8e73" }, | ||||||
|   "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, |   "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" }, | ||||||
|  |   "mason-tool-installer.nvim": { "branch": "main", "commit": "1212fb6082b7177dde17ea65e429e027835aeb40" }, | ||||||
|   "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, |   "mason.nvim": { "branch": "main", "commit": "3b5068f0fc565f337d67a2d315d935f574848ee7" }, | ||||||
|   "neodev.nvim": { "branch": "main", "commit": "3157f2e876fd6223d36cfa76bee4709247d62fa5" }, |   "mini.nvim": { "branch": "main", "commit": "7827793105685d8158812bbdab027d11aac19c24" }, | ||||||
|   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, |   "null-ls.nvim": { "branch": "main", "commit": "0010ea927ab7c09ef0ce9bf28c2b573fc302f5a7" }, | ||||||
|   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, |   "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" }, | ||||||
|   "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, |   "nvim-dap": { "branch": "master", "commit": "fc880e82059eb21c0fa896be60146e5f17680648" }, | ||||||
|   "nvim-dap-go": { "branch": "main", "commit": "64f73400761e2d19459e664a52ea478f3a4420e7" }, |   "nvim-dap-go": { "branch": "main", "commit": "64f73400761e2d19459e664a52ea478f3a4420e7" }, | ||||||
|   "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, |   "nvim-dap-ui": { "branch": "master", "commit": "9720eb5fa2f41988e8770f973cd11b76dd568a5d" }, | ||||||
|   "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, |   "nvim-dap-vscode-js": { "branch": "main", "commit": "03bd29672d7fab5e515fc8469b7d07cc5994bbf6" }, | ||||||
|   "nvim-lspconfig": { "branch": "master", "commit": "b1a11b042d015df5b8f7f33aa026e501b639c649" }, |   "nvim-lspconfig": { "branch": "master", "commit": "ec7d51a619049c7c597f469f81ea199db6794651" }, | ||||||
|   "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" }, |   "nvim-surround": { "branch": "main", "commit": "703ec63aa798e5e07d309b35e42def34bebe0174" }, | ||||||
|   "nvim-treesitter": { "branch": "master", "commit": "db12bd416e2764420047e4a5d6b96fe44e4377d5" }, |   "nvim-treesitter": { "branch": "master", "commit": "6e2b56cbe75ddf18e6efecee44bc3936d70b0b3e" }, | ||||||
|   "nvim-treesitter-textobjects": { "branch": "master", "commit": "7f00d94543f1fd37cab2afa2e9a6cd54e1c6b9ef" }, |   "nvim-web-devicons": { "branch": "master", "commit": "0bb67ef952ea3eb7b1bac9c011281471d99a27bc" }, | ||||||
|   "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" }, |  | ||||||
|   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, |   "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" }, | ||||||
|   "refactoring.nvim": { "branch": "master", "commit": "94444558fc651b7e36f39d86c518e44b4de15123" }, |   "refactoring.nvim": { "branch": "master", "commit": "1b593e7203b31c7bde3fa638e6869144698df3b6" }, | ||||||
|   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, |   "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, | ||||||
|   "telescope-live-grep-args.nvim": { "branch": "master", "commit": "20656efd7a0dbb4483290649c9671af14b0cfb0d" }, |   "telescope-live-grep-args.nvim": { "branch": "master", "commit": "20656efd7a0dbb4483290649c9671af14b0cfb0d" }, | ||||||
|  |   "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" }, | ||||||
|   "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, |   "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" }, | ||||||
|  |   "todo-comments.nvim": { "branch": "main", "commit": "833d8dd8b07eeda37a09e99460f72a02616935cb" }, | ||||||
|   "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, |   "tokyonight.nvim": { "branch": "main", "commit": "610179f7f12db3d08540b6cc61434db2eaecbcff" }, | ||||||
|   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, |   "trouble.nvim": { "branch": "main", "commit": "f1168feada93c0154ede4d1fe9183bf69bac54ea" }, | ||||||
|   "vim-fugitive": { "branch": "master", "commit": "2e88f14a585c014691904ba8fe39e6ea851c9422" }, |  | ||||||
|   "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" }, |  | ||||||
|   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, |   "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" }, | ||||||
|   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } |   "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" } | ||||||
| } | } | ||||||
|  | @ -1,68 +1,71 @@ | ||||||
| return { | return { | ||||||
|   { |   { | ||||||
| 		"ThePrimeagen/refactoring.nvim", |     'ThePrimeagen/refactoring.nvim', | ||||||
|     requires = { |     requires = { | ||||||
| 			{ "nvim-lua/plenary.nvim" }, |       { 'nvim-lua/plenary.nvim' }, | ||||||
| 			{ "nvim-treesitter/nvim-treesitter" }, |       { 'nvim-treesitter/nvim-treesitter' }, | ||||||
|     }, |     }, | ||||||
|     config = function() |     config = function() | ||||||
| 			require("refactoring").setup({}) |       require('refactoring').setup {} | ||||||
|     end, |     end, | ||||||
|   }, |   }, | ||||||
|   { |   { | ||||||
| 		"ThePrimeagen/git-worktree.nvim", |     'ThePrimeagen/git-worktree.nvim', | ||||||
|   }, |   }, | ||||||
|   { |   { | ||||||
| 		"folke/tokyonight.nvim", |     'folke/tokyonight.nvim', | ||||||
|     lazy = false, -- make sure we load this during startup if it is your main colorscheme |     lazy = false, -- make sure we load this during startup if it is your main colorscheme | ||||||
|     priority = 1000, -- make sure to load this before all the other start plugins |     priority = 1000, -- make sure to load this before all the other start plugins | ||||||
|     config = function() |     config = function() | ||||||
|       -- load the colorscheme here |       -- load the colorscheme here | ||||||
| 			vim.cmd([[colorscheme tokyonight]]) |       vim.cmd [[colorscheme tokyonight]] | ||||||
|     end, |     end, | ||||||
|   }, |   }, | ||||||
|   -- formatting & linting |   -- formatting & linting | ||||||
| 	"jose-elias-alvarez/null-ls.nvim", |   'jose-elias-alvarez/null-ls.nvim', | ||||||
|   --	use("jayp0521/mason-null-ls.nvim") |   --	use("jayp0521/mason-null-ls.nvim") | ||||||
|   { |   { | ||||||
| 		"kylechui/nvim-surround", |     'kylechui/nvim-surround', | ||||||
| 		version = "*", -- Use for stability; omit to use `main` branch for the latest features |     version = '*', -- Use for stability; omit to use `main` branch for the latest features | ||||||
| 		event = "VeryLazy", |     event = 'VeryLazy', | ||||||
|     config = function() |     config = function() | ||||||
| 			require("nvim-surround").setup({ |       require('nvim-surround').setup { | ||||||
|         -- Configuration here, or leave empty to use defaults |         -- Configuration here, or leave empty to use defaults | ||||||
| 			}) |       } | ||||||
|     end, |     end, | ||||||
|   }, |   }, | ||||||
|   { |   { | ||||||
| 		"folke/trouble.nvim", |     'folke/trouble.nvim', | ||||||
| 		requires = "nvim-tree/nvim-web-devicons", |     requires = 'nvim-tree/nvim-web-devicons', | ||||||
|     config = function() |     config = function() | ||||||
| 			require("trouble").setup({ |       require('trouble').setup { | ||||||
|         -- your configuration comes here |         -- your configuration comes here | ||||||
|         -- or leave it empty to use the default settings |         -- or leave it empty to use the default settings | ||||||
|         -- refer to the configuration section below |         -- refer to the configuration section below | ||||||
| 			}) |       } | ||||||
|     end, |     end, | ||||||
|   }, |   }, | ||||||
|   { |   { | ||||||
| 		"rafamadriz/friendly-snippets", |     'rafamadriz/friendly-snippets', | ||||||
|     config = function() |     config = function() | ||||||
| 			require("luasnip.loaders.from_vscode").lazy_load() |       require('luasnip.loaders.from_vscode').lazy_load() | ||||||
|     end, |     end, | ||||||
|   }, |   }, | ||||||
|   { |   { | ||||||
| 		"nvim-telescope/telescope.nvim", |     'nvim-telescope/telescope.nvim', | ||||||
|     dependencies = { |     dependencies = { | ||||||
|       { |       { | ||||||
| 				"nvim-telescope/telescope-live-grep-args.nvim", |         'nvim-telescope/telescope-live-grep-args.nvim', | ||||||
|         -- This will not install any breaking changes. |         -- This will not install any breaking changes. | ||||||
|         -- For major updates, this must be adjusted manually. |         -- For major updates, this must be adjusted manually. | ||||||
| 				version = "^1.0.0", |         version = '^1.0.0', | ||||||
|       }, |       }, | ||||||
|     }, |     }, | ||||||
|     config = function() |     config = function() | ||||||
| 			require("telescope").load_extension("live_grep_args") |       require('telescope').load_extension 'live_grep_args' | ||||||
| 		end |     end, | ||||||
| 	} |   }, | ||||||
|  |   -- Git related plugins | ||||||
|  |   'tpope/vim-fugitive', | ||||||
|  |   'tpope/vim-rhubarb', | ||||||
| } | } | ||||||
|  |  | ||||||
		Loading…
	
		Reference in New Issue