adjusted netrw; fixed ctrl+l in netrw
This commit is contained in:
@@ -7,9 +7,11 @@ function Color(color)
|
|||||||
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" })
|
||||||
vim.api.nvim_set_hl(0, "StatusLine", { bg = "none" })
|
vim.api.nvim_set_hl(0, "StatusLine", { bg = "none" })
|
||||||
-- If Vim thinks StatusLine and StatusLineNC are the same it overrides these settings
|
-- If Vim thinks StatusLine and StatusLineNC are the same it overrides these settings
|
||||||
vim.api.nvim_set_hl(0, "StatusLineNC", { ctermbg = "#ff0000", bg = "none" })
|
vim.api.nvim_set_hl(0, "StatusLineNC", { ctermbg = 0, bg = "none" })
|
||||||
vim.api.nvim_set_hl(0, "EndOfBuffer", { fg = "none", bg = "none" })
|
vim.api.nvim_set_hl(0, "CursorLine", { link = "Visual" })
|
||||||
|
vim.api.nvim_set_hl(0, "Pmenu", { link = "Normal" })
|
||||||
|
vim.api.nvim_set_hl(0, "PmenuSel", { link = "Visual" })
|
||||||
|
vim.api.nvim_set_hl(0, "PmenuSbar", { link = "Normal" })
|
||||||
end
|
end
|
||||||
|
|
||||||
Color()
|
Color()
|
||||||
-- #1E1E2E
|
|
||||||
|
|||||||
@@ -4,26 +4,49 @@ lsp.preset("recommended")
|
|||||||
|
|
||||||
require('mason').setup({})
|
require('mason').setup({})
|
||||||
require('mason-lspconfig').setup({
|
require('mason-lspconfig').setup({
|
||||||
ensure_installed = {'tsserver', 'rust_analyzer', 'lua_ls'},
|
ensure_installed = { 'tsserver', 'rust_analyzer' },
|
||||||
handlers = {
|
handlers = {
|
||||||
lsp.default_setup
|
lsp.default_setup,
|
||||||
}
|
lua_ls = function()
|
||||||
|
local lua_opts = lsp.nvim_lua_ls()
|
||||||
|
require('lspconfig').lua_ls.setup(lua_opts)
|
||||||
|
end
|
||||||
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
require('lspconfig').yamlls.setup {
|
require('lspconfig').yamlls.setup({
|
||||||
|
on_attach = function(client, bufnr)
|
||||||
|
client.resolved_capabilities.document_formatting = true
|
||||||
|
end,
|
||||||
settings = {
|
settings = {
|
||||||
yaml = {
|
yaml = {
|
||||||
|
customTags = { "!enemy", "!delay", "!composite" },
|
||||||
validate = false,
|
validate = false,
|
||||||
format = {
|
format = {
|
||||||
enable = true
|
enable = true
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
require('lspconfig').tsserver.setup {
|
||||||
|
settings = {
|
||||||
|
typescript = {
|
||||||
|
preferences = {
|
||||||
|
quoteStype = 'single'
|
||||||
|
}
|
||||||
|
},
|
||||||
|
javascript = {
|
||||||
|
preferences = {
|
||||||
|
quoteStyle = 'single'
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
local cmp = require('cmp')
|
local cmp = require('cmp')
|
||||||
|
|
||||||
local cmp_select = {behavior = cmp.SelectBehavior.Select}
|
local cmp_select = { behavior = cmp.SelectBehavior.Select }
|
||||||
local cmp_mappings = lsp.defaults.cmp_mappings({
|
local cmp_mappings = lsp.defaults.cmp_mappings({
|
||||||
})
|
})
|
||||||
|
|
||||||
@@ -31,47 +54,50 @@ cmp_mappings['<Tab>'] = nil
|
|||||||
cmp_mappings['<S-Tab>'] = nil
|
cmp_mappings['<S-Tab>'] = nil
|
||||||
|
|
||||||
cmp.setup({
|
cmp.setup({
|
||||||
window = {
|
sources = {
|
||||||
completion = cmp.config.window.bordered(),
|
{ name = 'path' },
|
||||||
documentation = cmp.config.window.bordered()
|
{ name = 'nvim_lsp' },
|
||||||
},
|
{ name = 'nvim_lua' },
|
||||||
mapping = cmp.mapping.preset.insert({
|
{ name = 'luasnip', keyword_length = 2 },
|
||||||
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
{ name = 'buffer', keyword_length = 3 },
|
||||||
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
},
|
||||||
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
formatting = lsp.cmp_format(),
|
||||||
['<C-Space>'] = cmp.mapping.complete(),
|
mapping = cmp.mapping.preset.insert({
|
||||||
['<Tab>'] = nil,
|
['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
|
||||||
['<S-Tab>'] = nil
|
['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
|
||||||
})
|
['<C-y>'] = cmp.mapping.confirm({ select = true }),
|
||||||
|
['<C-Space>'] = cmp.mapping.complete(),
|
||||||
|
['<Tab>'] = nil,
|
||||||
|
['<S-Tab>'] = nil
|
||||||
|
}),
|
||||||
})
|
})
|
||||||
|
|
||||||
lsp.set_preferences({
|
lsp.set_preferences({
|
||||||
suggest_lsp_servers = false,
|
suggest_lsp_servers = false,
|
||||||
sign_icons = {
|
sign_icons = {
|
||||||
error = 'E',
|
error = 'E',
|
||||||
warn = 'W',
|
warn = 'W',
|
||||||
hint = 'H',
|
hint = 'H',
|
||||||
info = 'I'
|
info = 'I'
|
||||||
}
|
}
|
||||||
})
|
})
|
||||||
|
|
||||||
lsp.on_attach(function(client, bufnr)
|
lsp.on_attach(function(client, bufnr)
|
||||||
local opts = {buffer = bufnr, remap = false}
|
local opts = { buffer = bufnr, remap = false }
|
||||||
|
|
||||||
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
|
vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
|
||||||
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
|
vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
|
||||||
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
|
vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
|
||||||
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
|
vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
|
||||||
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
|
vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts)
|
||||||
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
|
vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts)
|
||||||
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
|
vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
|
||||||
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
|
vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
|
||||||
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
|
vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
|
||||||
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
|
vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
|
||||||
end)
|
end)
|
||||||
|
|
||||||
lsp.setup()
|
lsp.setup()
|
||||||
|
|
||||||
vim.diagnostic.config({
|
vim.diagnostic.config({
|
||||||
virtual_text = true
|
virtual_text = true
|
||||||
})
|
})
|
||||||
|
|||||||
@@ -1,6 +1,10 @@
|
|||||||
require 'nvim-treesitter.configs'.setup {
|
require 'nvim-treesitter.configs'.setup {
|
||||||
-- A list of parser names, or "all" (the five listed parsers should always be installed)
|
-- A list of parser names, or "all" (the five listed parsers should always be installed)
|
||||||
ensure_installed = { "javascript", "typescript", "c", "lua", "vim", "vimdoc", "query" },
|
ensure_installed = { "javascript", "typescript", "c", "lua", "vim", "vimdoc", "query", "c_sharp", "css", "gitcommit", "html", "svelte", "yaml", "astro", "toml", "jsdoc", "json" },
|
||||||
|
|
||||||
|
tree_docs = {
|
||||||
|
enable = true
|
||||||
|
},
|
||||||
|
|
||||||
-- Install parsers synchronously (only applied to `ensure_installed`)
|
-- Install parsers synchronously (only applied to `ensure_installed`)
|
||||||
sync_install = false,
|
sync_install = false,
|
||||||
|
|||||||
9
lua/409/autocmd.lua
Normal file
9
lua/409/autocmd.lua
Normal file
@@ -0,0 +1,9 @@
|
|||||||
|
vim.api.nvim_create_autocmd({ 'FileType' }, {
|
||||||
|
pattern = { '*.yaml' },
|
||||||
|
command = 'setlocal ts=2 sts=2 sw=2 expandtab indentkeys-=0# indentkeys-=<:>'
|
||||||
|
})
|
||||||
|
|
||||||
|
vim.api.nvim_create_autocmd({ 'FileType' }, {
|
||||||
|
pattern = { 'netrw' },
|
||||||
|
command = 'nnoremap <buffer> <C-l> <Cmd> TmuxNavigateRight<CR>'
|
||||||
|
})
|
||||||
@@ -1,7 +1,3 @@
|
|||||||
require('409.remap')
|
require('409.remap')
|
||||||
require('409.set')
|
require('409.set')
|
||||||
|
require('409.autocmd')
|
||||||
vim.api.nvim_create_autocmd({ 'FileType' }, {
|
|
||||||
pattern = { '*.yaml' },
|
|
||||||
command = 'setlocal ts=2 sts=2 sw=2 expandtab indentkeys-=0# indentkeys-=<:>'
|
|
||||||
})
|
|
||||||
|
|||||||
@@ -21,6 +21,7 @@ return require('packer').startup(function(use)
|
|||||||
}
|
}
|
||||||
|
|
||||||
use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
|
use('nvim-treesitter/nvim-treesitter', { run = ':TSUpdate' })
|
||||||
|
use('nvim-treesitter/nvim-tree-docs')
|
||||||
|
|
||||||
use{
|
use{
|
||||||
'ThePrimeagen/harpoon',
|
'ThePrimeagen/harpoon',
|
||||||
|
|||||||
@@ -38,7 +38,7 @@ vim.keymap.set("n", "<leader><leader>", function()
|
|||||||
vim.cmd("so")
|
vim.cmd("so")
|
||||||
end)
|
end)
|
||||||
|
|
||||||
vim.keymap.set("n", "<C-h>", "<cmd> TmuxNavigateLeft<CR>");
|
vim.keymap.set({ "n", "x" }, "<C-h>", "<cmd> TmuxNavigateLeft<CR>");
|
||||||
vim.keymap.set("n", "<C-l>", "<cmd> TmuxNavigateRight<CR>");
|
vim.keymap.set({ "n", "x" }, "<C-l>", "<cmd> TmuxNavigateRight<CR>");
|
||||||
vim.keymap.set("n", "<C-j>", "<cmd> TmuxNavigateDown<CR>");
|
vim.keymap.set({ "n", "x" }, "<C-j>", "<cmd> TmuxNavigateDown<CR>");
|
||||||
vim.keymap.set("n", "<C-k>", "<cmd> TmuxNavigateUp<CR>");
|
vim.keymap.set({ "n", "x" }, "<C-k>", "<cmd> TmuxNavigateUp<CR>");
|
||||||
|
|||||||
@@ -31,3 +31,6 @@ vim.opt.isfname:append('@-@')
|
|||||||
vim.opt.updatetime = 50
|
vim.opt.updatetime = 50
|
||||||
|
|
||||||
vim.g.mapleader = ' '
|
vim.g.mapleader = ' '
|
||||||
|
vim.g.netrw_browse_split = 0
|
||||||
|
vim.g.netrw_banner = 0
|
||||||
|
vim.g.netrw_winsize = 25
|
||||||
|
|||||||
@@ -119,6 +119,11 @@ _G.packer_plugins = {
|
|||||||
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-lspconfig",
|
||||||
url = "https://github.com/neovim/nvim-lspconfig"
|
url = "https://github.com/neovim/nvim-lspconfig"
|
||||||
},
|
},
|
||||||
|
["nvim-tree-docs"] = {
|
||||||
|
loaded = true,
|
||||||
|
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-tree-docs",
|
||||||
|
url = "https://github.com/nvim-treesitter/nvim-tree-docs"
|
||||||
|
},
|
||||||
["nvim-treesitter"] = {
|
["nvim-treesitter"] = {
|
||||||
loaded = true,
|
loaded = true,
|
||||||
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
path = "/home/j409/.local/share/nvim/site/pack/packer/start/nvim-treesitter",
|
||||||
|
|||||||
Reference in New Issue
Block a user