complete refactor with kickstart.nvim
parent
f3d84f90cd
commit
897d00ad32
@ -1,5 +0,0 @@
|
|||||||
vim.g.tokyonight_transparent_sidebar = true
|
|
||||||
vim.g.tokyonight_transparent = true
|
|
||||||
vim.opt.background = "dark"
|
|
||||||
|
|
||||||
vim.cmd("colorscheme tokyonight")
|
|
@ -0,0 +1,2 @@
|
|||||||
|
require("rahcodes.remap")
|
||||||
|
require("rahcodes.sets")
|
@ -1 +0,0 @@
|
|||||||
|
|
@ -1,131 +0,0 @@
|
|||||||
local lsp = require("lsp-zero")
|
|
||||||
|
|
||||||
lsp.preset("recommended")
|
|
||||||
|
|
||||||
lsp.ensure_installed({
|
|
||||||
"tsserver",
|
|
||||||
"eslint",
|
|
||||||
"sumneko_lua",
|
|
||||||
"rust_analyzer",
|
|
||||||
})
|
|
||||||
|
|
||||||
local Remap = require("rahcodes.keymap")
|
|
||||||
local nnoremap = Remap.nnoremap
|
|
||||||
local inoremap = Remap.inoremap
|
|
||||||
|
|
||||||
-- Setup nvim-cmp.
|
|
||||||
local cmp = require("cmp")
|
|
||||||
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
|
||||||
local cmp_mappings = lsp.defaults.cmp_mappings({
|
|
||||||
["<C-u>"] = cmp.mapping.scroll_docs(-4),
|
|
||||||
["<C-d>"] = cmp.mapping.scroll_docs(4),
|
|
||||||
["<C-n>"] = cmp.mapping.select_next_item(cmp_select),
|
|
||||||
["<C-p>"] = cmp.mapping.select_prev_item(cmp_select),
|
|
||||||
["<C-y>"] = cmp.mapping.confirm({ select = true }),
|
|
||||||
["<C-Space>"] = cmp.mapping.complete(),
|
|
||||||
})
|
|
||||||
|
|
||||||
lsp.setup_nvim_cmp({
|
|
||||||
mapping = cmp_mappings,
|
|
||||||
})
|
|
||||||
|
|
||||||
lsp.configure("solargraph", {
|
|
||||||
settings = {
|
|
||||||
solargraph = {
|
|
||||||
diagnostics = false,
|
|
||||||
},
|
|
||||||
},
|
|
||||||
on_attach = function()
|
|
||||||
print("hello solargraph")
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
lsp.configure("sumneko_lua", {
|
|
||||||
settings = {
|
|
||||||
Lua = {
|
|
||||||
diagnostics = { globals = { "vim" } },
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
lsp.on_attach = function(client, bufnr)
|
|
||||||
-- Disable LSP server formatting, to prevent formatting twice.
|
|
||||||
-- Once by the LSP server, second time by NULL-ls.
|
|
||||||
if client.name == "volar" or client.name == "tsserver" then
|
|
||||||
client.server_capabilities.documentFormattingProvider = false
|
|
||||||
client.server_capabilities.documentFormattingRangeProvider = false
|
|
||||||
end
|
|
||||||
|
|
||||||
local opts = { buffer = bufnr, remap = false }
|
|
||||||
|
|
||||||
nnoremap("gd", function()
|
|
||||||
vim.lsp.buf.definition()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("gD", function()
|
|
||||||
vim.lsp.buf.definition()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("K", function()
|
|
||||||
vim.lsp.buf.hover()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("gi", function()
|
|
||||||
vim.lsp.buf.implementation()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("<leader>wa", function()
|
|
||||||
vim.lsp.buf.add_workspace_folder()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("<leader>wr", function()
|
|
||||||
vim.lsp.buf.remove_workspace_folder()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("<leader>wl", function()
|
|
||||||
print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
|
|
||||||
end, opts)
|
|
||||||
nnoremap("<leader>vws", function()
|
|
||||||
vim.lsp.buf.workspace_symbol()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("<leader>vd", function()
|
|
||||||
vim.diagnostic.open_float()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("[d", function()
|
|
||||||
vim.diagnostic.goto_next()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("]d", function()
|
|
||||||
vim.diagnostic.goto_prev()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("<leader>ca", function()
|
|
||||||
vim.lsp.buf.code_action()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("<leader>vco", function()
|
|
||||||
vim.lsp.buf.code_action({
|
|
||||||
filter = function(code_action)
|
|
||||||
if not code_action or not code_action.data then
|
|
||||||
return false
|
|
||||||
end
|
|
||||||
|
|
||||||
local data = code_action.data.id
|
|
||||||
return string.sub(data, #data - 1, #data) == ":0"
|
|
||||||
end,
|
|
||||||
apply = true,
|
|
||||||
})
|
|
||||||
end, opts)
|
|
||||||
nnoremap("<leader>gr", function()
|
|
||||||
vim.lsp.buf.references()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("<leader>rn", function()
|
|
||||||
vim.lsp.buf.rename()
|
|
||||||
end, opts)
|
|
||||||
inoremap("<C-h>", function()
|
|
||||||
vim.lsp.buf.signature_help()
|
|
||||||
end, opts)
|
|
||||||
nnoremap("<leader>f", function()
|
|
||||||
vim.lsp.buf.format({ async = true })
|
|
||||||
end, opts)
|
|
||||||
end
|
|
||||||
|
|
||||||
lsp.setup()
|
|
||||||
|
|
||||||
local mason_nullls = require("mason-null-ls")
|
|
||||||
mason_nullls.setup({
|
|
||||||
automatic_installation = true,
|
|
||||||
automatic_setup = true,
|
|
||||||
})
|
|
||||||
mason_nullls.setup_handlers({})
|
|
@ -1,7 +0,0 @@
|
|||||||
require('lualine').setup({
|
|
||||||
options = {
|
|
||||||
icons_enabled = true,
|
|
||||||
}
|
|
||||||
})
|
|
||||||
|
|
||||||
|
|
@ -1,30 +0,0 @@
|
|||||||
local actions = require("telescope.actions")
|
|
||||||
local telescope = require("telescope")
|
|
||||||
|
|
||||||
telescope.setup({
|
|
||||||
extensions = {
|
|
||||||
fzf = {
|
|
||||||
fuzzy = true, -- false will only do exact matching
|
|
||||||
override_generic_sorter = true, -- override the generic sorter
|
|
||||||
override_file_sorter = true, -- override the file sorter
|
|
||||||
case_mode = "smart_case", -- or "ignore_case" or "respect_case"
|
|
||||||
-- the default case_mode is "smart_case"
|
|
||||||
},
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
local builtin = require("telescope.builtin")
|
|
||||||
vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
|
|
||||||
vim.keymap.set("n", "<leader>/", builtin.live_grep, {})
|
|
||||||
vim.keymap.set("n", "<leader>*", builtin.grep_string, {})
|
|
||||||
vim.keymap.set("n", "<leader>fb", builtin.buffers, {})
|
|
||||||
vim.keymap.set("n", "<leader>fh", builtin.help_tags, {})
|
|
||||||
|
|
||||||
vim.keymap.set("n", "<leader>m", builtin.oldfiles, {})
|
|
||||||
vim.keymap.set("n", "<leader>gb", builtin.git_branches, {})
|
|
||||||
vim.keymap.set("n", "<leader><leader>", builtin.git_files, {})
|
|
||||||
vim.keymap.set("n", "<leader>ps", function()
|
|
||||||
builtin.grep_string({ search = vim.fn.input("Grep > ") })
|
|
||||||
end)
|
|
||||||
|
|
||||||
telescope.load_extension("fzf")
|
|
@ -1,36 +0,0 @@
|
|||||||
require("nvim-treesitter.configs").setup({
|
|
||||||
-- A list of parser names, or "all"
|
|
||||||
ensure_installed = { "ruby", "typescript", "javascript", "lua", "rust", "typescript" },
|
|
||||||
|
|
||||||
-- Install parsers synchronously (only applied to `ensure_installed`)
|
|
||||||
sync_install = false,
|
|
||||||
|
|
||||||
-- Automatically install missing parsers when entering buffer
|
|
||||||
-- Recommendation: set to false if you don't have `tree-sitter` CLI installed locally
|
|
||||||
auto_install = true,
|
|
||||||
|
|
||||||
---- If you need to change the installation directory of the parsers (see -> Advanced Setup)
|
|
||||||
-- parser_install_dir = "/some/path/to/store/parsers", -- Remember to run vim.opt.runtimepath:append("/some/path/to/store/parsers")!
|
|
||||||
|
|
||||||
indent = { enable = true },
|
|
||||||
|
|
||||||
highlight = {
|
|
||||||
-- `false` will disable the whole extension
|
|
||||||
enable = true,
|
|
||||||
|
|
||||||
-- Or use a function for more flexibility, e.g. to disable slow treesitter highlight for large files
|
|
||||||
disable = function(_, buf)
|
|
||||||
local max_filesize = 100 * 1024 -- 100 KB
|
|
||||||
local ok, stats = pcall(vim.loop.fs_stat, vim.api.nvim_buf_get_name(buf))
|
|
||||||
if ok and stats and stats.size > max_filesize then
|
|
||||||
return true
|
|
||||||
end
|
|
||||||
end,
|
|
||||||
|
|
||||||
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
|
|
||||||
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
|
|
||||||
-- Using this option may slow down your editor, and you may see some duplicate highlights.
|
|
||||||
-- Instead of true it can also be a list of languages
|
|
||||||
additional_vim_regex_highlighting = false,
|
|
||||||
},
|
|
||||||
})
|
|
@ -0,0 +1,29 @@
|
|||||||
|
return function(use)
|
||||||
|
use("folke/tokyonight.nvim")
|
||||||
|
|
||||||
|
-- formatting & linting
|
||||||
|
use("jose-elias-alvarez/null-ls.nvim")
|
||||||
|
-- use("jayp0521/mason-null-ls.nvim")
|
||||||
|
|
||||||
|
use({
|
||||||
|
"kylechui/nvim-surround",
|
||||||
|
tag = "*", -- Use for stability; omit to use `main` branch for the latest features
|
||||||
|
config = function()
|
||||||
|
require("nvim-surround").setup({
|
||||||
|
-- Configuration here, or leave empty to use defaults
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
use({
|
||||||
|
"folke/trouble.nvim",
|
||||||
|
requires = "nvim-tree/nvim-web-devicons",
|
||||||
|
config = function()
|
||||||
|
require("trouble").setup({
|
||||||
|
-- your configuration comes here
|
||||||
|
-- or leave it empty to use the default settings
|
||||||
|
-- refer to the configuration section below
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end
|
@ -1,3 +1,429 @@
|
|||||||
require("rahcodes.packer")
|
local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
|
||||||
require("rahcodes.set")
|
local is_bootstrap = false
|
||||||
require("rahcodes.remap")
|
if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
|
||||||
|
is_bootstrap = true
|
||||||
|
vim.fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
|
||||||
|
vim.cmd([[packadd packer.nvim]])
|
||||||
|
end
|
||||||
|
|
||||||
|
require("packer").startup(function(use)
|
||||||
|
-- Package manager
|
||||||
|
use("wbthomason/packer.nvim")
|
||||||
|
|
||||||
|
use({ -- LSP Configuration & Plugins
|
||||||
|
"neovim/nvim-lspconfig",
|
||||||
|
requires = {
|
||||||
|
-- Automatically install LSPs to stdpath for neovim
|
||||||
|
"williamboman/mason.nvim",
|
||||||
|
"williamboman/mason-lspconfig.nvim",
|
||||||
|
|
||||||
|
-- Useful status updates for LSP
|
||||||
|
"j-hui/fidget.nvim",
|
||||||
|
|
||||||
|
-- Additional lua configuration, makes nvim stuff amazing
|
||||||
|
"folke/neodev.nvim",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
use({ -- Autocompletion
|
||||||
|
"hrsh7th/nvim-cmp",
|
||||||
|
requires = { "hrsh7th/cmp-nvim-lsp", "L3MON4D3/LuaSnip", "saadparwaiz1/cmp_luasnip" },
|
||||||
|
})
|
||||||
|
|
||||||
|
use({ -- Highlight, edit, and navigate code
|
||||||
|
"nvim-treesitter/nvim-treesitter",
|
||||||
|
run = function()
|
||||||
|
pcall(require("nvim-treesitter.install").update({ with_sync = true }))
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
use({ -- Additional text objects via treesitter
|
||||||
|
"nvim-treesitter/nvim-treesitter-textobjects",
|
||||||
|
after = "nvim-treesitter",
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Git related plugins
|
||||||
|
use("tpope/vim-fugitive")
|
||||||
|
use("tpope/vim-rhubarb")
|
||||||
|
use("lewis6991/gitsigns.nvim")
|
||||||
|
|
||||||
|
use("navarasu/onedark.nvim") -- Theme inspired by Atom
|
||||||
|
use("nvim-lualine/lualine.nvim") -- Fancier statusline
|
||||||
|
use("lukas-reineke/indent-blankline.nvim") -- Add indentation guides even on blank lines
|
||||||
|
use("numToStr/Comment.nvim") -- "gc" to comment visual regions/lines
|
||||||
|
use("tpope/vim-sleuth") -- Detect tabstop and shiftwidth automatically
|
||||||
|
|
||||||
|
-- Fuzzy Finder (files, lsp, etc)
|
||||||
|
use({ "nvim-telescope/telescope.nvim", branch = "0.1.x", requires = { "nvim-lua/plenary.nvim" } })
|
||||||
|
|
||||||
|
-- Fuzzy Finder Algorithm which requires local dependencies to be built. Only load if `make` is available
|
||||||
|
use({ "nvim-telescope/telescope-fzf-native.nvim", run = "make", cond = vim.fn.executable("make") == 1 })
|
||||||
|
|
||||||
|
-- Add custom plugins to packer from ~/.config/nvim/lua/custom/plugins.lua
|
||||||
|
local has_plugins, plugins = pcall(require, "custom.plugins")
|
||||||
|
if has_plugins then
|
||||||
|
plugins(use)
|
||||||
|
end
|
||||||
|
|
||||||
|
if is_bootstrap then
|
||||||
|
require("packer").sync()
|
||||||
|
end
|
||||||
|
end)
|
||||||
|
|
||||||
|
-- When we are bootstrapping a configuration, it doesn't
|
||||||
|
-- make sense to execute the rest of the init.lua.
|
||||||
|
--
|
||||||
|
-- You'll need to restart nvim, and then it will work.
|
||||||
|
if is_bootstrap then
|
||||||
|
print("==================================")
|
||||||
|
print(" Plugins are being installed")
|
||||||
|
print(" Wait until Packer completes,")
|
||||||
|
print(" then restart nvim")
|
||||||
|
print("==================================")
|
||||||
|
return
|
||||||
|
end
|
||||||
|
|
||||||
|
-- Automatically source and re-compile packer whenever you save this init.lua
|
||||||
|
local packer_group = vim.api.nvim_create_augroup("Packer", { clear = true })
|
||||||
|
vim.api.nvim_create_autocmd("BufWritePost", {
|
||||||
|
command = "source <afile> | silent! LspStop | silent! LspStart | PackerCompile",
|
||||||
|
group = packer_group,
|
||||||
|
pattern = vim.fn.expand("$MYVIMRC"),
|
||||||
|
})
|
||||||
|
|
||||||
|
-- [[ Setting options ]]
|
||||||
|
-- See `:help vim.o`
|
||||||
|
|
||||||
|
-- Set highlight on search
|
||||||
|
vim.o.hlsearch = false
|
||||||
|
|
||||||
|
-- Make line numbers default
|
||||||
|
vim.wo.number = true
|
||||||
|
|
||||||
|
-- Enable mouse mode
|
||||||
|
vim.o.mouse = "a"
|
||||||
|
|
||||||
|
-- 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
|
||||||
|
|
||||||
|
-- Decrease update time
|
||||||
|
vim.o.updatetime = 250
|
||||||
|
vim.wo.signcolumn = "yes"
|
||||||
|
|
||||||
|
-- Set colorscheme
|
||||||
|
vim.o.termguicolors = true
|
||||||
|
vim.cmd([[colorscheme onedark]])
|
||||||
|
|
||||||
|
-- Set completeopt to have a better completion experience
|
||||||
|
vim.o.completeopt = "menuone,noselect"
|
||||||
|
|
||||||
|
-- [[ Basic Keymaps ]]
|
||||||
|
-- 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 = " "
|
||||||
|
|
||||||
|
-- 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 })
|
||||||
|
|
||||||
|
-- [[ 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 = "*",
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Set lualine as statusline
|
||||||
|
-- See `:help lualine.txt`
|
||||||
|
require("lualine").setup({
|
||||||
|
options = {
|
||||||
|
icons_enabled = false,
|
||||||
|
theme = "onedark",
|
||||||
|
component_separators = "|",
|
||||||
|
section_separators = "",
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Enable Comment.nvim
|
||||||
|
require("Comment").setup()
|
||||||
|
|
||||||
|
-- Enable `lukas-reineke/indent-blankline.nvim`
|
||||||
|
-- See `:help indent_blankline.txt`
|
||||||
|
require("indent_blankline").setup({
|
||||||
|
char = "┊",
|
||||||
|
show_trailing_blankline_indent = false,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Gitsigns
|
||||||
|
-- See `:help gitsigns.txt`
|
||||||
|
require("gitsigns").setup({
|
||||||
|
signs = {
|
||||||
|
add = { text = "+" },
|
||||||
|
change = { text = "~" },
|
||||||
|
delete = { text = "_" },
|
||||||
|
topdelete = { text = "‾" },
|
||||||
|
changedelete = { text = "~" },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- [[ 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")
|
||||||
|
|
||||||
|
-- See `:help telescope.builtin`
|
||||||
|
vim.keymap.set("n", "<leader>m", require("telescope.builtin").oldfiles, { desc = "[?] Find recently opened files" })
|
||||||
|
vim.keymap.set("n", "<leader><space>", require("telescope.builtin").git_files, { desc = "[ ] Find git files" })
|
||||||
|
vim.keymap.set("n", "<leader>ps", function()
|
||||||
|
require("telescope.builtin").grep_string({ search = vim.fn.input("Grep > ") })
|
||||||
|
end, { desc = "[/] Fuzzily search in current buffer]" })
|
||||||
|
|
||||||
|
vim.keymap.set("n", "<leader>ff", 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>/", require("telescope.builtin").live_grep, { desc = "[S]earch by [G]rep" })
|
||||||
|
vim.keymap.set("n", "<leader>sd", require("telescope.builtin").diagnostics, { desc = "[S]earch [D]iagnostics" })
|
||||||
|
vim.keymap.set("n", "<leader>gb", require("telescope.builtin").git_branches, { desc = "[G]it [B]ranches" })
|
||||||
|
|
||||||
|
-- [[ Configure Treesitter ]]
|
||||||
|
-- See `:help nvim-treesitter`
|
||||||
|
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", "typescript", "help", "vim" },
|
||||||
|
|
||||||
|
highlight = { enable = true },
|
||||||
|
indent = { enable = true, disable = { "python" } },
|
||||||
|
incremental_selection = {
|
||||||
|
enable = true,
|
||||||
|
keymaps = {
|
||||||
|
init_selection = "<c-space>",
|
||||||
|
node_incremental = "<c-space>",
|
||||||
|
scope_incremental = "<c-s>",
|
||||||
|
node_decremental = "<c-backspace>",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
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",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Diagnostic keymaps
|
||||||
|
vim.keymap.set("n", "[d", vim.diagnostic.goto_prev)
|
||||||
|
vim.keymap.set("n", "]d", vim.diagnostic.goto_next)
|
||||||
|
vim.keymap.set("n", "<leader>e", vim.diagnostic.open_float)
|
||||||
|
vim.keymap.set("n", "<leader>q", vim.diagnostic.setloclist)
|
||||||
|
|
||||||
|
-- LSP settings.
|
||||||
|
-- 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", vim.lsp.buf.definition, "[G]oto [D]efinition")
|
||||||
|
nmap("gr", require("telescope.builtin").lsp_references, "[G]oto [R]eferences")
|
||||||
|
nmap("gI", vim.lsp.buf.implementation, "[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")
|
||||||
|
|
||||||
|
-- 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({
|
||||||
|
timeout_ms = 2000,
|
||||||
|
filter = function(client)
|
||||||
|
return client.name ~= "tsserver"
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
end, { desc = "Format current buffer with LSP" })
|
||||||
|
end
|
||||||
|
|
||||||
|
-- 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.
|
||||||
|
local servers = {
|
||||||
|
-- clangd = {},
|
||||||
|
-- gopls = {},
|
||||||
|
-- pyright = {},
|
||||||
|
-- rust_analyzer = {},
|
||||||
|
tsserver = {},
|
||||||
|
|
||||||
|
sumneko_lua = {
|
||||||
|
Lua = {
|
||||||
|
workspace = { checkThirdParty = false },
|
||||||
|
telemetry = { enable = false },
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
||||||
|
-- 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)
|
||||||
|
|
||||||
|
-- Setup mason so it can manage external tooling
|
||||||
|
require("mason").setup()
|
||||||
|
|
||||||
|
-- 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],
|
||||||
|
})
|
||||||
|
end,
|
||||||
|
})
|
||||||
|
|
||||||
|
-- Turn on lsp status information
|
||||||
|
require("fidget").setup()
|
||||||
|
|
||||||
|
-- nvim-cmp setup
|
||||||
|
local cmp = require("cmp")
|
||||||
|
local luasnip = require("luasnip")
|
||||||
|
|
||||||
|
cmp.setup({
|
||||||
|
snippet = {
|
||||||
|
expand = function(args)
|
||||||
|
luasnip.lsp_expand(args.body)
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
mapping = cmp.mapping.preset.insert({
|
||||||
|
["<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_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.jumpable(-1) then
|
||||||
|
luasnip.jump(-1)
|
||||||
|
else
|
||||||
|
fallback()
|
||||||
|
end
|
||||||
|
end, { "i", "s" }),
|
||||||
|
}),
|
||||||
|
sources = {
|
||||||
|
{ name = "nvim_lsp" },
|
||||||
|
{ name = "luasnip" },
|
||||||
|
},
|
||||||
|
})
|
||||||
|
|
||||||
|
-- The line beneath this is called `modeline`. See `:help modeline`
|
||||||
|
-- vim: ts=2 sts=2 sw=2 et
|
||||||
|
@ -0,0 +1,27 @@
|
|||||||
|
local h = require("null-ls.helpers")
|
||||||
|
local methods = require("null-ls.methods")
|
||||||
|
|
||||||
|
local FORMATTING = methods.internal.FORMATTING
|
||||||
|
|
||||||
|
return h.make_builtin({
|
||||||
|
name = "rubocop",
|
||||||
|
meta = {
|
||||||
|
url = "https://github.com/rubocop/rubocop",
|
||||||
|
description = "Ruby static code analyzer and formatter, based on the community Ruby style guide.",
|
||||||
|
},
|
||||||
|
method = FORMATTING,
|
||||||
|
filetypes = { "ruby" },
|
||||||
|
generator_opts = {
|
||||||
|
command = "rubocop",
|
||||||
|
args = {
|
||||||
|
"--auto-correct",
|
||||||
|
"-f",
|
||||||
|
"quiet",
|
||||||
|
"--stdin",
|
||||||
|
"$FILENAME",
|
||||||
|
},
|
||||||
|
to_stdin = true,
|
||||||
|
-- from_stderr = true,
|
||||||
|
},
|
||||||
|
factory = h.formatter_factory,
|
||||||
|
})
|
@ -1,125 +0,0 @@
|
|||||||
local install_path = vim.fn.stdpath("data") .. "/site/pack/packer/start/packer.nvim"
|
|
||||||
local is_bootstrap = false
|
|
||||||
if vim.fn.empty(vim.fn.glob(install_path)) > 0 then
|
|
||||||
is_bootstrap = true
|
|
||||||
vim.fn.system({ "git", "clone", "--depth", "1", "https://github.com/wbthomason/packer.nvim", install_path })
|
|
||||||
vim.cmd([[packadd packer.nvim]])
|
|
||||||
end
|
|
||||||
|
|
||||||
require("packer").startup(function(use)
|
|
||||||
-- Packer can manage itself
|
|
||||||
use("wbthomason/packer.nvim")
|
|
||||||
use("folke/tokyonight.nvim")
|
|
||||||
use({
|
|
||||||
"nvim-telescope/telescope.nvim",
|
|
||||||
tag = "0.1.0",
|
|
||||||
requires = {
|
|
||||||
"nvim-lua/plenary.nvim",
|
|
||||||
{ "nvim-telescope/telescope-fzf-native.nvim", run = "make" },
|
|
||||||
},
|
|
||||||
wants = {
|
|
||||||
"telescope-fzf-native.nvim",
|
|
||||||
},
|
|
||||||
})
|
|
||||||
use({ "nvim-telescope/telescope-fzf-native.nvim", run = "make" })
|
|
||||||
use({
|
|
||||||
"nvim-treesitter/nvim-treesitter",
|
|
||||||
run = function()
|
|
||||||
local ts_update = require("nvim-treesitter.install").update({ with_sync = true })
|
|
||||||
ts_update()
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
-- LSP
|
|
||||||
use({
|
|
||||||
"VonHeikemen/lsp-zero.nvim",
|
|
||||||
requires = {
|
|
||||||
-- LSP Support
|
|
||||||
{ "neovim/nvim-lspconfig" },
|
|
||||||
{ "williamboman/mason.nvim" },
|
|
||||||
{ "williamboman/mason-lspconfig.nvim" },
|
|
||||||
|
|
||||||
-- Autocompletion
|
|
||||||
{ "hrsh7th/nvim-cmp" },
|
|
||||||
{ "hrsh7th/cmp-buffer" },
|
|
||||||
{ "hrsh7th/cmp-path" },
|
|
||||||
{ "saadparwaiz1/cmp_luasnip" },
|
|
||||||
{ "hrsh7th/cmp-nvim-lsp" },
|
|
||||||
{ "hrsh7th/cmp-nvim-lua" },
|
|
||||||
|
|
||||||
-- Snippets
|
|
||||||
{ "L3MON4D3/LuaSnip" },
|
|
||||||
{ "rafamadriz/friendly-snippets" },
|
|
||||||
},
|
|
||||||
})
|
|
||||||
|
|
||||||
-- formatting & linting
|
|
||||||
use("jose-elias-alvarez/null-ls.nvim")
|
|
||||||
use("jayp0521/mason-null-ls.nvim")
|
|
||||||
|
|
||||||
use({
|
|
||||||
"nvim-lualine/lualine.nvim",
|
|
||||||
requires = { "nvim-tree/nvim-web-devicons", opt = true },
|
|
||||||
})
|
|
||||||
|
|
||||||
use({
|
|
||||||
"lewis6991/gitsigns.nvim",
|
|
||||||
config = function()
|
|
||||||
require("gitsigns").setup()
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
use("tpope/vim-fugitive")
|
|
||||||
use("tpope/vim-rhubarb")
|
|
||||||
|
|
||||||
use({
|
|
||||||
"folke/trouble.nvim",
|
|
||||||
requires = "kyazdani42/nvim-web-devicons",
|
|
||||||
config = function()
|
|
||||||
require("trouble").setup({
|
|
||||||
-- your configuration comes here
|
|
||||||
-- or leave it empty to use the default settings
|
|
||||||
-- refer to the configuration section below
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
use({
|
|
||||||
"kylechui/nvim-surround",
|
|
||||||
tag = "*", -- Use for stability; omit to use `main` branch for the latest features
|
|
||||||
config = function()
|
|
||||||
require("nvim-surround").setup({
|
|
||||||
-- Configuration here, or leave empty to use defaults
|
|
||||||
})
|
|
||||||
end,
|
|
||||||
})
|
|
||||||
|
|
||||||
use("theprimeagen/harpoon")
|
|
||||||
|
|
||||||
-- Automatically set up your configuration after cloning packer.nvim
|
|
||||||
-- Put this at the end after all plugins
|
|
||||||
if is_bootstrap then
|
|
||||||
require("packer").sync()
|
|
||||||
end
|
|
||||||
end)
|
|
||||||
|
|
||||||
-- When we are bootstrapping a configuration, it doesn't
|
|
||||||
-- make sense to execute the rest of the init.lua.
|
|
||||||
--
|
|
||||||
-- You'll need to restart nvim, and then it will work.
|
|
||||||
if is_bootstrap then
|
|
||||||
print("==================================")
|
|
||||||
print(" Plugins are being installed")
|
|
||||||
print(" Wait until Packer completes,")
|
|
||||||
print(" then restart nvim")
|
|
||||||
print("==================================")
|
|
||||||
return
|
|
||||||
end
|
|
||||||
|
|
||||||
-- Automatically source and re-compile packer whenever you save this init.lua
|
|
||||||
local packer_group = vim.api.nvim_create_augroup("Packer", { clear = true })
|
|
||||||
vim.api.nvim_create_autocmd("BufWritePost", {
|
|
||||||
command = "source <afile> | silent! LspStop | silent! LspStart | PackerCompile",
|
|
||||||
group = packer_group,
|
|
||||||
pattern = vim.fn.expand("$MYVIMRC"),
|
|
||||||
})
|
|
Loading…
Reference in New Issue