Added my remaps
This commit is contained in:
		
							parent
							
								
									1915cea32e
								
							
						
					
					
						commit
						32a3daf4dc
					
				
							
								
								
									
										823
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										823
									
								
								init.lua
								
								
								
								
							| 
						 | 
					@ -44,19 +44,62 @@ 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 = ' '
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- Prime remaps:
 | 
				
			||||||
 | 
					--
 | 
				
			||||||
 | 
					-- J and K moves selected items up and down
 | 
				
			||||||
 | 
					vim.keymap.set("v", "J", ":m '>+1<CR>gv=gv")
 | 
				
			||||||
 | 
					vim.keymap.set("v", "K", ":m '<-2<CR>gv=gv")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- J moves the line to previous line end and keeps the cursor in front
 | 
				
			||||||
 | 
					vim.keymap.set("n", "J", "mzJ`z")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- Allow jumping UP and DOWN and keep the cursor in the middle
 | 
				
			||||||
 | 
					vim.keymap.set("n", "<C-d>", "<C-d>zz")
 | 
				
			||||||
 | 
					vim.keymap.set("n", "<C-u>", "<C-u>zz")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- Allow search terms to stay in the middle
 | 
				
			||||||
 | 
					vim.keymap.set("n", "n", "nzzzv")
 | 
				
			||||||
 | 
					vim.keymap.set("n", "N", "Nzzzv")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- greatest remap ever
 | 
				
			||||||
 | 
					-- Delete highlighted word and paste from clipboard without replacing copy buffer
 | 
				
			||||||
 | 
					vim.keymap.set("x", "<leader>p", [["_dP]])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- next greatest remap ever : asbjornHaland
 | 
				
			||||||
 | 
					vim.keymap.set({ "n", "v" }, "<leader>y", [["+y]])
 | 
				
			||||||
 | 
					vim.keymap.set("n", "<leader>Y", [["+Y]])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.keymap.set({ "n", "v" }, "<leader>d", [["_d]])
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- Remove Q
 | 
				
			||||||
 | 
					vim.keymap.set("n", "Q", "<nop>")
 | 
				
			||||||
 | 
					-- Ctrl + f create new tmux session
 | 
				
			||||||
 | 
					-- vim.keymap.set("n", "<C-f>", "<cmd>silent !tmux neww tmux-sessionizer<CR>")
 | 
				
			||||||
 | 
					-- vim.keymap.set("n", "<leader>f", vim.lsp.buf.format)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- Quick fix navigation / Quick fix ????? Lookup
 | 
				
			||||||
 | 
					vim.keymap.set("n", "<C-k>", "<cmd>cnext<CR>zz")
 | 
				
			||||||
 | 
					vim.keymap.set("n", "<C-j>", "<cmd>cprev<CR>zz")
 | 
				
			||||||
 | 
					vim.keymap.set("n", "<leader>k", "<cmd>lnext<CR>zz")
 | 
				
			||||||
 | 
					vim.keymap.set("n", "<leader>j", "<cmd>lprev<CR>zz")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.keymap.set("n", "<leader>s", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])
 | 
				
			||||||
 | 
					vim.keymap.set("n", "<leader>x", "<cmd>!chmod +x %<CR>", { silent = 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
 | 
				
			||||||
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
 | 
					local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
 | 
				
			||||||
if not vim.loop.fs_stat(lazypath) then
 | 
					if not vim.loop.fs_stat(lazypath) then
 | 
				
			||||||
  vim.fn.system {
 | 
					    vim.fn.system {
 | 
				
			||||||
    'git',
 | 
					        'git',
 | 
				
			||||||
    'clone',
 | 
					        'clone',
 | 
				
			||||||
    '--filter=blob:none',
 | 
					        '--filter=blob:none',
 | 
				
			||||||
    'https://github.com/folke/lazy.nvim.git',
 | 
					        'https://github.com/folke/lazy.nvim.git',
 | 
				
			||||||
    '--branch=stable', -- latest stable release
 | 
					        '--branch=stable', -- latest stable release
 | 
				
			||||||
    lazypath,
 | 
					        lazypath,
 | 
				
			||||||
  }
 | 
					    }
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
vim.opt.rtp:prepend(lazypath)
 | 
					vim.opt.rtp:prepend(lazypath)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
| 
						 | 
					@ -67,174 +110,205 @@ vim.opt.rtp:prepend(lazypath)
 | 
				
			||||||
--  You can also configure plugins after the setup call,
 | 
					--  You can also configure plugins after the setup call,
 | 
				
			||||||
--    as they will be available in your neovim runtime.
 | 
					--    as they will be available in your neovim runtime.
 | 
				
			||||||
require('lazy').setup({
 | 
					require('lazy').setup({
 | 
				
			||||||
  -- NOTE: First, some plugins that don't require any configuration
 | 
					    -- NOTE: First, some plugins that don't require any configuration
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- Git related plugins
 | 
					    -- Git related plugins
 | 
				
			||||||
  'tpope/vim-fugitive',
 | 
					    'tpope/vim-fugitive',
 | 
				
			||||||
  'tpope/vim-rhubarb',
 | 
					    'tpope/vim-rhubarb',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- Detect tabstop and shiftwidth automatically
 | 
					    -- Detect tabstop and shiftwidth automatically
 | 
				
			||||||
  'tpope/vim-sleuth',
 | 
					    'tpope/vim-sleuth',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- NOTE: This is where your plugins related to LSP can be installed.
 | 
					    -- NOTE: This is where your plugins related to LSP can be installed.
 | 
				
			||||||
  --  The configuration is done below. Search for lspconfig to find it below.
 | 
					    --  The configuration is done below. Search for lspconfig to find it below.
 | 
				
			||||||
  {
 | 
					    {
 | 
				
			||||||
    -- LSP Configuration & Plugins
 | 
					        -- LSP Configuration & Plugins
 | 
				
			||||||
    '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',
 | 
				
			||||||
      'williamboman/mason-lspconfig.nvim',
 | 
					            'williamboman/mason-lspconfig.nvim',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      -- 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',
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  {
 | 
					    {
 | 
				
			||||||
    -- Autocompletion
 | 
					        -- Autocompletion
 | 
				
			||||||
    'hrsh7th/nvim-cmp',
 | 
					        'hrsh7th/nvim-cmp',
 | 
				
			||||||
    dependencies = {
 | 
					        dependencies = {
 | 
				
			||||||
      -- Snippet Engine & its associated nvim-cmp source
 | 
					            -- Snippet Engine & its associated nvim-cmp source
 | 
				
			||||||
      'L3MON4D3/LuaSnip',
 | 
					            'L3MON4D3/LuaSnip',
 | 
				
			||||||
      'saadparwaiz1/cmp_luasnip',
 | 
					            'saadparwaiz1/cmp_luasnip',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      -- Adds LSP completion capabilities
 | 
					            -- Adds LSP completion capabilities
 | 
				
			||||||
      'hrsh7th/cmp-nvim-lsp',
 | 
					            'hrsh7th/cmp-nvim-lsp',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
      -- Adds a number of user-friendly snippets
 | 
					            -- Adds a number of user-friendly snippets
 | 
				
			||||||
      'rafamadriz/friendly-snippets',
 | 
					            'rafamadriz/friendly-snippets',
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- 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',
 | 
				
			||||||
    opts = {
 | 
					        opts = {
 | 
				
			||||||
      -- See `:help gitsigns.txt`
 | 
					            -- See `:help gitsigns.txt`
 | 
				
			||||||
      signs = {
 | 
					            signs = {
 | 
				
			||||||
        add = { text = '+' },
 | 
					                add = { text = '+' },
 | 
				
			||||||
        change = { text = '~' },
 | 
					                change = { text = '~' },
 | 
				
			||||||
        delete = { text = '_' },
 | 
					                delete = { text = '_' },
 | 
				
			||||||
        topdelete = { text = '‾' },
 | 
					                topdelete = { text = '‾' },
 | 
				
			||||||
        changedelete = { text = '~' },
 | 
					                changedelete = { text = '~' },
 | 
				
			||||||
      },
 | 
					            },
 | 
				
			||||||
      on_attach = function(bufnr)
 | 
					            on_attach = function(bufnr)
 | 
				
			||||||
        vim.keymap.set('n', '<leader>hp', require('gitsigns').preview_hunk, { buffer = bufnr, desc = 'Preview git hunk' })
 | 
					                vim.keymap.set('n', '<leader>hp', require('gitsigns').preview_hunk,
 | 
				
			||||||
 | 
					                    { buffer = bufnr, desc = 'Preview git hunk' })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
        -- don't override the built-in and fugitive keymaps
 | 
					                -- don't override the built-in and fugitive keymaps
 | 
				
			||||||
        local gs = package.loaded.gitsigns
 | 
					                local gs = package.loaded.gitsigns
 | 
				
			||||||
        vim.keymap.set({ 'n', 'v' }, ']c', function()
 | 
					                vim.keymap.set({ 'n', 'v' }, ']c', function()
 | 
				
			||||||
          if vim.wo.diff then
 | 
					                    if vim.wo.diff then
 | 
				
			||||||
            return ']c'
 | 
					                        return ']c'
 | 
				
			||||||
          end
 | 
					                    end
 | 
				
			||||||
          vim.schedule(function()
 | 
					                    vim.schedule(function()
 | 
				
			||||||
            gs.next_hunk()
 | 
					                        gs.next_hunk()
 | 
				
			||||||
          end)
 | 
					                    end)
 | 
				
			||||||
          return '<Ignore>'
 | 
					                    return '<Ignore>'
 | 
				
			||||||
        end, { expr = true, buffer = bufnr, desc = 'Jump to next hunk' })
 | 
					                end, { expr = true, buffer = bufnr, desc = 'Jump to next hunk' })
 | 
				
			||||||
        vim.keymap.set({ 'n', 'v' }, '[c', function()
 | 
					                vim.keymap.set({ 'n', 'v' }, '[c', function()
 | 
				
			||||||
          if vim.wo.diff then
 | 
					                    if vim.wo.diff then
 | 
				
			||||||
            return '[c'
 | 
					                        return '[c'
 | 
				
			||||||
          end
 | 
					                    end
 | 
				
			||||||
          vim.schedule(function()
 | 
					                    vim.schedule(function()
 | 
				
			||||||
            gs.prev_hunk()
 | 
					                        gs.prev_hunk()
 | 
				
			||||||
          end)
 | 
					                    end)
 | 
				
			||||||
          return '<Ignore>'
 | 
					                    return '<Ignore>'
 | 
				
			||||||
        end, { expr = true, buffer = bufnr, desc = 'Jump to previous hunk' })
 | 
					                end, { expr = true, buffer = bufnr, desc = 'Jump to previous hunk' })
 | 
				
			||||||
      end,
 | 
					            end,
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  {
 | 
					    {
 | 
				
			||||||
    -- 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'
 | 
					            vim.cmd.colorscheme 'onedark'
 | 
				
			||||||
    end,
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  {
 | 
					 | 
				
			||||||
    -- Set lualine as statusline
 | 
					 | 
				
			||||||
    'nvim-lualine/lualine.nvim',
 | 
					 | 
				
			||||||
    -- See `:help lualine.txt`
 | 
					 | 
				
			||||||
    opts = {
 | 
					 | 
				
			||||||
      options = {
 | 
					 | 
				
			||||||
        icons_enabled = false,
 | 
					 | 
				
			||||||
        theme = 'onedark',
 | 
					 | 
				
			||||||
        component_separators = '|',
 | 
					 | 
				
			||||||
        section_separators = '',
 | 
					 | 
				
			||||||
      },
 | 
					 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  {
 | 
					 | 
				
			||||||
    -- Add indentation guides even on blank lines
 | 
					 | 
				
			||||||
    'lukas-reineke/indent-blankline.nvim',
 | 
					 | 
				
			||||||
    -- Enable `lukas-reineke/indent-blankline.nvim`
 | 
					 | 
				
			||||||
    -- See `:help ibl`
 | 
					 | 
				
			||||||
    main = 'ibl',
 | 
					 | 
				
			||||||
    opts = {},
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  -- "gc" to comment visual regions/lines
 | 
					 | 
				
			||||||
  { 'numToStr/Comment.nvim', opts = {} },
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  -- Fuzzy Finder (files, lsp, etc)
 | 
					 | 
				
			||||||
  {
 | 
					 | 
				
			||||||
    'nvim-telescope/telescope.nvim',
 | 
					 | 
				
			||||||
    branch = '0.1.x',
 | 
					 | 
				
			||||||
    dependencies = {
 | 
					 | 
				
			||||||
      'nvim-lua/plenary.nvim',
 | 
					 | 
				
			||||||
      -- Fuzzy Finder Algorithm which requires local dependencies to be built.
 | 
					 | 
				
			||||||
      -- Only load if `make` is available. Make sure you have the system
 | 
					 | 
				
			||||||
      -- requirements installed.
 | 
					 | 
				
			||||||
      {
 | 
					 | 
				
			||||||
        'nvim-telescope/telescope-fzf-native.nvim',
 | 
					 | 
				
			||||||
        -- NOTE: If you are having trouble with this installation,
 | 
					 | 
				
			||||||
        --       refer to the README for telescope-fzf-native for more instructions.
 | 
					 | 
				
			||||||
        build = 'make',
 | 
					 | 
				
			||||||
        cond = function()
 | 
					 | 
				
			||||||
          return vim.fn.executable 'make' == 1
 | 
					 | 
				
			||||||
        end,
 | 
					        end,
 | 
				
			||||||
      },
 | 
					 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  {
 | 
					    {
 | 
				
			||||||
    -- Highlight, edit, and navigate code
 | 
					        -- Set lualine as statusline
 | 
				
			||||||
    'nvim-treesitter/nvim-treesitter',
 | 
					        'nvim-lualine/lualine.nvim',
 | 
				
			||||||
    dependencies = {
 | 
					        -- See `:help lualine.txt`
 | 
				
			||||||
      'nvim-treesitter/nvim-treesitter-textobjects',
 | 
					        opts = {
 | 
				
			||||||
 | 
					            options = {
 | 
				
			||||||
 | 
					                icons_enabled = false,
 | 
				
			||||||
 | 
					                theme = 'onedark',
 | 
				
			||||||
 | 
					                component_separators = '|',
 | 
				
			||||||
 | 
					                section_separators = '',
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    build = ':TSUpdate',
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- 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.
 | 
					        -- Add indentation guides even on blank lines
 | 
				
			||||||
  --       Uncomment any of the lines below to enable them.
 | 
					        'lukas-reineke/indent-blankline.nvim',
 | 
				
			||||||
  -- require 'kickstart.plugins.autoformat',
 | 
					        -- Enable `lukas-reineke/indent-blankline.nvim`
 | 
				
			||||||
  -- require 'kickstart.plugins.debug',
 | 
					        -- See `:help ibl`
 | 
				
			||||||
 | 
					        main = 'ibl',
 | 
				
			||||||
 | 
					        opts = {},
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
 | 
					    -- "gc" to comment visual regions/lines
 | 
				
			||||||
  --    You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping
 | 
					    { 'numToStr/Comment.nvim', opts = {} },
 | 
				
			||||||
  --    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.
 | 
					    -- Fuzzy Finder (files, lsp, etc)
 | 
				
			||||||
  --
 | 
					    {
 | 
				
			||||||
  --    For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
 | 
					        'nvim-telescope/telescope.nvim',
 | 
				
			||||||
  -- { import = 'custom.plugins' },
 | 
					        branch = '0.1.x',
 | 
				
			||||||
 | 
					        dependencies = {
 | 
				
			||||||
 | 
					            'nvim-lua/plenary.nvim',
 | 
				
			||||||
 | 
					            -- Fuzzy Finder Algorithm which requires local dependencies to be built.
 | 
				
			||||||
 | 
					            -- Only load if `make` is available. Make sure you have the system
 | 
				
			||||||
 | 
					            -- requirements installed.
 | 
				
			||||||
 | 
					            {
 | 
				
			||||||
 | 
					                'nvim-telescope/telescope-fzf-native.nvim',
 | 
				
			||||||
 | 
					                -- NOTE: If you are having trouble with this installation,
 | 
				
			||||||
 | 
					                --       refer to the README for telescope-fzf-native for more instructions.
 | 
				
			||||||
 | 
					                build = 'make',
 | 
				
			||||||
 | 
					                cond = function()
 | 
				
			||||||
 | 
					                    return vim.fn.executable 'make' == 1
 | 
				
			||||||
 | 
					                end,
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    {
 | 
				
			||||||
 | 
					        -- Highlight, edit, and navigate code
 | 
				
			||||||
 | 
					        'nvim-treesitter/nvim-treesitter',
 | 
				
			||||||
 | 
					        dependencies = {
 | 
				
			||||||
 | 
					            'nvim-treesitter/nvim-treesitter-textobjects',
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
 | 
					        build = ':TSUpdate',
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    -- 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.
 | 
				
			||||||
 | 
					    --       Uncomment any of the lines below to enable them.
 | 
				
			||||||
 | 
					    -- require 'kickstart.plugins.autoformat',
 | 
				
			||||||
 | 
					    -- require 'kickstart.plugins.debug',
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					    -- 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
 | 
				
			||||||
 | 
					    --    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
 | 
				
			||||||
 | 
					    { import = 'custom.plugins' },
 | 
				
			||||||
}, {})
 | 
					}, {})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- [[ Setting options ]]
 | 
					-- [[ Setting options ]]
 | 
				
			||||||
-- See `:help vim.o`
 | 
					-- See `:help vim.o`
 | 
				
			||||||
-- NOTE: You can change these options as you wish!
 | 
					-- NOTE: You can change these options as you wish!
 | 
				
			||||||
 | 
					-- Set commands
 | 
				
			||||||
 | 
					-- vim.opt.guicursor = ""
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.relativenumber = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.tabstop = 4
 | 
				
			||||||
 | 
					vim.opt.softtabstop = 4
 | 
				
			||||||
 | 
					vim.opt.shiftwidth = 4
 | 
				
			||||||
 | 
					vim.opt.expandtab = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.smartindent = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.wrap = false
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.swapfile = false
 | 
				
			||||||
 | 
					vim.opt.backup = false
 | 
				
			||||||
 | 
					vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
 | 
				
			||||||
 | 
					vim.opt.undofile = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.hlsearch = false
 | 
				
			||||||
 | 
					vim.opt.incsearch = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.termguicolors = true
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.scrolloff = 8
 | 
				
			||||||
 | 
					vim.opt.isfname:append("@-@")
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.updatetime = 50
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.opt.colorcolumn = "80"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- Set highlight on search
 | 
					-- Set highlight on search
 | 
				
			||||||
vim.o.hlsearch = false
 | 
					vim.o.hlsearch = false
 | 
				
			||||||
| 
						 | 
					@ -289,28 +363,34 @@ vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnos
 | 
				
			||||||
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
 | 
					vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
 | 
				
			||||||
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
 | 
					vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					vim.keymap.set('n', '<leader>pv', vim.cmd.Ex)
 | 
				
			||||||
 | 
					vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
 | 
				
			||||||
 | 
					vim.keymap.set("i", "<C-q>", "<C-v>")
 | 
				
			||||||
 | 
					-- vim.keymap.set('n', '<C-q>', vim.cmd.V)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- [[ Highlight on yank ]]
 | 
					-- [[ Highlight on yank ]]
 | 
				
			||||||
-- See `:help vim.highlight.on_yank()`
 | 
					-- See `:help vim.highlight.on_yank()`
 | 
				
			||||||
local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
 | 
					local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
 | 
				
			||||||
vim.api.nvim_create_autocmd('TextYankPost', {
 | 
					vim.api.nvim_create_autocmd('TextYankPost', {
 | 
				
			||||||
  callback = function()
 | 
					    callback = function()
 | 
				
			||||||
    vim.highlight.on_yank()
 | 
					        vim.highlight.on_yank()
 | 
				
			||||||
  end,
 | 
					    end,
 | 
				
			||||||
  group = highlight_group,
 | 
					    group = highlight_group,
 | 
				
			||||||
  pattern = '*',
 | 
					    pattern = '*',
 | 
				
			||||||
})
 | 
					})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- [[ Configure Telescope ]]
 | 
					-- [[ Configure Telescope ]]
 | 
				
			||||||
-- See `:help telescope` and `:help telescope.setup()`
 | 
					-- See `:help telescope` and `:help telescope.setup()`
 | 
				
			||||||
require('telescope').setup {
 | 
					require('telescope').setup {
 | 
				
			||||||
  defaults = {
 | 
					    defaults = {
 | 
				
			||||||
    mappings = {
 | 
					        mappings = {
 | 
				
			||||||
      i = {
 | 
					            i = {
 | 
				
			||||||
        ['<C-u>'] = false,
 | 
					                ['<C-u>'] = false,
 | 
				
			||||||
        ['<C-d>'] = false,
 | 
					                ['<C-d>'] = false,
 | 
				
			||||||
      },
 | 
					            },
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- Enable telescope fzf native, if installed
 | 
					-- Enable telescope fzf native, if installed
 | 
				
			||||||
| 
						 | 
					@ -319,35 +399,35 @@ pcall(require('telescope').load_extension, 'fzf')
 | 
				
			||||||
-- Telescope live_grep in git root
 | 
					-- Telescope live_grep in git root
 | 
				
			||||||
-- Function to find the git root directory based on the current buffer's path
 | 
					-- Function to find the git root directory based on the current buffer's path
 | 
				
			||||||
local function find_git_root()
 | 
					local function find_git_root()
 | 
				
			||||||
  -- Use the current buffer's path as the starting point for the git search
 | 
					    -- Use the current buffer's path as the starting point for the git search
 | 
				
			||||||
  local current_file = vim.api.nvim_buf_get_name(0)
 | 
					    local current_file = vim.api.nvim_buf_get_name(0)
 | 
				
			||||||
  local current_dir
 | 
					    local current_dir
 | 
				
			||||||
  local cwd = vim.fn.getcwd()
 | 
					    local cwd = vim.fn.getcwd()
 | 
				
			||||||
  -- If the buffer is not associated with a file, return nil
 | 
					    -- If the buffer is not associated with a file, return nil
 | 
				
			||||||
  if current_file == "" then
 | 
					    if current_file == "" then
 | 
				
			||||||
    current_dir = cwd
 | 
					        current_dir = cwd
 | 
				
			||||||
  else
 | 
					    else
 | 
				
			||||||
    -- Extract the directory from the current file's path
 | 
					        -- Extract the directory from the current file's path
 | 
				
			||||||
    current_dir = vim.fn.fnamemodify(current_file, ":h")
 | 
					        current_dir = vim.fn.fnamemodify(current_file, ":h")
 | 
				
			||||||
  end
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- Find the Git root directory from the current file's path
 | 
					    -- Find the Git root directory from the current file's path
 | 
				
			||||||
  local git_root = vim.fn.systemlist("git -C " .. vim.fn.escape(current_dir, " ") .. " rev-parse --show-toplevel")[1]
 | 
					    local git_root = vim.fn.systemlist("git -C " .. vim.fn.escape(current_dir, " ") .. " rev-parse --show-toplevel")[1]
 | 
				
			||||||
  if vim.v.shell_error ~= 0 then
 | 
					    if vim.v.shell_error ~= 0 then
 | 
				
			||||||
    print("Not a git repository. Searching on current working directory")
 | 
					        print("Not a git repository. Searching on current working directory")
 | 
				
			||||||
    return cwd
 | 
					        return cwd
 | 
				
			||||||
  end
 | 
					    end
 | 
				
			||||||
  return git_root
 | 
					    return git_root
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- Custom live_grep function to search in git root
 | 
					-- Custom live_grep function to search in git root
 | 
				
			||||||
local function live_grep_git_root()
 | 
					local function live_grep_git_root()
 | 
				
			||||||
  local git_root = find_git_root()
 | 
					    local git_root = find_git_root()
 | 
				
			||||||
  if git_root then
 | 
					    if git_root then
 | 
				
			||||||
    require('telescope.builtin').live_grep({
 | 
					        require('telescope.builtin').live_grep({
 | 
				
			||||||
      search_dirs = {git_root},
 | 
					            search_dirs = { git_root },
 | 
				
			||||||
    })
 | 
					        })
 | 
				
			||||||
  end
 | 
					    end
 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {})
 | 
					vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {})
 | 
				
			||||||
| 
						 | 
					@ -356,11 +436,11 @@ vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {})
 | 
				
			||||||
vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
 | 
					vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
 | 
				
			||||||
vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
 | 
					vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
 | 
				
			||||||
vim.keymap.set('n', '<leader>/', function()
 | 
					vim.keymap.set('n', '<leader>/', function()
 | 
				
			||||||
  -- You can pass additional configuration to telescope to change theme, layout, etc.
 | 
					    -- You can pass additional configuration to telescope to change theme, layout, etc.
 | 
				
			||||||
  require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
 | 
					    require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
 | 
				
			||||||
    winblend = 10,
 | 
					        winblend = 10,
 | 
				
			||||||
    previewer = false,
 | 
					        previewer = false,
 | 
				
			||||||
  })
 | 
					    })
 | 
				
			||||||
end, { desc = '[/] Fuzzily search in current buffer' })
 | 
					end, { desc = '[/] Fuzzily search in current buffer' })
 | 
				
			||||||
 | 
					
 | 
				
			||||||
vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
 | 
					vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
 | 
				
			||||||
| 
						 | 
					@ -376,125 +456,125 @@ vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc =
 | 
				
			||||||
-- See `:help nvim-treesitter`
 | 
					-- See `:help nvim-treesitter`
 | 
				
			||||||
-- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
 | 
					-- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
 | 
				
			||||||
vim.defer_fn(function()
 | 
					vim.defer_fn(function()
 | 
				
			||||||
  require('nvim-treesitter.configs').setup {
 | 
					    require('nvim-treesitter.configs').setup {
 | 
				
			||||||
    -- Add languages to be installed here that you want installed for treesitter
 | 
					        -- Add languages to be installed here that you want installed for treesitter
 | 
				
			||||||
    ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
 | 
					        ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
 | 
					        -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
 | 
				
			||||||
    auto_install = false,
 | 
					        auto_install = false,
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    highlight = { enable = true },
 | 
					        highlight = { enable = true },
 | 
				
			||||||
    indent = { enable = true },
 | 
					        indent = { enable = true },
 | 
				
			||||||
    incremental_selection = {
 | 
					        incremental_selection = {
 | 
				
			||||||
      enable = true,
 | 
					            enable = true,
 | 
				
			||||||
      keymaps = {
 | 
					            keymaps = {
 | 
				
			||||||
        init_selection = '<c-space>',
 | 
					                init_selection = '<c-space>',
 | 
				
			||||||
        node_incremental = '<c-space>',
 | 
					                node_incremental = '<c-space>',
 | 
				
			||||||
        scope_incremental = '<c-s>',
 | 
					                scope_incremental = '<c-s>',
 | 
				
			||||||
        node_decremental = '<M-space>',
 | 
					                node_decremental = '<M-space>',
 | 
				
			||||||
      },
 | 
					            },
 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
    textobjects = {
 | 
					 | 
				
			||||||
      select = {
 | 
					 | 
				
			||||||
        enable = true,
 | 
					 | 
				
			||||||
        lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
 | 
					 | 
				
			||||||
        keymaps = {
 | 
					 | 
				
			||||||
          -- You can use the capture groups defined in textobjects.scm
 | 
					 | 
				
			||||||
          ['aa'] = '@parameter.outer',
 | 
					 | 
				
			||||||
          ['ia'] = '@parameter.inner',
 | 
					 | 
				
			||||||
          ['af'] = '@function.outer',
 | 
					 | 
				
			||||||
          ['if'] = '@function.inner',
 | 
					 | 
				
			||||||
          ['ac'] = '@class.outer',
 | 
					 | 
				
			||||||
          ['ic'] = '@class.inner',
 | 
					 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
      },
 | 
					        textobjects = {
 | 
				
			||||||
      move = {
 | 
					            select = {
 | 
				
			||||||
        enable = true,
 | 
					                enable = true,
 | 
				
			||||||
        set_jumps = true, -- whether to set jumps in the jumplist
 | 
					                lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
 | 
				
			||||||
        goto_next_start = {
 | 
					                keymaps = {
 | 
				
			||||||
          [']m'] = '@function.outer',
 | 
					                    -- You can use the capture groups defined in textobjects.scm
 | 
				
			||||||
          [']]'] = '@class.outer',
 | 
					                    ['aa'] = '@parameter.outer',
 | 
				
			||||||
 | 
					                    ['ia'] = '@parameter.inner',
 | 
				
			||||||
 | 
					                    ['af'] = '@function.outer',
 | 
				
			||||||
 | 
					                    ['if'] = '@function.inner',
 | 
				
			||||||
 | 
					                    ['ac'] = '@class.outer',
 | 
				
			||||||
 | 
					                    ['ic'] = '@class.inner',
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            move = {
 | 
				
			||||||
 | 
					                enable = true,
 | 
				
			||||||
 | 
					                set_jumps = true, -- whether to set jumps in the jumplist
 | 
				
			||||||
 | 
					                goto_next_start = {
 | 
				
			||||||
 | 
					                    [']m'] = '@function.outer',
 | 
				
			||||||
 | 
					                    [']]'] = '@class.outer',
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
 | 
					                goto_next_end = {
 | 
				
			||||||
 | 
					                    [']M'] = '@function.outer',
 | 
				
			||||||
 | 
					                    [']['] = '@class.outer',
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
 | 
					                goto_previous_start = {
 | 
				
			||||||
 | 
					                    ['[m'] = '@function.outer',
 | 
				
			||||||
 | 
					                    ['[['] = '@class.outer',
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
 | 
					                goto_previous_end = {
 | 
				
			||||||
 | 
					                    ['[M'] = '@function.outer',
 | 
				
			||||||
 | 
					                    ['[]'] = '@class.outer',
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
 | 
					            swap = {
 | 
				
			||||||
 | 
					                enable = true,
 | 
				
			||||||
 | 
					                swap_next = {
 | 
				
			||||||
 | 
					                    ['<leader>a'] = '@parameter.inner',
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
 | 
					                swap_previous = {
 | 
				
			||||||
 | 
					                    ['<leader>A'] = '@parameter.inner',
 | 
				
			||||||
 | 
					                },
 | 
				
			||||||
 | 
					            },
 | 
				
			||||||
        },
 | 
					        },
 | 
				
			||||||
        goto_next_end = {
 | 
					    }
 | 
				
			||||||
          [']M'] = '@function.outer',
 | 
					 | 
				
			||||||
          [']['] = '@class.outer',
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
        goto_previous_start = {
 | 
					 | 
				
			||||||
          ['[m'] = '@function.outer',
 | 
					 | 
				
			||||||
          ['[['] = '@class.outer',
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
        goto_previous_end = {
 | 
					 | 
				
			||||||
          ['[M'] = '@function.outer',
 | 
					 | 
				
			||||||
          ['[]'] = '@class.outer',
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
      },
 | 
					 | 
				
			||||||
      swap = {
 | 
					 | 
				
			||||||
        enable = true,
 | 
					 | 
				
			||||||
        swap_next = {
 | 
					 | 
				
			||||||
          ['<leader>a'] = '@parameter.inner',
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
        swap_previous = {
 | 
					 | 
				
			||||||
          ['<leader>A'] = '@parameter.inner',
 | 
					 | 
				
			||||||
        },
 | 
					 | 
				
			||||||
      },
 | 
					 | 
				
			||||||
    },
 | 
					 | 
				
			||||||
  }
 | 
					 | 
				
			||||||
end, 0)
 | 
					end, 0)
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- [[ Configure LSP ]]
 | 
					-- [[ Configure LSP ]]
 | 
				
			||||||
--  This function gets run when an LSP connects to a particular buffer.
 | 
					--  This function gets run when an LSP connects to a particular buffer.
 | 
				
			||||||
local on_attach = function(_, bufnr)
 | 
					local on_attach = function(_, bufnr)
 | 
				
			||||||
  -- NOTE: Remember that lua is a real programming language, and as such it is possible
 | 
					    -- NOTE: Remember that lua is a real programming language, and as such it is possible
 | 
				
			||||||
  -- to define small helper and utility functions so you don't have to repeat yourself
 | 
					    -- to define small helper and utility functions so you don't have to repeat yourself
 | 
				
			||||||
  -- many times.
 | 
					    -- many times.
 | 
				
			||||||
  --
 | 
					    --
 | 
				
			||||||
  -- In this case, we create a function that lets us more easily define mappings specific
 | 
					    -- In this case, we create a function that lets us more easily define mappings specific
 | 
				
			||||||
  -- for LSP related items. It sets the mode, buffer and description for us each time.
 | 
					    -- for LSP related items. It sets the mode, buffer and description for us each time.
 | 
				
			||||||
  local nmap = function(keys, func, desc)
 | 
					    local nmap = function(keys, func, desc)
 | 
				
			||||||
    if desc then
 | 
					        if desc then
 | 
				
			||||||
      desc = 'LSP: ' .. desc
 | 
					            desc = 'LSP: ' .. desc
 | 
				
			||||||
 | 
					        end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					        vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
 | 
				
			||||||
    end
 | 
					    end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
    vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
 | 
					    nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
 | 
				
			||||||
  end
 | 
					    nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
 | 
					    nmap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
 | 
				
			||||||
  nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
 | 
					    nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
 | 
				
			||||||
 | 
					    nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
 | 
				
			||||||
 | 
					    nmap('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
 | 
				
			||||||
 | 
					    nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
 | 
				
			||||||
 | 
					    nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  nmap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
 | 
					    -- See `:help K` for why this keymap
 | 
				
			||||||
  nmap('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
 | 
					    nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
 | 
				
			||||||
  nmap('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
 | 
					    nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
 | 
				
			||||||
  nmap('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
 | 
					 | 
				
			||||||
  nmap('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
 | 
					 | 
				
			||||||
  nmap('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
 | 
					 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- See `:help K` for why this keymap
 | 
					    -- Lesser used LSP functionality
 | 
				
			||||||
  nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
 | 
					    nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
 | 
				
			||||||
  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
 | 
					    nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
 | 
				
			||||||
 | 
					    nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
 | 
				
			||||||
 | 
					    nmap('<leader>wl', function()
 | 
				
			||||||
 | 
					        print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
 | 
				
			||||||
 | 
					    end, '[W]orkspace [L]ist Folders')
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  -- Lesser used LSP functionality
 | 
					    -- Create a command `:Format` local to the LSP buffer
 | 
				
			||||||
  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
 | 
					    vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
 | 
				
			||||||
  nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
 | 
					        vim.lsp.buf.format()
 | 
				
			||||||
  nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
 | 
					    end, { desc = 'Format current buffer with LSP' })
 | 
				
			||||||
  nmap('<leader>wl', function()
 | 
					 | 
				
			||||||
    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
 | 
					 | 
				
			||||||
  end, '[W]orkspace [L]ist Folders')
 | 
					 | 
				
			||||||
 | 
					 | 
				
			||||||
  -- Create a command `:Format` local to the LSP buffer
 | 
					 | 
				
			||||||
  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
 | 
					 | 
				
			||||||
    vim.lsp.buf.format()
 | 
					 | 
				
			||||||
  end, { desc = 'Format current buffer with LSP' })
 | 
					 | 
				
			||||||
end
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- document existing key chains
 | 
					-- document existing key chains
 | 
				
			||||||
require('which-key').register {
 | 
					require('which-key').register {
 | 
				
			||||||
  ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
 | 
					    ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
 | 
				
			||||||
  ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
 | 
					    ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
 | 
				
			||||||
  ['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
 | 
					    ['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
 | 
				
			||||||
  ['<leader>h'] = { name = 'More git', _ = 'which_key_ignore' },
 | 
					    ['<leader>h'] = { name = 'More git', _ = 'which_key_ignore' },
 | 
				
			||||||
  ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
 | 
					    ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
 | 
				
			||||||
  ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
 | 
					    ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
 | 
				
			||||||
  ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
 | 
					    ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- mason-lspconfig requires that these setup functions are called in this order
 | 
					-- mason-lspconfig requires that these setup functions are called in this order
 | 
				
			||||||
| 
						 | 
					@ -511,19 +591,19 @@ require('mason-lspconfig').setup()
 | 
				
			||||||
--  If you want to override the default filetypes that your language server will attach to you can
 | 
					--  If you want to override the default filetypes that your language server will attach to you can
 | 
				
			||||||
--  define the property 'filetypes' to the map in question.
 | 
					--  define the property 'filetypes' to the map in question.
 | 
				
			||||||
local servers = {
 | 
					local servers = {
 | 
				
			||||||
  -- clangd = {},
 | 
					    -- clangd = {},
 | 
				
			||||||
  -- gopls = {},
 | 
					    -- gopls = {},
 | 
				
			||||||
  -- pyright = {},
 | 
					    -- pyright = {},
 | 
				
			||||||
  -- rust_analyzer = {},
 | 
					    -- rust_analyzer = {},
 | 
				
			||||||
  -- tsserver = {},
 | 
					    -- tsserver = {},
 | 
				
			||||||
  -- html = { filetypes = { 'html', 'twig', 'hbs'} },
 | 
					    -- html = { filetypes = { 'html', 'twig', 'hbs'} },
 | 
				
			||||||
 | 
					
 | 
				
			||||||
  lua_ls = {
 | 
					    lua_ls = {
 | 
				
			||||||
    Lua = {
 | 
					        Lua = {
 | 
				
			||||||
      workspace = { checkThirdParty = false },
 | 
					            workspace = { checkThirdParty = false },
 | 
				
			||||||
      telemetry = { enable = false },
 | 
					            telemetry = { enable = false },
 | 
				
			||||||
 | 
					        },
 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- Setup neovim lua configuration
 | 
					-- Setup neovim lua configuration
 | 
				
			||||||
| 
						 | 
					@ -537,70 +617,99 @@ capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 | 
				
			||||||
local mason_lspconfig = require 'mason-lspconfig'
 | 
					local mason_lspconfig = require 'mason-lspconfig'
 | 
				
			||||||
 | 
					
 | 
				
			||||||
mason_lspconfig.setup {
 | 
					mason_lspconfig.setup {
 | 
				
			||||||
  ensure_installed = vim.tbl_keys(servers),
 | 
					    ensure_installed = vim.tbl_keys(servers),
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
mason_lspconfig.setup_handlers {
 | 
					mason_lspconfig.setup_handlers {
 | 
				
			||||||
  function(server_name)
 | 
					    function(server_name)
 | 
				
			||||||
    require('lspconfig')[server_name].setup {
 | 
					        require('lspconfig')[server_name].setup {
 | 
				
			||||||
      capabilities = capabilities,
 | 
					            capabilities = capabilities,
 | 
				
			||||||
      on_attach = on_attach,
 | 
					            on_attach = on_attach,
 | 
				
			||||||
      settings = servers[server_name],
 | 
					            settings = servers[server_name],
 | 
				
			||||||
      filetypes = (servers[server_name] or {}).filetypes,
 | 
					            filetypes = (servers[server_name] or {}).filetypes,
 | 
				
			||||||
    }
 | 
					        }
 | 
				
			||||||
  end,
 | 
					    end,
 | 
				
			||||||
}
 | 
					}
 | 
				
			||||||
 | 
					
 | 
				
			||||||
-- [[ Configure nvim-cmp ]]
 | 
					-- [[ Configure nvim-cmp ]]
 | 
				
			||||||
-- See `:help cmp`
 | 
					-- See `:help cmp`
 | 
				
			||||||
 | 
					vim.opt.completeopt = "menu,menuone,noselect"
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					local has_words_before = function()
 | 
				
			||||||
 | 
					    local line, col = unpack(vim.api.nvim_win_get_cursor(0))
 | 
				
			||||||
 | 
					    return col ~= 0 and vim.api.nvim_buf_get_lines(0, line - 1, line, true)[1]:sub(col, col):match("%s") == nil
 | 
				
			||||||
 | 
					end
 | 
				
			||||||
 | 
					
 | 
				
			||||||
local cmp = require 'cmp'
 | 
					local cmp = require 'cmp'
 | 
				
			||||||
local luasnip = require 'luasnip'
 | 
					local luasnip = require 'luasnip'
 | 
				
			||||||
require('luasnip.loaders.from_vscode').lazy_load()
 | 
					cmp.setup({
 | 
				
			||||||
luasnip.config.setup {}
 | 
					    snippet = {
 | 
				
			||||||
 | 
					        expand = function(args)
 | 
				
			||||||
cmp.setup {
 | 
					            require('luasnip').lsp_expand(args.body)
 | 
				
			||||||
  snippet = {
 | 
					        end,
 | 
				
			||||||
    expand = function(args)
 | 
					 | 
				
			||||||
      luasnip.lsp_expand(args.body)
 | 
					 | 
				
			||||||
    end,
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
  completion = {
 | 
					 | 
				
			||||||
    completeopt = 'menu,menuone,noinsert'
 | 
					 | 
				
			||||||
  },
 | 
					 | 
				
			||||||
  mapping = cmp.mapping.preset.insert {
 | 
					 | 
				
			||||||
    ['<C-n>'] = cmp.mapping.select_next_item(),
 | 
					 | 
				
			||||||
    ['<C-p>'] = cmp.mapping.select_prev_item(),
 | 
					 | 
				
			||||||
    ['<C-d>'] = cmp.mapping.scroll_docs(-4),
 | 
					 | 
				
			||||||
    ['<C-f>'] = cmp.mapping.scroll_docs(4),
 | 
					 | 
				
			||||||
    ['<C-Space>'] = cmp.mapping.complete {},
 | 
					 | 
				
			||||||
    ['<CR>'] = cmp.mapping.confirm {
 | 
					 | 
				
			||||||
      behavior = cmp.ConfirmBehavior.Replace,
 | 
					 | 
				
			||||||
      select = true,
 | 
					 | 
				
			||||||
    },
 | 
					    },
 | 
				
			||||||
    ['<Tab>'] = cmp.mapping(function(fallback)
 | 
					    mapping = {
 | 
				
			||||||
      if cmp.visible() then
 | 
					        ["<Tab>"] = cmp.mapping(function(fallback)
 | 
				
			||||||
        cmp.select_next_item()
 | 
					            if cmp.visible() then
 | 
				
			||||||
      elseif luasnip.expand_or_locally_jumpable() then
 | 
					                cmp.select_next_item()
 | 
				
			||||||
        luasnip.expand_or_jump()
 | 
					            elseif luasnip.expand_or_jumpable() then
 | 
				
			||||||
      else
 | 
					                luasnip.expand_or_jump()
 | 
				
			||||||
        fallback()
 | 
					            elseif has_words_before() then
 | 
				
			||||||
      end
 | 
					                cmp.complete()
 | 
				
			||||||
    end, { 'i', 's' }),
 | 
					            else
 | 
				
			||||||
    ['<S-Tab>'] = cmp.mapping(function(fallback)
 | 
					                fallback()
 | 
				
			||||||
      if cmp.visible() then
 | 
					            end
 | 
				
			||||||
        cmp.select_prev_item()
 | 
					        end, { "i", "s" }),
 | 
				
			||||||
      elseif luasnip.locally_jumpable(-1) then
 | 
					        ["<S-Tab>"] = cmp.mapping(function(fallback)
 | 
				
			||||||
        luasnip.jump(-1)
 | 
					            if cmp.visible() then
 | 
				
			||||||
      else
 | 
					                cmp.select_prev_item()
 | 
				
			||||||
        fallback()
 | 
					            elseif luasnip.jumpable(-1) then
 | 
				
			||||||
      end
 | 
					                luasnip.jump(-1)
 | 
				
			||||||
    end, { 'i', 's' }),
 | 
					            else
 | 
				
			||||||
  },
 | 
					                fallback()
 | 
				
			||||||
  sources = {
 | 
					            end
 | 
				
			||||||
    { name = 'nvim_lsp' },
 | 
					        end, { "i", "s" }),
 | 
				
			||||||
    { name = 'luasnip' },
 | 
					        ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
 | 
				
			||||||
  },
 | 
					        ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
 | 
				
			||||||
}
 | 
					        ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
 | 
				
			||||||
 | 
					        ['<C-y>'] = cmp.config.disable,
 | 
				
			||||||
 | 
					        ['<C-e>'] = cmp.mapping({
 | 
				
			||||||
 | 
					            i = cmp.mapping.abort(),
 | 
				
			||||||
 | 
					            c = cmp.mapping.close(),
 | 
				
			||||||
 | 
					        }),
 | 
				
			||||||
 | 
					        ['<CR>'] = cmp.mapping.confirm({ select = true }),
 | 
				
			||||||
 | 
					    },
 | 
				
			||||||
 | 
					    sources = cmp.config.sources({
 | 
				
			||||||
 | 
					        { name = 'nvim_lsp' },
 | 
				
			||||||
 | 
					        { name = 'luasnip' },
 | 
				
			||||||
 | 
					        { name = 'path' },
 | 
				
			||||||
 | 
					        { name = 'buffer' },
 | 
				
			||||||
 | 
					    })
 | 
				
			||||||
 | 
					})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- Set configuration for specific filetype.
 | 
				
			||||||
 | 
					cmp.setup.filetype('gitcommit', {
 | 
				
			||||||
 | 
					    sources = cmp.config.sources({
 | 
				
			||||||
 | 
					        { name = 'cmp_git' }, -- You can specify the `cmp_git` source if you were installed it.
 | 
				
			||||||
 | 
					    }, {
 | 
				
			||||||
 | 
					        { name = 'buffer' },
 | 
				
			||||||
 | 
					    })
 | 
				
			||||||
 | 
					})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- Use buffer source for `/` (if you enabled `native_menu`, this won't work anymore).
 | 
				
			||||||
 | 
					cmp.setup.cmdline('/', {
 | 
				
			||||||
 | 
					    sources = {
 | 
				
			||||||
 | 
					        { name = 'buffer' }
 | 
				
			||||||
 | 
					    }
 | 
				
			||||||
 | 
					})
 | 
				
			||||||
 | 
					
 | 
				
			||||||
 | 
					-- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
 | 
				
			||||||
 | 
					cmp.setup.cmdline(':', {
 | 
				
			||||||
 | 
					    sources = cmp.config.sources({
 | 
				
			||||||
 | 
					        { name = 'path' }
 | 
				
			||||||
 | 
					    }, {
 | 
				
			||||||
 | 
					        { name = 'cmdline' }
 | 
				
			||||||
 | 
					    })
 | 
				
			||||||
 | 
					})
 | 
				
			||||||
-- 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
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
| 
						 | 
					@ -2,4 +2,7 @@
 | 
				
			||||||
--  I promise not to create any merge conflicts in this directory :)
 | 
					--  I promise not to create any merge conflicts in this directory :)
 | 
				
			||||||
--
 | 
					--
 | 
				
			||||||
-- See the kickstart.nvim README for more information
 | 
					-- See the kickstart.nvim README for more information
 | 
				
			||||||
return {}
 | 
					--
 | 
				
			||||||
 | 
					return {
 | 
				
			||||||
 | 
					    "mbbill/undotree",
 | 
				
			||||||
 | 
					}
 | 
				
			||||||
| 
						 | 
					
 | 
				
			||||||
		Loading…
	
		Reference in New Issue