bollian/dotfiles - Change 3DFJKTDVL7O4RYWXKC7HEE2VFDWUZVE33DZP4QIJ6MO3ANQXD4LQC

general cleanup

Created by Ian Boll on June 2, 2022

3DFJKTDVL7O4RYWXKC7HEE2VFDWUZVE33DZP4QIJ6MO3ANQXD4LQC

Dependencies

In channels

main

Change contents

Deletion in .config/nvim/init.vim at line 117 [4.19]

B:BD[3.2322] → [3.2322:2323]

B:BD[3.2634] → [3.2634:2760]


function! s:check_back_space() abort
    let col = col('.') - 1
    return !col || getline('.')[col - 1]  =~ '\s'
endfunction

Replacement in .config/nvim/lua/lsp.lua at line 14 [3.2925]

∅:D[5.1026] → [3.3491:3748]

B:BD[3.3491] → [3.3491:3748]

B:BD[3.3748] → [6.163:262]

    local opts = { noremap=true, silent=true }
    -- there are several goto def/impl/decl actions. this first one is my favorite
    buf_set_keymap(bufnr, 'n', 'gd',             '<cmd>lua vim.lsp.buf.definition()<cr>', opts)
    -- the traditional mapping
    -- buf_set_keymap(bufnr, 'n', '<c-]>',          '<cmd>lua vim.lsp.buf.definition()<cr>', opts)

[5.1026]

[3.3844]

  -- require 'cmp_nvim_lsp'.update_cababilities(vim.lsp.protocol.make_client_capabilities)

Replacement in .config/nvim/lua/lsp.lua at line 16 [3.2925]

B:BD[3.3845] → [3.3845:4033]

B:BD[3.4033] → [7.1119:1222]

∅:D[7.1222] → [3.4133:4234]

B:BD[3.4133] → [3.4133:4234]

B:BD[3.4234] → [7.1223:1895]

∅:D[7.1895] → [3.4533:4625]

B:BD[3.4533] → [3.4533:4625]

B:BD[3.4625] → [6.263:373]

∅:D[6.373] → [7.2010:2107]

