own changes
This commit is contained in:
		
							parent
							
								
									bbb6ddd003
								
							
						
					
					
						commit
						1675528498
					
				
							
								
								
									
										34
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										34
									
								
								init.lua
								
								
								
								
							| 
						 | 
					@ -44,6 +44,8 @@ P.S. You can delete this when you're done too. It's your config now :)
 | 
				
			||||||
vim.g.mapleader = ' '
 | 
					vim.g.mapleader = ' '
 | 
				
			||||||
vim.g.maplocalleader = ' '
 | 
					vim.g.maplocalleader = ' '
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.rnu = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- [[ Install `lazy.nvim` plugin manager ]]
 | 
					-- [[ Install `lazy.nvim` plugin manager ]]
 | 
				
			||||||
--    https://github.com/folke/lazy.nvim
 | 
					--    https://github.com/folke/lazy.nvim
 | 
				
			||||||
--    `:help lazy.nvim.txt` for more info
 | 
					--    `:help lazy.nvim.txt` for more info
 | 
				
			||||||
| 
						 | 
					@ -88,7 +90,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',       opts = {} },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      -- Additional lua configuration, makes nvim stuff amazing!
 | 
					      -- Additional lua configuration, makes nvim stuff amazing!
 | 
				
			||||||
      'folke/neodev.nvim',
 | 
					      'folke/neodev.nvim',
 | 
				
			||||||
