Make custom changes
This commit is contained in:
		
							parent
							
								
									76c5b1ec57
								
							
						
					
					
						commit
						3c373a170e
					
				| 
						 | 
				
			
			@ -0,0 +1,5 @@
 | 
			
		|||
vim.opt.relativenumber = true
 | 
			
		||||
vim.opt.tabstop = 2
 | 
			
		||||
vim.opt.shiftwidth = 2
 | 
			
		||||
vim.opt.expandtab = true
 | 
			
		||||
vim.bo.softtabstop = 2
 | 
			
		||||
							
								
								
									
										11
									
								
								init.lua
								
								
								
								
							
							
						
						
									
										11
									
								
								init.lua
								
								
								
								
							| 
						 | 
				
			
			@ -113,7 +113,7 @@ require('lazy').setup({
 | 
			
		|||
  },
 | 
			
		||||
 | 
			
		||||
  -- 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
 | 
			
		||||
    'lewis6991/gitsigns.nvim',
 | 
			
		||||
| 
						 | 
				
			
			@ -257,8 +257,8 @@ require('lazy').setup({
 | 
			
		|||
  -- 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',
 | 
			
		||||
  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
 | 
			
		||||
| 
						 | 
				
			
			@ -266,7 +266,7 @@ require('lazy').setup({
 | 
			
		|||
  --    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' },
 | 
			
		||||
  { import = 'custom.plugins' },
 | 
			
		||||
}, {})
 | 
			
		||||
 | 
			
		||||
-- [[ Setting options ]]
 | 
			
		||||
| 
						 | 
				
			
			@ -369,7 +369,8 @@ local function find_git_root()
 | 
			
		|||
  end
 | 
			
		||||
 | 
			
		||||
  -- 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
 | 
			
		||||
    print 'Not a git repository. Searching on current working directory'
 | 
			
		||||
    return cwd
 | 
			
		||||
| 
						 | 
				
			
			
 | 
			
		|||
| 
						 | 
				
			
			@ -0,0 +1,32 @@
 | 
			
		|||
{
 | 
			
		||||
  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
 | 
			
		||||
  "LuaSnip": { "branch": "master", "commit": "954c81b53989097faaff0fabc11c29575288c3e1" },
 | 
			
		||||
  "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
 | 
			
		||||
  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
 | 
			
		||||
  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
 | 
			
		||||
  "coc.nvim": { "branch": "release", "commit": "7b9e1ef0a1399907c51d23b6080b94a5aba4a654" },
 | 
			
		||||
  "fidget.nvim": { "branch": "main", "commit": "7dc62b9ce32ac0f21cfb510f243644ce28a39299" },
 | 
			
		||||
  "friendly-snippets": { "branch": "main", "commit": "53d3df271d031c405255e99410628c26a8f0d2b0" },
 | 
			
		||||
  "gitsigns.nvim": { "branch": "main", "commit": "87640f5a877b18bdd49884dbcac220fed924b867" },
 | 
			
		||||
  "indent-blankline.nvim": { "branch": "master", "commit": "7206c77cb931f79885fc47f88ae18f99148392eb" },
 | 
			
		||||
  "lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
 | 
			
		||||
  "lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
 | 
			
		||||
  "mason-lspconfig.nvim": { "branch": "main", "commit": "9453e3d6cd2ca45d96e20f343e8f1b927364b630" },
 | 
			
		||||
  "mason-nvim-dap.nvim": { "branch": "main", "commit": "5b4db7c0d6873436b42bcda0ba7cd4efa9206745" },
 | 
			
		||||
  "mason.nvim": { "branch": "main", "commit": "41e75af1f578e55ba050c863587cffde3556ffa6" },
 | 
			
		||||
  "neodev.nvim": { "branch": "main", "commit": "c4ce017bd4bacf60bf59330cec9e93c5d5e104a6" },
 | 
			
		||||
  "nvim-cmp": { "branch": "main", "commit": "0b751f6beef40fd47375eaf53d3057e0bfa317e4" },
 | 
			
		||||
  "nvim-dap": { "branch": "master", "commit": "bbe2c6f3438542a37cc2141a8e385f7dfe07d87d" },
 | 
			
		||||
  "nvim-dap-go": { "branch": "main", "commit": "a5cc8dcad43f0732585d4793deb02a25c4afb766" },
 | 
			
		||||
  "nvim-dap-ui": { "branch": "master", "commit": "34160a7ce6072ef332f350ae1d4a6a501daf0159" },
 | 
			
		||||
  "nvim-lspconfig": { "branch": "master", "commit": "bd405e45c5fb122c16af8f87fa2dd7ab1981b243" },
 | 
			
		||||
  "nvim-treesitter": { "branch": "master", "commit": "7958ff9ec7a2baea2842323d0e7ac67a509da4d2" },
 | 
			
		||||
  "nvim-treesitter-textobjects": { "branch": "master", "commit": "ec1c5bdb3d87ac971749fa6c7dbc2b14884f1f6a" },
 | 
			
		||||
  "onedark.nvim": { "branch": "master", "commit": "c5476a091b0f1b4e853db91c91ff941f848a1cdd" },
 | 
			
		||||
  "plenary.nvim": { "branch": "master", "commit": "55d9fe89e33efd26f532ef20223e5f9430c8b0c0" },
 | 
			
		||||
  "telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
 | 
			
		||||
  "vim-fugitive": { "branch": "master", "commit": "46eaf8918b347906789df296143117774e827616" },
 | 
			
		||||
  "vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
 | 
			
		||||
  "vim-sleuth": { "branch": "master", "commit": "1cc4557420f215d02c4d2645a748a816c220e99b" },
 | 
			
		||||
  "which-key.nvim": { "branch": "main", "commit": "4433e5ec9a507e5097571ed55c02ea9658fb268a" }
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -0,0 +1,7 @@
 | 
			
		|||
-- You can add your own plugins here or in other files in this directory!
 | 
			
		||||
--  I promise not to create any merge conflicts in this directory :)
 | 
			
		||||
--
 | 
			
		||||
-- See the kickstart.nvim README for more information
 | 
			
		||||
return {
 | 
			
		||||
	'neoclide/coc.nvim', branch='release'
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -0,0 +1,3 @@
 | 
			
		|||
return {
 | 
			
		||||
	"nvim-treesitter/nvim-treesitter", build = ":TSUpdate"
 | 
			
		||||
}
 | 
			
		||||
| 
						 | 
				
			
			@ -0,0 +1,663 @@
 | 
			
		|||
--[[
 | 
			
		||||
 | 
			
		||||
=====================================================================
 | 
			
		||||
==================== READ THIS BEFORE CONTINUING ====================
 | 
			
		||||
=====================================================================
 | 
			
		||||
 | 
			
		||||
Kickstart.nvim is *not* a distribution.
 | 
			
		||||
 | 
			
		||||
Kickstart.nvim is a template for your own configuration.
 | 
			
		||||
  The goal is that you can read every line of code, top-to-bottom, understand
 | 
			
		||||
  what your configuration is doing, and modify it to suit your needs.
 | 
			
		||||
 | 
			
		||||
  Once you've done that, you should start exploring, configuring and tinkering to
 | 
			
		||||
  explore Neovim!
 | 
			
		||||
 | 
			
		||||
  If you don't know anything about Lua, I recommend taking some time to read through
 | 
			
		||||
  a guide. One possible example:
 | 
			
		||||
  - https://learnxinyminutes.com/docs/lua/
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
  And then you can explore or search through `:help lua-guide`
 | 
			
		||||
  - https://neovim.io/doc/user/lua-guide.html
 | 
			
		||||
 | 
			
		||||
 | 
			
		||||
Kickstart Guide:
 | 
			
		||||
 | 
			
		||||
I have left several `:help X` comments throughout the init.lua
 | 
			
		||||
You should run that command and read that help section for more information.
 | 
			
		||||
 | 
			
		||||
In addition, I have some `NOTE:` items throughout the file.
 | 
			
		||||
These are for you, the reader to help understand what is happening. Feel free to delete
 | 
			
		||||
them once you know what you're doing, but they should serve as a guide for when you
 | 
			
		||||
are first encountering a few different constructs in your nvim config.
 | 
			
		||||
 | 
			
		||||
I hope you enjoy your Neovim journey,
 | 
			
		||||
- TJ
 | 
			
		||||
 | 
			
		||||
P.S. You can delete this when you're done too. It's your config now :)
 | 
			
		||||
--]]
 | 
			
		||||
 | 
			
		||||
-- Set <space> as the leader key
 | 
			
		||||
-- See `:help mapleader`
 | 
			
		||||
--  NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
 | 
			
		||||
vim.g.mapleader = ' '
 | 
			
		||||
vim.g.maplocalleader = ' '
 | 
			
		||||
 | 
			
		||||
-- [[ Install `lazy.nvim` plugin manager ]]
 | 
			
		||||
--    https://github.com/folke/lazy.nvim
 | 
			
		||||
--    `:help lazy.nvim.txt` for more info
 | 
			
		||||
local lazypath = vim.fn.stdpath 'data' .. '/lazy/lazy.nvim'
 | 
			
		||||
if not vim.loop.fs_stat(lazypath) then
 | 
			
		||||
  vim.fn.system {
 | 
			
		||||
    'git',
 | 
			
		||||
    'clone',
 | 
			
		||||
    '--filter=blob:none',
 | 
			
		||||
    'https://github.com/folke/lazy.nvim.git',
 | 
			
		||||
    '--branch=stable', -- latest stable release
 | 
			
		||||
    lazypath,
 | 
			
		||||
  }
 | 
			
		||||
end
 | 
			
		||||
vim.opt.rtp:prepend(lazypath)
 | 
			
		||||
 | 
			
		||||
-- [[ Configure plugins ]]
 | 
			
		||||
-- NOTE: Here is where you install your plugins.
 | 
			
		||||
--  You can configure plugins using the `config` key.
 | 
			
		||||
--
 | 
			
		||||
--  You can also configure plugins after the setup call,
 | 
			
		||||
--    as they will be available in your neovim runtime.
 | 
			
		||||
require('lazy').setup({
 | 
			
		||||
  -- NOTE: First, some plugins that don't require any configuration
 | 
			
		||||
 | 
			
		||||
  -- Git related plugins
 | 
			
		||||
  'tpope/vim-fugitive',
 | 
			
		||||
  'tpope/vim-rhubarb',
 | 
			
		||||
 | 
			
		||||
  -- Detect tabstop and shiftwidth automatically
 | 
			
		||||
  'tpope/vim-sleuth',
 | 
			
		||||
 | 
			
		||||
  -- NOTE: This is where your plugins related to LSP can be installed.
 | 
			
		||||
  --  The configuration is done below. Search for lspconfig to find it below.
 | 
			
		||||
  {
 | 
			
		||||
    -- LSP Configuration & Plugins
 | 
			
		||||
    'neovim/nvim-lspconfig',
 | 
			
		||||
    dependencies = {
 | 
			
		||||
      -- Automatically install LSPs to stdpath for neovim
 | 
			
		||||
      'williamboman/mason.nvim',
 | 
			
		||||
      'williamboman/mason-lspconfig.nvim',
 | 
			
		||||
 | 
			
		||||
      -- Useful status updates for LSP
 | 
			
		||||
      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
 | 
			
		||||
      { 'j-hui/fidget.nvim', opts = {} },
 | 
			
		||||
 | 
			
		||||
      -- Additional lua configuration, makes nvim stuff amazing!
 | 
			
		||||
      'folke/neodev.nvim',
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  {
 | 
			
		||||
    -- Autocompletion
 | 
			
		||||
    'hrsh7th/nvim-cmp',
 | 
			
		||||
    dependencies = {
 | 
			
		||||
      -- Snippet Engine & its associated nvim-cmp source
 | 
			
		||||
      'L3MON4D3/LuaSnip',
 | 
			
		||||
      'saadparwaiz1/cmp_luasnip',
 | 
			
		||||
 | 
			
		||||
      -- Adds LSP completion capabilities
 | 
			
		||||
      'hrsh7th/cmp-nvim-lsp',
 | 
			
		||||
      'hrsh7th/cmp-path',
 | 
			
		||||
 | 
			
		||||
      -- Adds a number of user-friendly snippets
 | 
			
		||||
      'rafamadriz/friendly-snippets',
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  -- Useful plugin to show you pending keybinds.
 | 
			
		||||
  { 'folke/which-key.nvim',  opts = {} },
 | 
			
		||||
  {
 | 
			
		||||
    -- Adds git related signs to the gutter, as well as utilities for managing changes
 | 
			
		||||
    'lewis6991/gitsigns.nvim',
 | 
			
		||||
    opts = {
 | 
			
		||||
      -- See `:help gitsigns.txt`
 | 
			
		||||
      signs = {
 | 
			
		||||
        add = { text = '+' },
 | 
			
		||||
        change = { text = '~' },
 | 
			
		||||
        delete = { text = '_' },
 | 
			
		||||
        topdelete = { text = '‾' },
 | 
			
		||||
        changedelete = { text = '~' },
 | 
			
		||||
      },
 | 
			
		||||
      on_attach = function(bufnr)
 | 
			
		||||
        local gs = package.loaded.gitsigns
 | 
			
		||||
 | 
			
		||||
        local function map(mode, l, r, opts)
 | 
			
		||||
          opts = opts or {}
 | 
			
		||||
          opts.buffer = bufnr
 | 
			
		||||
          vim.keymap.set(mode, l, r, opts)
 | 
			
		||||
        end
 | 
			
		||||
 | 
			
		||||
        -- Navigation
 | 
			
		||||
        map({ 'n', 'v' }, ']c', function()
 | 
			
		||||
          if vim.wo.diff then
 | 
			
		||||
            return ']c'
 | 
			
		||||
          end
 | 
			
		||||
          vim.schedule(function()
 | 
			
		||||
            gs.next_hunk()
 | 
			
		||||
          end)
 | 
			
		||||
          return '<Ignore>'
 | 
			
		||||
        end, { expr = true, desc = 'Jump to next hunk' })
 | 
			
		||||
 | 
			
		||||
        map({ 'n', 'v' }, '[c', function()
 | 
			
		||||
          if vim.wo.diff then
 | 
			
		||||
            return '[c'
 | 
			
		||||
          end
 | 
			
		||||
          vim.schedule(function()
 | 
			
		||||
            gs.prev_hunk()
 | 
			
		||||
          end)
 | 
			
		||||
          return '<Ignore>'
 | 
			
		||||
        end, { expr = true, desc = 'Jump to previous hunk' })
 | 
			
		||||
 | 
			
		||||
        -- Actions
 | 
			
		||||
        -- visual mode
 | 
			
		||||
        map('v', '<leader>hs', function()
 | 
			
		||||
          gs.stage_hunk { vim.fn.line '.', vim.fn.line 'v' }
 | 
			
		||||
        end, { desc = 'stage git hunk' })
 | 
			
		||||
        map('v', '<leader>hr', function()
 | 
			
		||||
          gs.reset_hunk { vim.fn.line '.', vim.fn.line 'v' }
 | 
			
		||||
        end, { desc = 'reset git hunk' })
 | 
			
		||||
        -- normal mode
 | 
			
		||||
        map('n', '<leader>hs', gs.stage_hunk, { desc = 'git stage hunk' })
 | 
			
		||||
        map('n', '<leader>hr', gs.reset_hunk, { desc = 'git reset hunk' })
 | 
			
		||||
        map('n', '<leader>hS', gs.stage_buffer, { desc = 'git Stage buffer' })
 | 
			
		||||
        map('n', '<leader>hu', gs.undo_stage_hunk, { desc = 'undo stage hunk' })
 | 
			
		||||
        map('n', '<leader>hR', gs.reset_buffer, { desc = 'git Reset buffer' })
 | 
			
		||||
        map('n', '<leader>hp', gs.preview_hunk, { desc = 'preview git hunk' })
 | 
			
		||||
        map('n', '<leader>hb', function()
 | 
			
		||||
          gs.blame_line { full = false }
 | 
			
		||||
        end, { desc = 'git blame line' })
 | 
			
		||||
        map('n', '<leader>hd', gs.diffthis, { desc = 'git diff against index' })
 | 
			
		||||
        map('n', '<leader>hD', function()
 | 
			
		||||
          gs.diffthis '~'
 | 
			
		||||
        end, { desc = 'git diff against last commit' })
 | 
			
		||||
 | 
			
		||||
        -- Toggles
 | 
			
		||||
        map('n', '<leader>tb', gs.toggle_current_line_blame, { desc = 'toggle git blame line' })
 | 
			
		||||
        map('n', '<leader>td', gs.toggle_deleted, { desc = 'toggle git show deleted' })
 | 
			
		||||
 | 
			
		||||
        -- Text object
 | 
			
		||||
        map({ 'o', 'x' }, 'ih', ':<C-U>Gitsigns select_hunk<CR>', { desc = 'select git hunk' })
 | 
			
		||||
      end,
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  {
 | 
			
		||||
    -- Theme inspired by Atom
 | 
			
		||||
    'navarasu/onedark.nvim',
 | 
			
		||||
    priority = 1000,
 | 
			
		||||
    config = function()
 | 
			
		||||
      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,
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
 | 
			
		||||
  {
 | 
			
		||||
    -- 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 ]]
 | 
			
		||||
-- See `:help vim.o`
 | 
			
		||||
-- NOTE: You can change these options as you wish!
 | 
			
		||||
 | 
			
		||||
-- Set highlight on search
 | 
			
		||||
vim.o.hlsearch = false
 | 
			
		||||
 | 
			
		||||
-- Make line numbers default
 | 
			
		||||
vim.wo.number = true
 | 
			
		||||
vim.opt.relativenumber = true
 | 
			
		||||
 | 
			
		||||
-- Enable mouse mode
 | 
			
		||||
vim.o.mouse = 'a'
 | 
			
		||||
 | 
			
		||||
-- Sync clipboard between OS and Neovim.
 | 
			
		||||
--  Remove this option if you want your OS clipboard to remain independent.
 | 
			
		||||
--  See `:help 'clipboard'`
 | 
			
		||||
vim.o.clipboard = 'unnamedplus'
 | 
			
		||||
 | 
			
		||||
-- Enable break indent
 | 
			
		||||
vim.o.breakindent = true
 | 
			
		||||
 | 
			
		||||
-- Save undo history
 | 
			
		||||
vim.o.undofile = true
 | 
			
		||||
 | 
			
		||||
-- Case-insensitive searching UNLESS \C or capital in search
 | 
			
		||||
vim.o.ignorecase = true
 | 
			
		||||
vim.o.smartcase = true
 | 
			
		||||
 | 
			
		||||
-- Keep signcolumn on by default
 | 
			
		||||
vim.wo.signcolumn = 'yes'
 | 
			
		||||
 | 
			
		||||
-- Decrease update time
 | 
			
		||||
vim.o.updatetime = 250
 | 
			
		||||
vim.o.timeoutlen = 300
 | 
			
		||||
 | 
			
		||||
-- Set completeopt to have a better completion experience
 | 
			
		||||
vim.o.completeopt = 'menuone,noselect'
 | 
			
		||||
 | 
			
		||||
-- NOTE: You should make sure your terminal supports this
 | 
			
		||||
vim.o.termguicolors = true
 | 
			
		||||
 | 
			
		||||
-- [[ Basic Keymaps ]]
 | 
			
		||||
 | 
			
		||||
-- Keymaps for better default experience
 | 
			
		||||
-- See `:help vim.keymap.set()`
 | 
			
		||||
vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
 | 
			
		||||
 | 
			
		||||
-- Remap for dealing with word wrap
 | 
			
		||||
vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
 | 
			
		||||
vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
 | 
			
		||||
 | 
			
		||||
-- Diagnostic keymaps
 | 
			
		||||
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
 | 
			
		||||
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next 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' })
 | 
			
		||||
 | 
			
		||||
-- [[ Highlight on yank ]]
 | 
			
		||||
-- See `:help vim.highlight.on_yank()`
 | 
			
		||||
local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
 | 
			
		||||
vim.api.nvim_create_autocmd('TextYankPost', {
 | 
			
		||||
  callback = function()
 | 
			
		||||
    vim.highlight.on_yank()
 | 
			
		||||
  end,
 | 
			
		||||
  group = highlight_group,
 | 
			
		||||
  pattern = '*',
 | 
			
		||||
})
 | 
			
		||||
 | 
			
		||||
-- [[ Configure Telescope ]]
 | 
			
		||||
-- See `:help telescope` and `:help telescope.setup()`
 | 
			
		||||
require('telescope').setup {
 | 
			
		||||
  defaults = {
 | 
			
		||||
    mappings = {
 | 
			
		||||
      i = {
 | 
			
		||||
        ['<C-u>'] = false,
 | 
			
		||||
        ['<C-d>'] = false,
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
-- Enable telescope fzf native, if installed
 | 
			
		||||
pcall(require('telescope').load_extension, 'fzf')
 | 
			
		||||
 | 
			
		||||
-- Telescope live_grep in git root
 | 
			
		||||
-- Function to find the git root directory based on the current buffer's path
 | 
			
		||||
local function find_git_root()
 | 
			
		||||
  -- 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_dir
 | 
			
		||||
  local cwd = vim.fn.getcwd()
 | 
			
		||||
  -- If the buffer is not associated with a file, return nil
 | 
			
		||||
  if current_file == '' then
 | 
			
		||||
    current_dir = cwd
 | 
			
		||||
  else
 | 
			
		||||
    -- Extract the directory from the current file's path
 | 
			
		||||
    current_dir = vim.fn.fnamemodify(current_file, ':h')
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  -- 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]
 | 
			
		||||
  if vim.v.shell_error ~= 0 then
 | 
			
		||||
    print 'Not a git repository. Searching on current working directory'
 | 
			
		||||
    return cwd
 | 
			
		||||
  end
 | 
			
		||||
  return git_root
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
-- Custom live_grep function to search in git root
 | 
			
		||||
local function live_grep_git_root()
 | 
			
		||||
  local git_root = find_git_root()
 | 
			
		||||
  if git_root then
 | 
			
		||||
    require('telescope.builtin').live_grep {
 | 
			
		||||
      search_dirs = { git_root },
 | 
			
		||||
    }
 | 
			
		||||
  end
 | 
			
		||||
end
 | 
			
		||||
 | 
			
		||||
vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {})
 | 
			
		||||
 | 
			
		||||
-- See `:help telescope.builtin`
 | 
			
		||||
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>/', function()
 | 
			
		||||
  -- You can pass additional configuration to telescope to change theme, layout, etc.
 | 
			
		||||
  require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
 | 
			
		||||
    winblend = 10,
 | 
			
		||||
    previewer = false,
 | 
			
		||||
  })
 | 
			
		||||
end, { desc = '[/] Fuzzily search in current buffer' })
 | 
			
		||||
 | 
			
		||||
local function telescope_live_grep_open_files()
 | 
			
		||||
  require('telescope.builtin').live_grep {
 | 
			
		||||
    grep_open_files = true,
 | 
			
		||||
    prompt_title = 'Live Grep in Open Files',
 | 
			
		||||
  }
 | 
			
		||||
end
 | 
			
		||||
vim.keymap.set('n', '<leader>s/', telescope_live_grep_open_files, { desc = '[S]earch [/] in Open Files' })
 | 
			
		||||
vim.keymap.set('n', '<leader>ss', require('telescope.builtin').builtin, { desc = '[S]earch [S]elect Telescope' })
 | 
			
		||||
vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
 | 
			
		||||
vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
 | 
			
		||||
vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
 | 
			
		||||
vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
 | 
			
		||||
vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
 | 
			
		||||
vim.keymap.set('n', '<leader>sG', ':LiveGrepGitRoot<cr>', { desc = '[S]earch by [G]rep on Git Root' })
 | 
			
		||||
vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
 | 
			
		||||
vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' })
 | 
			
		||||
 | 
			
		||||
-- [[ Configure Treesitter ]]
 | 
			
		||||
-- See `:help nvim-treesitter`
 | 
			
		||||
-- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
 | 
			
		||||
vim.defer_fn(function()
 | 
			
		||||
  require('nvim-treesitter.configs').setup {
 | 
			
		||||
    -- 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' },
 | 
			
		||||
 | 
			
		||||
    -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
 | 
			
		||||
    auto_install = false,
 | 
			
		||||
 | 
			
		||||
    highlight = { enable = true },
 | 
			
		||||
    indent = { enable = true },
 | 
			
		||||
    incremental_selection = {
 | 
			
		||||
      enable = true,
 | 
			
		||||
      keymaps = {
 | 
			
		||||
        init_selection = '<c-space>',
 | 
			
		||||
        node_incremental = '<c-space>',
 | 
			
		||||
        scope_incremental = '<c-s>',
 | 
			
		||||
        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',
 | 
			
		||||
        },
 | 
			
		||||
      },
 | 
			
		||||
      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',
 | 
			
		||||
        },
 | 
			
		||||
      },
 | 
			
		||||
    },
 | 
			
		||||
  }
 | 
			
		||||
end, 0)
 | 
			
		||||
 | 
			
		||||
-- [[ Configure LSP ]]
 | 
			
		||||
--  This function gets run when an LSP connects to a particular buffer.
 | 
			
		||||
local on_attach = function(_, bufnr)
 | 
			
		||||
  -- 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
 | 
			
		||||
  -- many times.
 | 
			
		||||
  --
 | 
			
		||||
  -- 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.
 | 
			
		||||
  local nmap = function(keys, func, desc)
 | 
			
		||||
    if desc then
 | 
			
		||||
      desc = 'LSP: ' .. desc
 | 
			
		||||
    end
 | 
			
		||||
 | 
			
		||||
    vim.keymap.set('n', keys, func, { buffer = bufnr, desc = desc })
 | 
			
		||||
  end
 | 
			
		||||
 | 
			
		||||
  nmap('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
 | 
			
		||||
  nmap('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction')
 | 
			
		||||
 | 
			
		||||
  nmap('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
 | 
			
		||||
  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')
 | 
			
		||||
 | 
			
		||||
  -- See `:help K` for why this keymap
 | 
			
		||||
  nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
 | 
			
		||||
  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
 | 
			
		||||
 | 
			
		||||
  -- Lesser used LSP functionality
 | 
			
		||||
  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
 | 
			
		||||
  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')
 | 
			
		||||
 | 
			
		||||
  -- 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
 | 
			
		||||
 | 
			
		||||
-- document existing key chains
 | 
			
		||||
require('which-key').register {
 | 
			
		||||
  ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
 | 
			
		||||
  ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
 | 
			
		||||
  ['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
 | 
			
		||||
  ['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
 | 
			
		||||
  ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
 | 
			
		||||
  ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
 | 
			
		||||
  ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
 | 
			
		||||
  ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
 | 
			
		||||
}
 | 
			
		||||
-- register which-key VISUAL mode
 | 
			
		||||
-- required for visual <leader>hs (hunk stage) to work
 | 
			
		||||
require('which-key').register({
 | 
			
		||||
  ['<leader>'] = { name = 'VISUAL <leader>' },
 | 
			
		||||
  ['<leader>h'] = { 'Git [H]unk' },
 | 
			
		||||
}, { mode = 'v' })
 | 
			
		||||
 | 
			
		||||
-- mason-lspconfig requires that these setup functions are called in this order
 | 
			
		||||
-- before setting up the servers.
 | 
			
		||||
require('mason').setup()
 | 
			
		||||
require('mason-lspconfig').setup()
 | 
			
		||||
 | 
			
		||||
-- Enable the following language servers
 | 
			
		||||
--  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
 | 
			
		||||
--
 | 
			
		||||
--  Add any additional override configuration in the following tables. They will be passed to
 | 
			
		||||
--  the `settings` field of the server config. You must look up that documentation yourself.
 | 
			
		||||
--
 | 
			
		||||
--  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.
 | 
			
		||||
local servers = {
 | 
			
		||||
  -- clangd = {},
 | 
			
		||||
  -- gopls = {},
 | 
			
		||||
  -- pyright = {},
 | 
			
		||||
  -- rust_analyzer = {},
 | 
			
		||||
  -- tsserver = {},
 | 
			
		||||
  -- html = { filetypes = { 'html', 'twig', 'hbs'} },
 | 
			
		||||
 | 
			
		||||
  lua_ls = {
 | 
			
		||||
    Lua = {
 | 
			
		||||
      workspace = { checkThirdParty = false },
 | 
			
		||||
      telemetry = { enable = false },
 | 
			
		||||
      -- NOTE: toggle below to ignore Lua_LS's noisy `missing-fields` warnings
 | 
			
		||||
      -- diagnostics = { disable = { 'missing-fields' } },
 | 
			
		||||
    },
 | 
			
		||||
  },
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
-- Setup neovim lua configuration
 | 
			
		||||
require('neodev').setup()
 | 
			
		||||
 | 
			
		||||
-- nvim-cmp supports additional completion capabilities, so broadcast that to servers
 | 
			
		||||
local capabilities = vim.lsp.protocol.make_client_capabilities()
 | 
			
		||||
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
 | 
			
		||||
 | 
			
		||||
-- Ensure the servers above are installed
 | 
			
		||||
local mason_lspconfig = require 'mason-lspconfig'
 | 
			
		||||
 | 
			
		||||
mason_lspconfig.setup {
 | 
			
		||||
  ensure_installed = vim.tbl_keys(servers),
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
mason_lspconfig.setup_handlers {
 | 
			
		||||
  function(server_name)
 | 
			
		||||
    require('lspconfig')[server_name].setup {
 | 
			
		||||
      capabilities = capabilities,
 | 
			
		||||
      on_attach = on_attach,
 | 
			
		||||
      settings = servers[server_name],
 | 
			
		||||
      filetypes = (servers[server_name] or {}).filetypes,
 | 
			
		||||
    }
 | 
			
		||||
  end,
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
-- [[ Configure nvim-cmp ]]
 | 
			
		||||
-- See `:help cmp`
 | 
			
		||||
local cmp = require 'cmp'
 | 
			
		||||
local luasnip = require 'luasnip'
 | 
			
		||||
require('luasnip.loaders.from_vscode').lazy_load()
 | 
			
		||||
luasnip.config.setup {}
 | 
			
		||||
 | 
			
		||||
cmp.setup {
 | 
			
		||||
  snippet = {
 | 
			
		||||
    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)
 | 
			
		||||
      if cmp.visible() then
 | 
			
		||||
        cmp.select_next_item()
 | 
			
		||||
      elseif luasnip.expand_or_locally_jumpable() then
 | 
			
		||||
        luasnip.expand_or_jump()
 | 
			
		||||
      else
 | 
			
		||||
        fallback()
 | 
			
		||||
      end
 | 
			
		||||
    end, { 'i', 's' }),
 | 
			
		||||
    ['<S-Tab>'] = cmp.mapping(function(fallback)
 | 
			
		||||
      if cmp.visible() then
 | 
			
		||||
        cmp.select_prev_item()
 | 
			
		||||
      elseif luasnip.locally_jumpable(-1) then
 | 
			
		||||
        luasnip.jump(-1)
 | 
			
		||||
      else
 | 
			
		||||
        fallback()
 | 
			
		||||
      end
 | 
			
		||||
    end, { 'i', 's' }),
 | 
			
		||||
  },
 | 
			
		||||
  sources = {
 | 
			
		||||
    { name = 'nvim_lsp' },
 | 
			
		||||
    { name = 'luasnip' },
 | 
			
		||||
    { name = 'path' },
 | 
			
		||||
  },
 | 
			
		||||
}
 | 
			
		||||
 | 
			
		||||
-- The line beneath this is called `modeline`. See `:help modeline`
 | 
			
		||||
-- vim: ts=2 sts=2 sw=2 et
 | 
			
		||||
		Loading…
	
		Reference in New Issue