B:BD[7.2010] → [7.2010:2107]

    buf_set_keymap(bufnr, 'n', 'K',              '<cmd>lua vim.lsp.buf.hover()<cr>', opts)
    buf_set_keymap(bufnr, 'n', 'gD',             '<cmd>lua vim.lsp.buf.declaration()<cr>', opts)
    -- buf_set_keymap(bufnr, 'n', '<c-k>',          '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts)
    buf_set_keymap(bufnr, 'n', '1gD',            '<cmd>lua vim.lsp.buf.type_definition()<cr>', opts)
    buf_set_keymap(bufnr, 'n', 'gr',             '<cmd>lua require\'telescope.builtin\'.lsp_references()<cr>', opts)
    buf_set_keymap(bufnr, 'n', 'g0',             '<cmd>lua require\'telescope.builtin\'.lsp_document_symbols()<cr>', opts)
    buf_set_keymap(bufnr, 'n', 'gw',             '<cmd>lua require\'telescope.builtin\'.lsp_workspace_symbols()<cr>', opts)
    -- buf_set_keymap(bufnr, 'n', 'gr',             '<cmd>lua vim.lsp.buf.references()<cr>', opts)
    -- buf_set_keymap(bufnr, 'n', 'g0',             '<cmd>lua vim.lsp.buf.document_symbol()<cr>', opts)
    -- buf_set_keymap(bufnr, 'n', 'gW',             '<cmd>lua vim.lsp.buf.workspace_symbol()<cr>', opts)
    buf_set_keymap(bufnr, 'n', '<localleader>r', '<cmd>lua vim.lsp.buf.rename()<cr>', opts)
    buf_set_keymap(bufnr, 'n', '<localleader>d', '<cmd>lua vim.diagnostic.show_line_diagnostics()<cr>', opts)
    buf_set_keymap(bufnr, 'n', '<localleader>a', '<cmd>lua vim.lsp.buf.code_action()<cr>', opts)

[3.3845]

[3.4733]

  local opts = { noremap=true, silent=true }
  -- there are several goto def/impl/decl actions. this first one is my favorite
  buf_set_keymap(bufnr, 'n', 'gd',             '<cmd>lua vim.lsp.buf.definition()<cr>', opts)
  -- the traditional mapping
  -- buf_set_keymap(bufnr, 'n', '<c-]>',          '<cmd>lua vim.lsp.buf.definition()<cr>', opts)

Replacement in .config/nvim/lua/lsp.lua at line 22 [3.2925]

B:BD[3.4734] → [3.4734:4771]

B:BD[3.4771] → [6.374:546]

    -- configuration for diagnostics
    buf_set_keymap(bufnr, 'n', 'g[', '<cmd>lua vim.diagnostic.goto_prev()<cr>', opts)
    buf_set_keymap(bufnr, 'n', 'g]', '<cmd>lua vim.diagnostic.goto_next()<cr>', opts)

[3.4734]

[3.4951]

  buf_set_keymap(bufnr, 'n', 'K',              '<cmd>lua vim.lsp.buf.hover()<cr>', opts)
  buf_set_keymap(bufnr, 'n', 'gD',             '<cmd>lua vim.lsp.buf.declaration()<cr>', opts)
  -- buf_set_keymap(bufnr, 'n', '<c-k>',          '<cmd>lua vim.lsp.buf.signature_help()<cr>', opts)
  buf_set_keymap(bufnr, 'n', '1gD',            '<cmd>lua vim.lsp.buf.type_definition()<cr>', opts)
  buf_set_keymap(bufnr, 'n', 'gr',             '<cmd>lua require\'telescope.builtin\'.lsp_references()<cr>', opts)
  buf_set_keymap(bufnr, 'n', 'g0',             '<cmd>lua require\'telescope.builtin\'.lsp_document_symbols()<cr>', opts)
  buf_set_keymap(bufnr, 'n', 'gw',             '<cmd>lua require\'telescope.builtin\'.lsp_workspace_symbols()<cr>', opts)
  -- buf_set_keymap(bufnr, 'n', 'gr',             '<cmd>lua vim.lsp.buf.references()<cr>', opts)
  -- buf_set_keymap(bufnr, 'n', 'g0',             '<cmd>lua vim.lsp.buf.document_symbol()<cr>', opts)
  -- buf_set_keymap(bufnr, 'n', 'gW',             '<cmd>lua vim.lsp.buf.workspace_symbol()<cr>', opts)
  buf_set_keymap(bufnr, 'n', '<localleader>r', '<cmd>lua vim.lsp.buf.rename()<cr>', opts)
  buf_set_keymap(bufnr, 'n', '<localleader>d', '<cmd>lua vim.diagnostic.show_line_diagnostics()<cr>', opts)
  buf_set_keymap(bufnr, 'n', '<localleader>a', '<cmd>lua vim.lsp.buf.code_action()<cr>', opts)

Replacement in .config/nvim/lua/lsp.lua at line 36 [3.2925]

B:BD[3.4952] → [3.4952:5103]

    -- TODO: add a mapping for goto implementation
    -- buf_set_keymap(bufnr, 'n', 'gd',          '<cmd>lua vim.lsp.buf.implementation()<cr>', opts)

[3.4952]

[3.5103]

  -- configuration for diagnostics
  buf_set_keymap(bufnr, 'n', 'g[', '<cmd>lua vim.diagnostic.goto_prev()<cr>', opts)
  buf_set_keymap(bufnr, 'n', 'g]', '<cmd>lua vim.diagnostic.goto_next()<cr>', opts)
  -- TODO: add a mapping for goto implementation
  -- buf_set_keymap(bufnr, 'n', 'gd',          '<cmd>lua vim.lsp.buf.implementation()<cr>', opts)

Replacement in .config/nvim/lua/options.lua at line 118 [3.7955]
∅:D[2.738] → [5.4295:4327]
B:BD[3.8931] → [5.4295:4327]
```
require'nvim-autopairs'.setup()
```
[2.738]
[3.9039]
```
require'nvim-autopairs'.setup {}
```
Replacement in .config/nvim/lua/options.lua at line 120 [3.7955]
B:BD[3.9040] → [5.4359:4384]
```
require'neoclip'.setup{}
```
[3.9040]
[7.2268]
```
require'neoclip'.setup {}
```

Replacement in .config/nvim/lua/options.lua at line 122 [3.7955]

B:BD[7.2269] → [6.1273:1480]

require 'nvim-gps'.setup {
  -- icons = {
  --   ['class-name'] = 'C ',
  --   ['function-name'] = 'f ',
  --   ['method-name'] = 'm ',
  --   ['container-name'] = 'n ',
  --   ['tag-name'] = 't ',
  -- }
}

[7.2269]

require 'nvim-gps'.setup {}

Replacement in .config/nvim/lua/plugins.lua at line 12 [5.4535]

B:BD[5.4889] → [5.4889:5359]

B:BD[5.5390] → [5.5390:5452]

    use 'wbthomason/packer.nvim'
    -- UI Elements
    use { 'junegunn/fzf', run = function() vim.cmd[[fzf#install()]] end }
    use 'junegunn/fzf.vim'
    use {
        'nvim-telescope/telescope.nvim',
        requires = {{'nvim-lua/popup.nvim'}, {'nvim-lua/plenary.nvim'}}
    }
    use 'airblade/vim-gitgutter'
    use 'hoob3rt/lualine.nvim'
    use 'romgrk/barbar.nvim'
    use 'lambdalisue/fern.vim'
    use 'voldikss/vim-floaterm'
    use 'mfussenegger/nvim-dap'
    use 'AckslD/nvim-neoclip.lua'
    use 'SmiteshP/nvim-gps'

[5.4889]

[5.5452]

  use 'wbthomason/packer.nvim'
  -- UI Elements
  use { 'junegunn/fzf', run = function() vim.cmd[[fzf#install()]] end }
  use 'junegunn/fzf.vim'
  use {
    'nvim-telescope/telescope.nvim',
    requires = {'nvim-lua/popup.nvim', 'nvim-lua/plenary.nvim'}
  }
  use 'airblade/vim-gitgutter'
  use 'hoob3rt/lualine.nvim'
  use 'romgrk/barbar.nvim'
  use 'lambdalisue/fern.vim'
  use 'voldikss/vim-floaterm'
  use 'mfussenegger/nvim-dap'
  use 'AckslD/nvim-neoclip.lua'
  use 'SmiteshP/nvim-gps'

Replacement in .config/nvim/lua/plugins.lua at line 29 [5.4535]

B:BD[5.5453] → [5.5453:5518]

    -- Git
    use 'tpope/vim-fugitive'
    use 'rbong/vim-flog'

[5.5453]

[2.740]

  -- Git
  use 'tpope/vim-fugitive'
  use 'rbong/vim-flog'

Replacement in .config/nvim/lua/plugins.lua at line 34 [5.4535]

B:BD[5.5519] → [5.5519:5548]

B:BD[5.5548] → [2.812:844]

∅:D[2.844] → [5.5578:5750]

B:BD[5.5578] → [5.5578:5750]

    -- Editing functionality
    use 'numToStr/Comment.nvim'
    use 'tpope/vim-obsession'
    use 'tpope/vim-surround'
    use 'tpope/vim-repeat'
    use 'nvim-treesitter/nvim-treesitter-textobjects'
    use 'windwp/nvim-autopairs'

[5.5519]

[5.5750]

  -- Editing functionality
  use 'numToStr/Comment.nvim'
  use 'tpope/vim-obsession'
  use 'tpope/vim-surround'
  use 'tpope/vim-repeat'
  use 'nvim-treesitter/nvim-treesitter-textobjects'
  use 'windwp/nvim-autopairs'

Replacement in .config/nvim/lua/plugins.lua at line 42 [5.4535]

B:BD[5.5751] → [5.5751:5875]

B:BD[5.5875] → [6.1522:1564]

B:BD[6.1564] → [2.845:1053]

    -- LSP support
    use 'neovim/nvim-lspconfig'
    use 'nvim-lua/lsp_extensions.nvim'
    use 'kosayoda/nvim-lightbulb'
    -- use 'hrsh7th/nvim-compe'
    use {
        'hrsh7th/nvim-cmp',
        requires = {
            'quangnguyen30192/cmp-nvim-tags',
            'hrsh7th/cmp-nvim-lsp',
            'hrsh7th/cmp-path',
            'hrsh7th/cmp-cmdline',
        }

[5.5751]

[6.1658]

  -- LSP support
  use 'neovim/nvim-lspconfig'
  use 'nvim-lua/lsp_extensions.nvim'
  use 'kosayoda/nvim-lightbulb'
  -- use 'hrsh7th/nvim-compe'
  use {
    'hrsh7th/nvim-cmp',
    requires = {
      'quangnguyen30192/cmp-nvim-tags',
      'hrsh7th/cmp-nvim-lsp',
      'hrsh7th/cmp-path',
      'hrsh7th/cmp-cmdline',

Replacement in .config/nvim/lua/plugins.lua at line 55 [5.4535]
∅:D[6.1664] → [5.5904:5939]
B:BD[5.5904] → [5.5904:5939]
```
    use 'ray-x/lsp_signature.nvim'
```
[6.1664]
[5.5939]
```
  }
  use 'ray-x/lsp_signature.nvim'
```

Replacement in .config/nvim/lua/plugins.lua at line 58 [5.4535]

B:BD[5.5940] → [5.5940:5973]

B:BD[5.6008] → [5.6008:6062]

    -- Language-specific plugins
    use 'arm9/arm-syntax-vim'
    use 'lervag/vimtex'

[5.5940]

[5.6062]

  -- Language-specific plugins
  use 'arm9/arm-syntax-vim'
  use 'lervag/vimtex'

Replacement in .config/nvim/lua/plugins.lua at line 62 [5.4535]

B:BD[5.6063] → [5.6063:6159]

B:BD[5.6159] → [6.1665:1821]

∅:D[6.1821] → [5.6247:6284]

B:BD[5.6247] → [5.6247:6284]

    -- Aesthetic plugins
    use 'eddyekofo94/gruvbox-flat.nvim'
    use 'sheerun/vim-polyglot'
    -- use { 'nvim-treesitter/nvim-treesitter', branch = '0.5-compat', run = ':TSUpdate' }
    use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
    use 'nvim-treesitter/playground'

[5.6063]

[5.6284]

  -- Aesthetic plugins
  use 'eddyekofo94/gruvbox-flat.nvim'
  use 'sheerun/vim-polyglot'
  -- use { 'nvim-treesitter/nvim-treesitter', branch = '0.5-compat', run = ':TSUpdate' }
  use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
  use 'nvim-treesitter/playground'

Replacement in .config/nvim/lua/treesitter.lua at line 10 [3.10082]

B:BD[3.10350] → [3.10350:10391]

B:BD[3.10391] → [7.4097:4169]

    highlight = {
        enable = true,
        -- disable = {'rust', 'python'} -- list of languages to disable

[3.10313]

[3.10450]

  ensure_installed = "all",
  highlight = {
    enable = true,
    -- disable = {'rust', 'python'} -- list of languages to disable
  },
  incremental_selection = {
    enable = true,
    keymaps = {
      init_selection = 's',
      node_incremental = 'sn',
      scope_incremental = 'ss',
      node_decremental = 'sd'

Replacement in .config/nvim/lua/treesitter.lua at line 23 [3.10082]

B:BD[3.10457] → [3.10457:10675]

B:BD[3.10675] → [7.4170:4211]

    incremental_selection = {
        enable = true,
        keymaps = {
            init_selection = 's',
            node_incremental = 'sn',
            scope_incremental = 'ss',
            node_decremental = 'sd'
        },
        -- disable = {'rust'}

[3.10457]

[3.10685]

    -- disable = {'rust'}
  },
  indent = {
    enable = true,
    disable = {'c', 'cpp', 'python', 'rust'}
  },
  playground = {
    enable = true,
    disable = {},
    updatetime = 25,
    persist_queries = false
  },
  textobjects = {
    select = {
      enable = true,
      keymaps = {
        -- You can use the capture groups defined in textobjects.scm
        ["af"] = "@function.outer",
        ["if"] = "@function.inner",
        ["ac"] = "@class.outer",
        ["ic"] = "@class.inner",
        -- Or you can define your own textobjects like this
        -- ["iF"] = {
        --   python = "(function_definition) @function",
        --   cpp = "(function_definition) @function",
        --   c = "(function_definition) @function",
        --   java = "(method_declaration) @function",
        -- },
      }

Replacement in .config/nvim/lua/treesitter.lua at line 54 [3.10082]

B:BD[3.10692] → [3.10692:10730]

B:BD[3.10730] → [6.2102:2151]

    indent = {
        enable = true,
        disable = {'c', 'cpp', 'python', 'rust'}

[3.10692]

[3.10757]

    swap = {
      enable = true,
      swap_next = {
        ["<c-.>"] = "@parameter.inner",
      },
      swap_previous = {
        ["<c-,>"] = "@parameter.inner",
      }

Replacement in .config/nvim/lua/treesitter.lua at line 63 [3.10082]

B:BD[3.10764] → [3.10764:10885]

    playground = {
        enable = true,
        disable = {},
        updatetime = 25,
        persist_queries = false

[3.10764]

[5.6867]

    move = {
      enable = true,
      set_jumps = false, -- whether to set jumps in the jumplist
      goto_next_start = {
        ["]]"] = "@function.outer",
        ["]m"] = "@class.outer",
      },
      goto_next_end = {
        ["]["] = "@function.outer",
        ["]M"] = "@class.outer",
      },
      goto_previous_start = {
        ["[["] = "@function.outer",
        ["[m"] = "@class.outer",
      },
      goto_previous_end = {
        ["[]"] = "@function.outer",
        ["[M"] = "@class.outer",
      },

Replacement in .config/nvim/lua/treesitter.lua at line 83 [3.10082]

B:BD[5.6874] → [5.6874:8515]

    textobjects = {
        select = {
            enable = true,
            keymaps = {
                -- You can use the capture groups defined in textobjects.scm
                ["af"] = "@function.outer",
                ["if"] = "@function.inner",
                ["ac"] = "@class.outer",
                ["ic"] = "@class.inner",
                -- Or you can define your own textobjects like this
                -- ["iF"] = {
                --     python = "(function_definition) @function",
                --     cpp = "(function_definition) @function",
                --     c = "(function_definition) @function",
                --     java = "(method_declaration) @function",
                -- },
            }
        },
        swap = {
            enable = true,
            swap_next = {
                ["<c-.>"] = "@parameter.inner",
            },
            swap_previous = {
                ["<c-,>"] = "@parameter.inner",
            }
        },
        move = {
            enable = true,
            set_jumps = false, -- whether to set jumps in the jumplist
            goto_next_start = {
                ["]]"] = "@function.outer",
                ["]m"] = "@class.outer",
            },
            goto_next_end = {
                ["]["] = "@function.outer",
                ["]M"] = "@class.outer",
            },
            goto_previous_start = {
                ["[["] = "@function.outer",
                ["[m"] = "@class.outer",
            },
            goto_previous_end = {
                ["[]"] = "@function.outer",
                ["[M"] = "@class.outer",
            },
        },
    },

[5.6874]

[3.10891]

},