| 
						 | 
					@ -113,7 +115,7 @@ require('lazy').setup({
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- Useful plugin to show you pending keybinds.
 | 
					  -- Useful plugin to show you pending keybinds.
 | 
				
			||||||
  { 'folke/which-key.nvim', opts = {} },
 | 
					  { 'folke/which-key.nvim',  opts = {} },
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    -- Adds git related signs to the gutter, as well as utilities for managing changes
 | 
					    -- Adds git related signs to the gutter, as well as utilities for managing changes
 | 
				
			||||||
    'lewis6991/gitsigns.nvim',
 | 
					    'lewis6991/gitsigns.nvim',
 | 
				
			||||||
| 
						 | 
					@ -189,19 +191,16 @@ require('lazy').setup({
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  --[[{
 | 
					  {
 | 
				
			||||||
    -- Theme inspired by Atom
 | 
					    -- Theme inspired by Atom
 | 
				
			||||||
    'navarasu/onedark.nvim',
 | 
					    'navarasu/onedark.nvim',
 | 
				
			||||||
    priority = 1000,
 | 
					    priority = 1000,
 | 
				
			||||||
    config = function()
 | 
					    config = function()
 | 
				
			||||||
      vim.cmd.colorscheme 'onedark'
 | 
					      require('onedark').setup {
 | 
				
			||||||
 | 
					        style = 'dark'
 | 
				
			||||||
 | 
					      }
 | 
				
			||||||
 | 
					      require('onedark').load()
 | 
				
			||||||
    end,
 | 
					    end,
 | 
				
			||||||
  },]]--
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  { "catppuccin/nvim", name = "catppuccin", priority = 1000,
 | 
					 | 
				
			||||||
    config = function()
 | 
					 | 
				
			||||||
      vim.cmd.colorscheme 'catppuccin'
 | 
					 | 
				
			||||||
    end
 | 
					 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
| 
						 | 
					@ -211,7 +210,7 @@ require('lazy').setup({
 | 
				
			||||||
    opts = {
 | 
					    opts = {
 | 
				
			||||||
      options = {
 | 
					      options = {
 | 
				
			||||||
        icons_enabled = false,
 | 
					        icons_enabled = false,
 | 
				
			||||||
        theme = 'catppuccin',
 | 
					        theme = 'onedark',
 | 
				
			||||||
        component_separators = '|',
 | 
					        component_separators = '|',
 | 
				
			||||||
        section_separators = '',
 | 
					        section_separators = '',
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
| 
						 | 
					@ -249,7 +248,6 @@ require('lazy').setup({
 | 
				
			||||||
      },
 | 
					      },
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					  },
 | 
				
			||||||
 | 
					 | 
				
			||||||
  {
 | 
					  {
 | 
				
			||||||
    -- Highlight, edit, and navigate code
 | 
					    -- Highlight, edit, and navigate code
 | 
				
			||||||
    'nvim-treesitter/nvim-treesitter',
 | 
					    'nvim-treesitter/nvim-treesitter',
 | 
				
			||||||
| 
						 | 
					@ -262,8 +260,8 @@ require('lazy').setup({
 | 
				
			||||||
  -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
 | 
					  -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
 | 
				
			||||||
  --       These are some example plugins that I've included in the kickstart repository.
 | 
					  --       These are some example plugins that I've included in the kickstart repository.
 | 
				
			||||||
  --       Uncomment any of the lines below to enable them.
 | 
					  --       Uncomment any of the lines below to enable them.
 | 
				
			||||||
  -- require 'kickstart.plugins.autoformat',
 | 
					  require 'kickstart.plugins.autoformat',
 | 
				
			||||||
  -- require 'kickstart.plugins.debug',
 | 
					  require 'kickstart.plugins.debug',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- 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`
 | 
				
			||||||
  --    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
 | 
				
			||||||
| 
						 | 
					@ -579,6 +577,14 @@ local servers = {
 | 
				
			||||||
  -- rust_analyzer = {},
 | 
					  -- rust_analyzer = {},
 | 
				
			||||||
  -- tsserver = {},
 | 
					  -- tsserver = {},
 | 
				
			||||||
  -- html = { filetypes = { 'html', 'twig', 'hbs'} },
 | 
					  -- html = { filetypes = { 'html', 'twig', 'hbs'} },
 | 
				
			||||||
 | 
					  csharp_ls = {
 | 
				
			||||||
 | 
					    filetypes = { 'csharp', 'cs' },
 | 
				
			||||||
 | 
					    settings = {
 | 
				
			||||||
 | 
					      csharp = {
 | 
				
			||||||
 | 
					        enableRoslynAnalyzers = true,
 | 
				
			||||||
 | 
					      },
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					  },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  lua_ls = {
 | 
					  lua_ls = {
 | 
				
			||||||
    Lua = {
 | 
					    Lua = {
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -1,31 +1,34 @@
 | 
				
			||||||
{
 | 
					{
 | 
				
			||||||
  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
 | 
					  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
 | 
				
			||||||
  "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
 | 
					  "LuaSnip": { "branch": "master", "commit": "2dbef19461198630b3d7c39f414d09fb07d1fdd2" },
 | 
				
			||||||
  "catppuccin": { "branch": "main", "commit": "afab7ec2a79c7127627dede79c0018b6e45663d0" },
 | 
					 | 
				
			||||||
  "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" },
 | 
				
			||||||
 | 
					  "copilot.vim": { "branch": "release", "commit": "22fd9542e3c47552abab5e685fefd760e4f405b2" },
 | 
				
			||||||
  "fidget.nvim": { "branch": "main", "commit": "1d1042d418ee8cb70d68f1e38db639844331c093" },
 | 
					  "fidget.nvim": { "branch": "main", "commit": "1d1042d418ee8cb70d68f1e38db639844331c093" },
 | 
				
			||||||
  "friendly-snippets": { "branch": "main", "commit": "aced40b66b7bae9bc2c37fd7b11841d54727a7b0" },
 | 
					  "friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" },
 | 
				
			||||||
  "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
 | 
					  "gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
 | 
				
			||||||
 | 
					  "harpoon": { "branch": "harpoon2", "commit": "a38be6e0dd4c6db66997deab71fc4453ace97f9c" },
 | 
				
			||||||
  "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
 | 
					  "indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
 | 
				
			||||||
  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
 | 
					  "lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
 | 
				
			||||||
  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
 | 
					  "lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
 | 
				
			||||||
  "mason-lspconfig.nvim": { "branch": "main", "commit": "b9084b1f42f790d6230dc66dbcb6bcc35b148552" },
 | 
					  "mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" },
 | 
				
			||||||
  "mason.nvim": { "branch": "main", "commit": "dcd0ea30ccfc7d47e879878d1270d6847a519181" },
 | 
					  "mason-nvim-dap.nvim": { "branch": "main", "commit": "3614a39aae98ccd34124b072939d6283853b3dd2" },
 | 
				
			||||||
  "neo-tree.nvim": { "branch": "main", "commit": "2f2d08894bbc679d4d181604c16bb7079f646384" },
 | 
					  "mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
 | 
				
			||||||
  "neodev.nvim": { "branch": "main", "commit": "64b2a51b02c6f2ae177c745e4d8bc801a339fe09" },
 | 
					  "neodev.nvim": { "branch": "main", "commit": "2793ba3127c2c93ee486b9072a3ef129eeb950cc" },
 | 
				
			||||||
  "nui.nvim": { "branch": "main", "commit": "35da9ca1de0fc4dda96c2e214d93d363c145f418" },
 | 
					  "nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
 | 
				
			||||||
  "nvim-cmp": { "branch": "main", "commit": "538e37ba87284942c1d76ed38dd497e54e65b891" },
 | 
					  "nvim-dap": { "branch": "master", "commit": "9adbfdca13afbe646d09a8d7a86d5d031fb9c5a5" },
 | 
				
			||||||
  "nvim-lspconfig": { "branch": "master", "commit": "8917d2c830e04bf944a699b8c41f097621283828" },
 | 
					  "nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" },
 | 
				
			||||||
  "nvim-treesitter": { "branch": "master", "commit": "458ce4d16c1771fc601ec10a87820acae9981f6d" },
 | 
					  "nvim-dap-ui": { "branch": "master", "commit": "d845ebd798ad1cf30aa4abd4c4eff795cdcfdd4f" },
 | 
				
			||||||
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "19a91a38b02c1c28c14e0ba468d20ae1423c39b2" },
 | 
					  "nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" },
 | 
				
			||||||
  "nvim-web-devicons": { "branch": "master", "commit": "b427ac5f9dff494f839e81441fb3f04a58cbcfbc" },
 | 
					  "nvim-treesitter": { "branch": "master", "commit": "1cda98132abfde758c1778096960f9b2c0bd78c1" },
 | 
				
			||||||
  "onedark.nvim": { "branch": "master", "commit": "14e5de43cf1ff761c280d1ff5b9980897f5b46c7" },
 | 
					  "nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" },
 | 
				
			||||||
  "plenary.nvim": { "branch": "master", "commit": "663246936325062427597964d81d30eaa42ab1e4" },
 | 
					  "onedark.nvim": { "branch": "master", "commit": "1230aaf2a427b2c5b73aba6e4a9a5881d3e69429" },
 | 
				
			||||||
 | 
					  "plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
 | 
				
			||||||
 | 
					  "popup.nvim": { "branch": "master", "commit": "b7404d35d5d3548a82149238289fa71f7f6de4ac" },
 | 
				
			||||||
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
 | 
					  "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
 | 
				
			||||||
  "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
 | 
					  "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
 | 
				
			||||||
  "vim-fugitive": { "branch": "master", "commit": "f116dcc8e21021e6fbfb6b0a9f8f7b9566d933f4" },
 | 
					  "vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" },
 | 
				
			||||||
  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
 | 
					  "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,15 +0,0 @@
 | 
				
			||||||
-- Unless you are still migrating, remove the deprecated commands from v1.x
 | 
					 | 
				
			||||||
vim.cmd([[ let g:neo_tree_remove_legacy_commands = 1 ]])
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
return {
 | 
					 | 
				
			||||||
  "nvim-neo-tree/neo-tree.nvim",
 | 
					 | 
				
			||||||
  version = "*",
 | 
					 | 
				
			||||||
  dependencies = {
 | 
					 | 
				
			||||||
    "nvim-lua/plenary.nvim",
 | 
					 | 
				
			||||||
    "nvim-tree/nvim-web-devicons", -- not strictly required, but recommended
 | 
					 | 
				
			||||||
    "MunifTanjim/nui.nvim",
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
  config = function ()
 | 
					 | 
				
			||||||
    require('neo-tree').setup {}
 | 
					 | 
				
			||||||
  end,
 | 
					 | 
				
			||||||
}
 | 
					 | 
				
			||||||
| 
						 | 
					@ -0,0 +1,10 @@
 | 
				
			||||||
 | 
					return {
 | 
				
			||||||
 | 
					  "ThePrimeagen/harpoon",
 | 
				
			||||||
 | 
					  branch = "harpoon2",
 | 
				
			||||||
 | 
					  dependencies = {
 | 
				
			||||||
 | 
					    "nvim-lua/plenary.nvim",
 | 
				
			||||||
 | 
					    "nvim-lua/popup.nvim",
 | 
				
			||||||
 | 
					  }
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue