Fork and customize config
This commit is contained in:
parent
f031fa4509
commit
f65329a3b4
|
@ -0,0 +1,70 @@
|
||||||
|
-- prev/next tab
|
||||||
|
vim.keymap.set('n', 'H', 'gT')
|
||||||
|
vim.keymap.set('n', 'L', 'gt')
|
||||||
|
|
||||||
|
-- line bubbling
|
||||||
|
|
||||||
|
-- nnoremap <C-j> :m .+1<CR>==
|
||||||
|
-- nnoremap <C-k> :m .-2<CR>==
|
||||||
|
vim.keymap.set('n', '<C-j>', ':m .+1<CR>==', { noremap = true })
|
||||||
|
vim.keymap.set('n', '<C-k>', ':m .-2<CR>==', { noremap = true }) -- conflicts with "signature help" from LSP
|
||||||
|
|
||||||
|
-- inoremap <C-j> <ESC>:m .+1<CR>==gi
|
||||||
|
-- inoremap <C-k> <ESC>:m .-2<CR>==gi
|
||||||
|
vim.keymap.set('i', '<C-j>', '<ESC>:m .+1<CR>==gi', { noremap = true })
|
||||||
|
vim.keymap.set('i', '<C-k>', '<ESC>:m .-2<CR>==gi', { noremap = true })
|
||||||
|
|
||||||
|
-- vnoremap <C-j> :m '>+1<CR>gv=gv
|
||||||
|
-- vnoremap <C-k> :m '<-2<CR>gv=gv
|
||||||
|
vim.keymap.set('v', '<C-k>', ":m '<-2<CR>gv=gv", { noremap = true })
|
||||||
|
vim.keymap.set('v', '<C-j>', ":m '>+1<CR>gv=gv", { noremap = true })
|
||||||
|
|
||||||
|
vim.o.inccommand = "nosplit"
|
||||||
|
|
||||||
|
-- vim.cmd([[
|
||||||
|
-- autocmd FileType dirvish nmap <buffer> <c-o> -
|
||||||
|
-- ]])
|
||||||
|
|
||||||
|
vim.diagnostic.config({
|
||||||
|
virtual_text = {
|
||||||
|
-- source = "always", -- Or "if_many"
|
||||||
|
prefix = '●', -- Could be '■', '▎', 'x'
|
||||||
|
},
|
||||||
|
severity_sort = true,
|
||||||
|
float = {
|
||||||
|
source = "always", -- Or "if_many"
|
||||||
|
},
|
||||||
|
})
|
||||||
|
-- vim.o.updatetime = 250
|
||||||
|
-- vim.cmd [[autocmd CursorHold,CursorHoldI * lua vim.diagnostic.open_float(nil, {focus=false})]]
|
||||||
|
|
||||||
|
|
||||||
|
local signs = { Error = "✗", Warn = "⚠", Hint = "➤", Info = "i" }
|
||||||
|
for type, icon in pairs(signs) do
|
||||||
|
local hl = "DiagnosticSign" .. type
|
||||||
|
vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = hl })
|
||||||
|
end
|
||||||
|
|
||||||
|
|
||||||
|
-- function PrintDiagnostics(opts, bufnr, line_nr, client_id)
|
||||||
|
-- bufnr = bufnr or 0
|
||||||
|
-- line_nr = line_nr or (vim.api.nvim_win_get_cursor(0)[1] - 1)
|
||||||
|
-- opts = opts or { ['lnum'] = line_nr }
|
||||||
|
--
|
||||||
|
-- local line_diagnostics = vim.diagnostic.get(bufnr, opts)
|
||||||
|
-- if vim.tbl_isempty(line_diagnostics) then return end
|
||||||
|
--
|
||||||
|
-- local diagnostic_message = ""
|
||||||
|
-- for i, diagnostic in ipairs(line_diagnostics) do
|
||||||
|
-- diagnostic_message = diagnostic_message .. string.format("%d: %s", i, diagnostic.message or "")
|
||||||
|
-- print(diagnostic_message)
|
||||||
|
-- if i ~= #line_diagnostics then
|
||||||
|
-- diagnostic_message = diagnostic_message .. "\n"
|
||||||
|
-- end
|
||||||
|
-- end
|
||||||
|
-- vim.api.nvim_echo({ { diagnostic_message, "Normal" } }, false, {})
|
||||||
|
-- end
|
||||||
|
--
|
||||||
|
-- vim.cmd [[ autocmd! CursorHold * lua PrintDiagnostics() ]]
|
||||||
|
|
||||||
|
-- vim: ts=2 sts=2 sw=2 et
|
23
init.lua
23
init.lua
|
@ -107,7 +107,6 @@ require('lazy').setup({
|
||||||
},
|
},
|
||||||
},
|
},
|
||||||
|
|
||||||
-- Useful plugin to show you pending keybinds.
|
|
||||||
{ 'folke/which-key.nvim', opts = {} },
|
{ 'folke/which-key.nvim', opts = {} },
|
||||||
{
|
{
|
||||||
-- Adds git releated signs to the gutter, as well as utilities for managing changes
|
-- Adds git releated signs to the gutter, as well as utilities for managing changes
|
||||||
|
@ -145,7 +144,7 @@ require('lazy').setup({
|
||||||
opts = {
|
opts = {
|
||||||
options = {
|
options = {
|
||||||
icons_enabled = false,
|
icons_enabled = false,
|
||||||
theme = 'onedark',
|
theme = 'base16',
|
||||||
component_separators = '|',
|
component_separators = '|',
|
||||||
section_separators = '',
|
section_separators = '',
|
||||||
},
|
},
|
||||||
|
@ -194,7 +193,7 @@ require('lazy').setup({
|
||||||
-- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
|
-- 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.
|
-- These are some example plugins that I've included in the kickstart repository.
|
||||||
-- Uncomment any of the lines below to enable them.
|
-- Uncomment any of the lines below to enable them.
|
||||||
-- require 'kickstart.plugins.autoformat',
|
require 'kickstart.plugins.autoformat',
|
||||||
-- require 'kickstart.plugins.debug',
|
-- require 'kickstart.plugins.debug',
|
||||||
|
|
||||||
-- NOTE: The import below automatically adds your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
|
-- NOTE: The import below automatically adds your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
|
||||||
|
@ -309,7 +308,7 @@ require('nvim-treesitter.configs').setup {
|
||||||
ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' },
|
ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'typescript', 'vimdoc', 'vim' },
|
||||||
|
|
||||||
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
|
-- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
|
||||||
auto_install = false,
|
auto_install = true,
|
||||||
|
|
||||||
highlight = { enable = true },
|
highlight = { enable = true },
|
||||||
indent = { enable = true, disable = { 'python' } },
|
indent = { enable = true, disable = { 'python' } },
|
||||||
|
@ -403,7 +402,7 @@ local on_attach = function(_, bufnr)
|
||||||
|
|
||||||
-- See `:help K` for why this keymap
|
-- See `:help K` for why this keymap
|
||||||
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
|
nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
|
||||||
nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
|
-- nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
|
||||||
|
|
||||||
-- Lesser used LSP functionality
|
-- Lesser used LSP functionality
|
||||||
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
|
||||||
|
@ -425,12 +424,14 @@ end
|
||||||
-- Add any additional override configuration in the following tables. They will be passed to
|
-- 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.
|
-- the `settings` field of the server config. You must look up that documentation yourself.
|
||||||
local servers = {
|
local servers = {
|
||||||
-- clangd = {},
|
clangd = {},
|
||||||
-- gopls = {},
|
cssls = {},
|
||||||
-- pyright = {},
|
eslint = {},
|
||||||
-- rust_analyzer = {},
|
gopls = {},
|
||||||
-- tsserver = {},
|
pyright = {},
|
||||||
|
rust_analyzer = {},
|
||||||
|
stylelint_lsp = {},
|
||||||
|
tsserver = {},
|
||||||
lua_ls = {
|
lua_ls = {
|
||||||
Lua = {
|
Lua = {
|
||||||
workspace = { checkThirdParty = false },
|
workspace = { checkThirdParty = false },
|
||||||
|
|
|
@ -1,5 +1,26 @@
|
||||||
-- You can add your own plugins here or in other files in this directory!
|
return {
|
||||||
-- I promise not to create any merge conflicts in this directory :)
|
{ "github/copilot.vim", },
|
||||||
--
|
{ "myusuf3/numbers.vim", },
|
||||||
-- See the kickstart.nvim README for more information
|
{ "tpope/vim-eunuch", },
|
||||||
return {}
|
{ "tpope/vim-repeat", },
|
||||||
|
{ "tpope/vim-surround" },
|
||||||
|
|
||||||
|
{
|
||||||
|
"nvim-tree/nvim-web-devicons",
|
||||||
|
opts = {}
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"windwp/nvim-autopairs",
|
||||||
|
config = function()
|
||||||
|
require("nvim-autopairs").setup {}
|
||||||
|
end,
|
||||||
|
},
|
||||||
|
|
||||||
|
{
|
||||||
|
"kristijanhusak/vim-dirvish-git",
|
||||||
|
dependencies = {
|
||||||
|
"justinmk/vim-dirvish",
|
||||||
|
},
|
||||||
|
},
|
||||||
|
}
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
return {
|
||||||
|
'norcalli/nvim-base16.lua',
|
||||||
|
lazy = false,
|
||||||
|
priority = 1000,
|
||||||
|
config = function()
|
||||||
|
local base16 = require 'base16'
|
||||||
|
|
||||||
|
base16(base16.themes[vim.env.BASE16_THEME or "3024"], true)
|
||||||
|
end,
|
||||||
|
}
|
|
@ -0,0 +1,20 @@
|
||||||
|
-- RevealInFinder
|
||||||
|
-- ---------------------------------------------------------------------------
|
||||||
|
|
||||||
|
-- set this to leader-e
|
||||||
|
vim.cmd([[
|
||||||
|
function! s:RevealInFinder()
|
||||||
|
if filereadable(expand("%"))
|
||||||
|
let l:command = "open -R %"
|
||||||
|
elseif getftype(expand("%:p:h")) == "dir"
|
||||||
|
let l:command = "open %:p:h"
|
||||||
|
else
|
||||||
|
let l:command = "open ."
|
||||||
|
endif
|
||||||
|
execute ":silent! !" . l:command
|
||||||
|
redraw!
|
||||||
|
endfunction
|
||||||
|
command! Reveal call <SID>RevealInFinder()
|
||||||
|
]])
|
||||||
|
|
||||||
|
return {}
|
|
@ -46,9 +46,9 @@ return {
|
||||||
|
|
||||||
-- Tsserver usually works poorly. Sorry you work with bad languages
|
-- Tsserver usually works poorly. Sorry you work with bad languages
|
||||||
-- You can remove this line if you know what you're doing :)
|
-- You can remove this line if you know what you're doing :)
|
||||||
if client.name == 'tsserver' then
|
-- if client.name == 'tsserver' then
|
||||||
return
|
-- return
|
||||||
end
|
-- end
|
||||||
|
|
||||||
-- Create an autocmd that will run *before* we save the buffer.
|
-- Create an autocmd that will run *before* we save the buffer.
|
||||||
-- Run the formatting command for the LSP that has just attached.
|
-- Run the formatting command for the LSP that has just attached.
|
||||||
|
|
Loading…
Reference in New Issue