my changes

This commit is contained in:
Joe Hayes 2023-10-17 10:03:35 -04:00
parent 1915cea32e
commit 51facafa97
1 changed files with 467 additions and 355 deletions

822
init.lua
View File

@ -41,22 +41,22 @@ P.S. You can delete this when you're done too. It's your config now :)
-- Set <space> as the leader key -- Set <space> as the leader key
-- See `:help mapleader` -- See `:help mapleader`
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used) -- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
vim.g.mapleader = ' ' vim.g.mapleader = " "
vim.g.maplocalleader = ' ' vim.g.maplocalleader = " "
-- [[ 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)
@ -66,171 +66,219 @@ 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", config = true},
'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
"hrsh7th/nvim-cmp",
dependencies = {
-- Snippet Engine & its associated nvim-cmp source
"L3MON4D3/LuaSnip",
"saadparwaiz1/cmp_luasnip",
{ -- Adds LSP completion capabilities
-- Autocompletion "hrsh7th/cmp-nvim-lsp",
'hrsh7th/nvim-cmp',
dependencies = {
-- Snippet Engine & its associated nvim-cmp source
'L3MON4D3/LuaSnip',
'saadparwaiz1/cmp_luasnip',
-- Adds LSP completion capabilities -- Adds a number of user-friendly snippets
'hrsh7th/cmp-nvim-lsp', "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)
vim.keymap.set( "n", "<leader>hp", require("gitsigns").preview_hunk, {buffer = bufnr, desc = "Preview git hunk"})
-- Adds a number of user-friendly snippets -- don't override the built-in and fugitive keymaps
'rafamadriz/friendly-snippets', local gs = package.loaded.gitsigns
}, vim.keymap.set(
}, {"n", "v"},
"]c",
function()
if vim.wo.diff then
return "]c"
end
vim.schedule(
function()
gs.next_hunk()
end
)
return "<Ignore>"
end,
{expr = true, buffer = bufnr, desc = "Jump to next hunk"}
)
vim.keymap.set(
{"n", "v"},
"[c",
function()
if vim.wo.diff then
return "[c"
end
vim.schedule(
function()
gs.prev_hunk()
end
)
return "<Ignore>"
end,
{expr = true, buffer = bufnr, desc = "Jump to previous hunk"}
)
end
}
},
{
"shaunsingh/solarized.nvim",
priority = 1000,
config = function()
vim.o.background = "light"
vim.cmd.colorscheme "solarized"
end
},
{
-- Set lualine as statusline
"nvim-lualine/lualine.nvim",
-- See `:help lualine.txt`
opts = {
options = {
icons_enabled = false,
theme = "solarized",
component_separators = "|",
section_separators = ""
}
}
},
-- Useful plugin to show you pending keybinds. {
{ 'folke/which-key.nvim', opts = {} }, -- Add indentation guides even on blank lines
{ "lukas-reineke/indent-blankline.nvim",
-- Adds git related signs to the gutter, as well as utilities for managing changes -- Enable `lukas-reineke/indent-blankline.nvim`
'lewis6991/gitsigns.nvim', -- See `:help indent_blankline.txt`
opts = { main = "ibl",
-- See `:help gitsigns.txt` opts = {}
signs = { },
add = { text = '+' },
change = { text = '~' },
delete = { text = '_' },
topdelete = { text = '' },
changedelete = { text = '~' },
},
on_attach = function(bufnr)
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 -- "gc" to comment visual regions/lines
local gs = package.loaded.gitsigns { "numToStr/Comment.nvim", opts = {} },
vim.keymap.set({ 'n', 'v' }, ']c', function()
if vim.wo.diff then
return ']c'
end
vim.schedule(function()
gs.next_hunk()
end)
return '<Ignore>'
end, { expr = true, buffer = bufnr, desc = 'Jump to next hunk' })
vim.keymap.set({ 'n', 'v' }, '[c', function()
if vim.wo.diff then
return '[c'
end
vim.schedule(function()
gs.prev_hunk()
end)
return '<Ignore>'
end, { expr = true, buffer = bufnr, desc = 'Jump to previous hunk' })
end,
},
},
{ -- Fuzzy Finder (files, lsp, etc)
-- Theme inspired by Atom {
'navarasu/onedark.nvim', "nvim-telescope/telescope.nvim",
priority = 1000, branch = "0.1.x",
config = function() dependencies = {
vim.cmd.colorscheme 'onedark' "nvim-lua/plenary.nvim",
end, -- 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
}
}
},
{ {
-- Set lualine as statusline -- Highlight, edit, and navigate code
'nvim-lualine/lualine.nvim', "nvim-treesitter/nvim-treesitter",
-- See `:help lualine.txt` dependencies = {
opts = { "nvim-treesitter/nvim-treesitter-textobjects"
options = { },
icons_enabled = false, build = ":TSUpdate"
theme = 'onedark', },
component_separators = '|',
section_separators = '',
},
},
},
{ -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
-- Add indentation guides even on blank lines -- These are some example plugins that I've included in the kickstart repository.
'lukas-reineke/indent-blankline.nvim', -- Uncomment any of the lines below to enable them.
-- Enable `lukas-reineke/indent-blankline.nvim` require 'kickstart.plugins.autoformat',
-- See `:help ibl` require 'kickstart.plugins.debug',
main = 'ibl',
opts = {},
},
-- "gc" to comment visual regions/lines -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
{ 'numToStr/Comment.nvim', opts = {} }, -- 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' },
{"tpope/vim-repeat"},
-- Fuzzy Finder (files, lsp, etc) {
{ "kylechui/nvim-surround",
'nvim-telescope/telescope.nvim', event = "VeryLazy",
branch = '0.1.x', config = function()
dependencies = { require("nvim-surround").setup()
'nvim-lua/plenary.nvim', end
-- Fuzzy Finder Algorithm which requires local dependencies to be built. },
-- Only load if `make` is available. Make sure you have the system
-- requirements installed. {
{ "windwp/nvim-autopairs",
'nvim-telescope/telescope-fzf-native.nvim', config = function()
-- NOTE: If you are having trouble with this installation, require("nvim-autopairs").setup {}
-- refer to the README for telescope-fzf-native for more instructions. require("nvim-autopairs").remove_rule("`")
build = 'make', end
cond = function() },
return vim.fn.executable 'make' == 1
end,
},
},
},
{ {"nvim-focus/focus.nvim", version = "*"},
-- 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 {"jpalardy/vim-slime"},
-- 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 "ray-x/go.nvim",
-- up-to-date with whatever is in the kickstart repo. dependencies = { -- optional packages
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. "ray-x/guihua.lua",
-- "neovim/nvim-lspconfig",
-- For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins "nvim-treesitter/nvim-treesitter",
-- { import = 'custom.plugins' }, },
}, {}) config = function()
require("go").setup()
end,
event = {"CmdlineEnter"},
ft = {"go", 'gomod'},
build = ':lua require("go.install").update_all_sync()' -- if you need to install/update all binaries
}
}
)
-- [[ Setting options ]] -- [[ Setting options ]]
-- See `:help vim.o` -- See `:help vim.o`
@ -243,12 +291,12 @@ vim.o.hlsearch = false
vim.wo.number = true vim.wo.number = true
-- Enable mouse mode -- Enable mouse mode
vim.o.mouse = 'a' vim.o.mouse = "a"
-- Sync clipboard between OS and Neovim. -- Sync clipboard between OS and Neovim.
-- Remove this option if you want your OS clipboard to remain independent. -- Remove this option if you want your OS clipboard to remain independent.
-- See `:help 'clipboard'` -- See `:help 'clipboard'`
vim.o.clipboard = 'unnamedplus' vim.o.clipboard = "unnamedplus"
-- Enable break indent -- Enable break indent
vim.o.breakindent = true vim.o.breakindent = true
@ -261,14 +309,14 @@ vim.o.ignorecase = true
vim.o.smartcase = true vim.o.smartcase = true
-- Keep signcolumn on by default -- Keep signcolumn on by default
vim.wo.signcolumn = 'yes' vim.wo.signcolumn = "yes"
-- Decrease update time -- Decrease update time
vim.o.updatetime = 250 vim.o.updatetime = 250
vim.o.timeoutlen = 300 vim.o.timeoutlen = 300
-- Set completeopt to have a better completion experience -- Set completeopt to have a better completion experience
vim.o.completeopt = 'menuone,noselect' vim.o.completeopt = "menuone,noselect"
-- NOTE: You should make sure your terminal supports this -- NOTE: You should make sure your terminal supports this
vim.o.termguicolors = true vim.o.termguicolors = true
@ -277,11 +325,11 @@ vim.o.termguicolors = true
-- Keymaps for better default experience -- Keymaps for better default experience
-- See `:help vim.keymap.set()` -- See `:help vim.keymap.set()`
vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true }) vim.keymap.set({"n", "v"}, "<Space>", "<Nop>", {silent = true})
-- Remap for dealing with word wrap -- Remap for dealing with word wrap
vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true }) 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 }) vim.keymap.set("n", "j", "v:count == 0 ? 'gj' : 'j'", {expr = true, silent = true})
-- Diagnostic keymaps -- 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_prev, { desc = 'Go to previous diagnostic message' })
@ -291,30 +339,33 @@ vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagn
-- [[ 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(
callback = function() "TextYankPost",
vim.highlight.on_yank() {
end, callback = function()
group = highlight_group, vim.highlight.on_yank()
pattern = '*', end,
}) group = highlight_group,
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
pcall(require('telescope').load_extension, 'fzf') 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
@ -353,15 +404,22 @@ end
vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {}) vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {})
-- See `:help telescope.builtin` -- See `:help telescope.builtin`
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(
-- You can pass additional configuration to telescope to change theme, layout, etc. "n",
require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown { "<leader>/",
winblend = 10, function()
previewer = false, -- You can pass additional configuration to telescope to change theme, layout, etc.
}) require("telescope.builtin").current_buffer_fuzzy_find(
end, { desc = '[/] Fuzzily search in current buffer' }) require("telescope.themes").get_dropdown {
winblend = 10,
previewer = false
}
)
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' })
vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' }) vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
@ -371,136 +429,160 @@ vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc
vim.keymap.set('n', '<leader>sG', ':LiveGrepGitRoot<cr>', { desc = '[S]earch by [G]rep on Git Root' }) 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>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' }) vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' })
-- [[ Configure Treesitter ]] -- [[ Configure Treesitter ]]
-- 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(
require('nvim-treesitter.configs').setup { function()
-- Add languages to be installed here that you want installed for treesitter require("nvim-treesitter.configs").setup {
ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim', 'bash' }, -- 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"
},
-- 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
)
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!) -- Diagnostic keymaps
auto_install = false, 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"})
highlight = { enable = true }, vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float, {desc = "Open floating diagnostic message"})
indent = { enable = true }, vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist, {desc = "Open diagnostics list"})
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 ]] -- [[ 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", vim.lsp.buf.definition, "[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", vim.lsp.buf.type_definition, "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(
nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder') bufnr,
nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder') "Format",
nmap('<leader>wl', function() function(_)
print(vim.inspect(vim.lsp.buf.list_workspace_folders())) vim.lsp.buf.format()
end, '[W]orkspace [L]ist Folders') end,
{desc = "Format current buffer with LSP"}
-- 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>d'] = { name = '[D]ocument', _ = 'which_key_ignore' }, ["<leader>c"] = {name = "[C]ode", _ = "which_key_ignore"},
['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' }, ["<leader>d"] = {name = "[D]ocument", _ = "which_key_ignore"},
['<leader>h'] = { name = 'More git', _ = 'which_key_ignore' }, ["<leader>g"] = {name = "[G]it", _ = "which_key_ignore"},
['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' }, ["<leader>h"] = {name = "More git", _ = "which_key_ignore"},
['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' }, ["<leader>r"] = {name = "[R]ename", _ = "which_key_ignore"},
['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' }, ["<leader>s"] = {name = "[S]earch", _ = "which_key_ignore"},
} ["<leader>w"] = {name = "[W]orkspace", _ = "which_key_ignore"}
}
-- 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 -- Enable the following language servers
-- Feel free to add/remove any LSPs that you want here. They will automatically be installed. -- Feel free to add/remove any LSPs that you want here. They will automatically be installed.
@ -511,51 +593,58 @@ 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 = {}, bashls = {},
-- gopls = {}, -- clangd = {},
-- pyright = {}, gopls = {},
-- rust_analyzer = {}, pyright = {},
-- tsserver = {}, -- rust_analyzer = {},
-- html = { filetypes = { 'html', 'twig', 'hbs'} }, -- tsserver = {},
-- html = { filetypes = { 'html', 'twig', 'hbs'} },
terraformls = {filetypes = 'terraform'},
tflint = {},
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
require('neodev').setup() require("neodev").setup()
-- nvim-cmp supports additional completion capabilities, so broadcast that to servers -- nvim-cmp supports additional completion capabilities, so broadcast that to servers
local capabilities = vim.lsp.protocol.make_client_capabilities() local capabilities = vim.lsp.protocol.make_client_capabilities()
capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities) capabilities = require("cmp_nvim_lsp").default_capabilities(capabilities)
-- Ensure the servers above are installed -- Ensure the servers above are installed
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`
local cmp = require 'cmp' -- If you want insert `(` after select function or method item
local luasnip = require 'luasnip' local cmp_autopairs = require("nvim-autopairs.completion.cmp")
require('luasnip.loaders.from_vscode').lazy_load() local cmp = require("cmp")
cmp.event:on("confirm_done", cmp_autopairs.on_confirm_done())
local luasnip = require "luasnip"
require("luasnip.loaders.from_vscode").lazy_load()
luasnip.config.setup {} luasnip.config.setup {}
cmp.setup { cmp.setup {
@ -577,30 +666,53 @@ cmp.setup {
behavior = cmp.ConfirmBehavior.Replace, behavior = cmp.ConfirmBehavior.Replace,
select = true, select = true,
}, },
['<Tab>'] = cmp.mapping(function(fallback) mapping = cmp.mapping.preset.insert {
if cmp.visible() then ["<C-n>"] = cmp.mapping.select_next_item(),
cmp.select_next_item() ["<C-p>"] = cmp.mapping.select_prev_item(),
elseif luasnip.expand_or_locally_jumpable() then ["<C-d>"] = cmp.mapping.scroll_docs(-4),
luasnip.expand_or_jump() ["<C-f>"] = cmp.mapping.scroll_docs(4),
else ["<C-Space>"] = cmp.mapping.complete {},
fallback() ["<CR>"] = cmp.mapping.confirm {
end behavior = cmp.ConfirmBehavior.Replace,
end, { 'i', 's' }), select = true
['<S-Tab>'] = cmp.mapping(function(fallback) },
if cmp.visible() then ["<Tab>"] = cmp.mapping(
cmp.select_prev_item() function(fallback)
elseif luasnip.locally_jumpable(-1) then if cmp.visible() then
luasnip.jump(-1) cmp.select_next_item()
else elseif luasnip.expand_or_locally_jumpable() then
fallback() luasnip.expand_or_jump()
end else
end, { 'i', 's' }), fallback()
}, end
sources = { end,
{ name = 'nvim_lsp' }, {"i", "s"}
{ name = 'luasnip' }, ),
}, ["<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"}
}
} }
require("focus").setup()
require("Comment").setup()
require('go').setup()
vim.g.slime_target = "tmux"
-- vim.g.slime_default_config = {"socket_name" = "default", "target_pane" = "{last}"}
-- 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