latest
This commit is contained in:
Daniel B Sherry
parent
cf673381c5
commit
a9aead8bd6
11 changed files with 150 additions and 470 deletions
|
|
@ -1,47 +1,47 @@
|
|||
return {
|
||||
{ 'folke/tokyonight.nvim' },
|
||||
{ "nvim-lua/popup.nvim" }, -- An implementation of the Popup API from vim in Neovim
|
||||
{ "nvim-lua/plenary.nvim" }, -- Useful lua functions used ny lots of plugins
|
||||
{ "windwp/nvim-autopairs" }, -- Autopairs
|
||||
{ 'nvim-lua/popup.nvim' }, -- An implementation of the Popup API from vim in Neovim
|
||||
{ 'nvim-lua/plenary.nvim' }, -- Useful lua functions used ny lots of plugins
|
||||
{ 'windwp/nvim-autopairs' }, -- Autopairs
|
||||
-- "numToStr/Comment.nvim" -- Easily comment stuff
|
||||
{ 'kyazdani42/nvim-web-devicons' },
|
||||
-- Colorschemes
|
||||
-- "lunarvim/colorschemes" -- A bunch of colorschemes you can try out
|
||||
{ "lunarvim/darkplus.nvim" },
|
||||
{ "moll/vim-bbye" },
|
||||
{ 'lunarvim/darkplus.nvim' },
|
||||
{ 'moll/vim-bbye' },
|
||||
|
||||
-- snippets
|
||||
{ "L3MON4D3/LuaSnip" }, --snippet engine
|
||||
{ "rafamadriz/friendly-snippets" }, -- a bunch of snippets to use
|
||||
|
||||
{ 'L3MON4D3/LuaSnip' }, --snippet engine
|
||||
{ 'rafamadriz/friendly-snippets' }, -- a bunch of snippets to use
|
||||
-- { 'christoomey/vim-tmux-navigator' }, -- tmux & split window navigation
|
||||
-- Telescope
|
||||
{ "nvim-telescope/telescope-media-files.nvim" },
|
||||
{ 'nvim-telescope/telescope-media-files.nvim' },
|
||||
|
||||
-- Treesitter
|
||||
{
|
||||
"nvim-treesitter/nvim-treesitter",
|
||||
build = ":TSUpdate",
|
||||
'nvim-treesitter/nvim-treesitter',
|
||||
build = ':TSUpdate',
|
||||
},
|
||||
-- "p00f/nvim-ts-rainbow"
|
||||
-- "nvim-treesitter/playground"
|
||||
{ "neovim/nvim-lspconfig" },
|
||||
{ "williamboman/mason.nvim" },
|
||||
{ "williamboman/mason-lspconfig.nvim" },
|
||||
{ 'neovim/nvim-lspconfig' },
|
||||
{ 'williamboman/mason.nvim' },
|
||||
{ 'williamboman/mason-lspconfig.nvim' },
|
||||
{
|
||||
"hrsh7th/nvim-cmp",
|
||||
dependencies = {
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
'hrsh7th/cmp-buffer',
|
||||
'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-cmdline',
|
||||
'L3MON4D3/LuaSnip',
|
||||
'saadparwaiz1/cmp_luasnip',
|
||||
'hrsh7th/cmp-vsnip',
|
||||
'hrsh7th/vim-vsnip',
|
||||
'rafamadriz/friendly-snippets',
|
||||
}
|
||||
'hrsh7th/nvim-cmp',
|
||||
dependencies = {
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
'hrsh7th/cmp-buffer',
|
||||
'hrsh7th/cmp-path',
|
||||
'hrsh7th/cmp-cmdline',
|
||||
'L3MON4D3/LuaSnip',
|
||||
'saadparwaiz1/cmp_luasnip',
|
||||
'hrsh7th/cmp-vsnip',
|
||||
'hrsh7th/vim-vsnip',
|
||||
'rafamadriz/friendly-snippets',
|
||||
},
|
||||
},
|
||||
{ 'mfussenegger/nvim-lint', },
|
||||
{ 'mfussenegger/nvim-lint' },
|
||||
{ 'mfussenegger/nvim-dap' },
|
||||
{ 'mhartington/formatter.nvim' }
|
||||
{ 'mhartington/formatter.nvim' },
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,67 +1,67 @@
|
|||
-- ~/.config/nvim/lua/plugins/custom-lsp.lua
|
||||
return {
|
||||
{
|
||||
"neovim/nvim-lspconfig",
|
||||
'neovim/nvim-lspconfig',
|
||||
dependencies = {
|
||||
"williamboman/mason.nvim",
|
||||
"williamboman/mason-lspconfig.nvim",
|
||||
"hrsh7th/cmp-nvim-lsp",
|
||||
'williamboman/mason.nvim',
|
||||
'williamboman/mason-lspconfig.nvim',
|
||||
'hrsh7th/cmp-nvim-lsp',
|
||||
},
|
||||
config = function()
|
||||
-- Setup Mason
|
||||
require("mason").setup()
|
||||
require("mason-lspconfig").setup()
|
||||
require('mason').setup()
|
||||
require('mason-lspconfig').setup()
|
||||
|
||||
-- LSPs to enable
|
||||
-- local servers = {
|
||||
-- "lua_ls",
|
||||
-- "ols",
|
||||
-- "zls",
|
||||
-- "clangd",
|
||||
-- "jsonls",
|
||||
-- "html",
|
||||
-- "rust_analyzer",
|
||||
-- "jdtls",
|
||||
-- "eslint",
|
||||
-- "pyright",
|
||||
-- }
|
||||
local servers = {
|
||||
'lua_ls',
|
||||
'ols',
|
||||
'zls',
|
||||
'clangd',
|
||||
'jsonls',
|
||||
'html',
|
||||
'rust_analyzer',
|
||||
'jdtls',
|
||||
'eslint',
|
||||
'pyright',
|
||||
}
|
||||
|
||||
local lspconfig = require("lspconfig")
|
||||
local capabilities = require("cmp_nvim_lsp").default_capabilities()
|
||||
local lspconfig = require 'lspconfig'
|
||||
local capabilities = require('cmp_nvim_lsp').default_capabilities()
|
||||
|
||||
-- for _, server in ipairs(servers) do
|
||||
-- lspconfig[server].setup({
|
||||
-- capabilities = capabilities,
|
||||
-- })
|
||||
-- end
|
||||
for _, server in ipairs(servers) do
|
||||
lspconfig[server].setup {
|
||||
capabilities = capabilities,
|
||||
}
|
||||
end
|
||||
|
||||
-- Autocommand for keymaps
|
||||
vim.api.nvim_create_autocmd("LspAttach", {
|
||||
group = vim.api.nvim_create_augroup("UserLspConfig", {}),
|
||||
vim.api.nvim_create_autocmd('LspAttach', {
|
||||
group = vim.api.nvim_create_augroup('UserLspConfig', {}),
|
||||
callback = function(ev)
|
||||
local map = function(keys, func, desc)
|
||||
vim.keymap.set("n", keys, func, { buffer = ev.buf, desc = "Lsp: " .. desc })
|
||||
vim.keymap.set('n', keys, func, { buffer = ev.buf, desc = 'Lsp: ' .. desc })
|
||||
end
|
||||
|
||||
local tele = require("telescope.builtin")
|
||||
local tele = require 'telescope.builtin'
|
||||
|
||||
map("gd", tele.lsp_definitions, "Goto Definition")
|
||||
map("<leader>fs", tele.lsp_document_symbols, "Doc Symbols")
|
||||
map("<leader>fS", tele.lsp_dynamic_workspace_symbols, "Dynamic Symbols")
|
||||
map("<leader>ft", tele.lsp_type_definitions, "Goto Type")
|
||||
map("<leader>fr", tele.lsp_references, "Goto References")
|
||||
map("<leader>fi", tele.lsp_implementations, "Goto Impl")
|
||||
map('gd', tele.lsp_definitions, 'Goto Definition')
|
||||
map('<leader>fs', tele.lsp_document_symbols, 'Doc Symbols')
|
||||
map('<leader>fS', tele.lsp_dynamic_workspace_symbols, 'Dynamic Symbols')
|
||||
map('<leader>ft', tele.lsp_type_definitions, 'Goto Type')
|
||||
map('<leader>fr', tele.lsp_references, 'Goto References')
|
||||
map('<leader>fi', tele.lsp_implementations, 'Goto Impl')
|
||||
|
||||
map("K", vim.lsp.buf.hover, "Hover Docs")
|
||||
map("<leader>E", vim.diagnostic.open_float, "Diagnostics")
|
||||
map("<leader>k", vim.lsp.buf.signature_help, "Signature Help")
|
||||
map("<leader>rn", vim.lsp.buf.rename, "Rename")
|
||||
map("<leader>ca", vim.lsp.buf.code_action, "Code Action")
|
||||
map("<leader>wf", function()
|
||||
vim.lsp.buf.format({ async = true })
|
||||
end, "Format")
|
||||
map('K', vim.lsp.buf.hover, 'Hover Docs')
|
||||
map('<leader>E', vim.diagnostic.open_float, 'Diagnostics')
|
||||
map('<leader>k', vim.lsp.buf.signature_help, 'Signature Help')
|
||||
map('<leader>rn', vim.lsp.buf.rename, 'Rename')
|
||||
map('<leader>ca', vim.lsp.buf.code_action, 'Code Action')
|
||||
map('<leader>wf', function()
|
||||
vim.lsp.buf.format { async = true }
|
||||
end, 'Format')
|
||||
|
||||
vim.keymap.set("v", "<leader>ca", vim.lsp.buf.code_action, { buffer = ev.buf, desc = "Lsp: Code Action" })
|
||||
vim.keymap.set('v', '<leader>ca', vim.lsp.buf.code_action, { buffer = ev.buf, desc = 'Lsp: Code Action' })
|
||||
end,
|
||||
})
|
||||
end,
|
||||
|
|
|
|||
18
lua/plugins/tmux.lua
Normal file
18
lua/plugins/tmux.lua
Normal file
|
|
@ -0,0 +1,18 @@
|
|||
return {
|
||||
'christoomey/vim-tmux-navigator',
|
||||
cmd = {
|
||||
'TmuxNavigateLeft',
|
||||
'TmuxNavigateDown',
|
||||
'TmuxNavigateUp',
|
||||
'TmuxNavigateRight',
|
||||
'TmuxNavigatePrevious',
|
||||
'TmuxNavigatorProcessList',
|
||||
},
|
||||
keys = {
|
||||
{ '<c-h>', '<cmd><C-U>TmuxNavigateLeft<cr>' },
|
||||
{ '<c-j>', '<cmd><C-U>TmuxNavigateDown<cr>' },
|
||||
{ '<c-k>', '<cmd><C-U>TmuxNavigateUp<cr>' },
|
||||
{ '<c-l>', '<cmd><C-U>TmuxNavigateRight<cr>' },
|
||||
{ '<c-\\>', '<cmd><C-U>TmuxNavigatePrevious<cr>' },
|
||||
},
|
||||
}
|
||||
|
|
@ -1,6 +1,6 @@
|
|||
return {
|
||||
"folke/which-key.nvim",
|
||||
event = "VeryLazy",
|
||||
'folke/which-key.nvim',
|
||||
event = 'VeryLazy',
|
||||
opts = {
|
||||
-- your configuration comes here
|
||||
-- or leave it empty to use the default settings
|
||||
|
|
@ -8,11 +8,11 @@ return {
|
|||
},
|
||||
keys = {
|
||||
{
|
||||
"<leader>?",
|
||||
'<leader>?',
|
||||
function()
|
||||
require("which-key").show({ global = false })
|
||||
require('which-key').show { global = false }
|
||||
end,
|
||||
desc = "Buffer Local Keymaps (which-key)",
|
||||
desc = 'Buffer Local Keymaps (which-key)',
|
||||
},
|
||||
},
|
||||
}
|
||||
|
|
|
|||
|
|
@ -1,11 +1,8 @@
|
|||
-- local keymap = vim.api.nvim_set_keymap
|
||||
local keymap = vim.keymap.set
|
||||
local opts = { noremap = true, silent = true }
|
||||
|
||||
local term_opts = { silent = true }
|
||||
|
||||
-- Shorten function name
|
||||
local keymap = vim.api.nvim_set_keymap
|
||||
|
||||
--Remap space as leader key
|
||||
keymap('', '<Space>', '<Nop>', opts)
|
||||
vim.g.mapleader = ' '
|
||||
vim.g.maplocalleader = ' '
|
||||
|
|
@ -25,23 +22,26 @@ keymap('n', '<C-j>', '<C-w>j', opts)
|
|||
keymap('n', '<C-k>', '<C-w>k', opts)
|
||||
keymap('n', '<C-l>', '<C-w>l', opts)
|
||||
|
||||
keymap('n', '<leader>e', ':Lex 30<cr>', opts) -- hit again to close
|
||||
keymap('n', '<leader>e', ':Lex 34<cr>', opts) -- hit again to close
|
||||
|
||||
-- Resize with arrows
|
||||
keymap('n', '<C-Up>', ':resize +2<CR>', opts)
|
||||
keymap('n', '<C-Down>', ':resize -2<CR>', opts)
|
||||
keymap('n', '<C-Left>', ':vertical resize -2<CR>', opts)
|
||||
keymap('n', '<C-Right>', ':vertical resize +2<CR>', opts)
|
||||
keymap('n', '<C-Up>', ':resize +6<CR>', opts)
|
||||
keymap('n', '<C-Down>', ':resize 2<CR>', opts)
|
||||
keymap('n', '<C-Left>', ':vertical resize 2<CR>', opts)
|
||||
keymap('n', '<C-Right>', ':vertical resize +6<CR>', opts)
|
||||
|
||||
-- Navigate buffers
|
||||
keymap('n', '<S-l>', ':bnext<CR>', opts)
|
||||
keymap("n", "<leader>n", ":bnext<CR>", opts)
|
||||
keymap('n', '<S-h>', ':bprevious<CR>', opts)
|
||||
keymap("n", "<leader>p", ":bprev<CR>", opts)
|
||||
-- keymap('n', '<S-l>', ':bnext<CR>', opts)
|
||||
vim.keymap.set('n', '<S-l>', ':bnext<CR>', opts)
|
||||
vim.keymap.set('n', '<S-h>', ':bprev<CR>', opts)
|
||||
|
||||
keymap('n', '<leader>n', ':bnext<CR>', opts)
|
||||
-- keymap('n', '<S-h>', ':bprevious<CR>', opts)
|
||||
keymap('n', '<leader>p', ':bprev<CR>', opts)
|
||||
|
||||
-- Insert --
|
||||
-- Press fast to exit
|
||||
keymap('i', 'jk', '<ESC>', opts)
|
||||
-- keymap('i', 'jk', '<ESC>', opts)
|
||||
|
||||
-- Jump to beginning of line
|
||||
keymap('n', '<leader>h', '^', opts)
|
||||
|
|
@ -50,49 +50,42 @@ keymap('n', '<leader>h', '^', opts)
|
|||
-- Stay in indent mode
|
||||
keymap('v', '<', '<gv', opts)
|
||||
keymap('v', '>', '>gv', opts)
|
||||
|
||||
-- Move text up and down
|
||||
keymap('v', '<A-j>', ':m .+1<CR>==', opts)
|
||||
keymap('v', '<A-k>', ':m .-2<CR>==', opts)
|
||||
-- paste over currently selected text without yanking it
|
||||
-- _ register is black hole. Unrecoverable
|
||||
keymap('v', 'p', '"_dp', opts)
|
||||
keymap('v', 'P', '"_dP', opts)
|
||||
-- Visual Block --
|
||||
-- Move text up and down
|
||||
-- keymap('x', 'J', ":move '>+5<CR>gv-gv", opts)
|
||||
-- keymap('x', 'K', ":move '<2<CR>gv-gv", opts)
|
||||
keymap('v', '<A-j>', ':m .+1<CR>==', opts)
|
||||
keymap('v', '<A-k>', ':m .-2<CR>==', opts)
|
||||
keymap('x', 'J', ":move '>+1<CR>gv-gv", opts)
|
||||
keymap('x', 'K', ":move '<-2<CR>gv-gv", opts)
|
||||
keymap('x', '<A-j>', ":move '>+1<CR>gv-gv", opts)
|
||||
keymap('x', '<A-k>', ":move '<-2<CR>gv-gv", opts)
|
||||
|
||||
-- Terminal --
|
||||
-- Better terminal navigation
|
||||
keymap('t', '<C-h>', '<C-\\><C-N><C-w>h', term_opts)
|
||||
keymap('t', '<C-j>', '<C-\\><C-N><C-w>j', term_opts)
|
||||
keymap('t', '<C-k>', '<C-\\><C-N><C-w>k', term_opts)
|
||||
keymap('t', '<C-l>', '<C-\\><C-N><C-w>l', term_opts)
|
||||
|
||||
|
||||
-- keymap("n", "<leader>f", "<cmd>Telescope find_files<cr>", opts)
|
||||
keymap("n", "<leader>f", "<cmd>lua require'telescope.builtin'.find_files(require('telescope.themes').get_dropdown({ previewer = false }))<cr>", opts)
|
||||
keymap("n", "<c-t>", "<cmd>Telescope live_grep<cr>", opts)
|
||||
--
|
||||
-- See `:help telescope.builtin`
|
||||
local builtin = require 'telescope.builtin'
|
||||
vim.keymap.set('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' })
|
||||
vim.keymap.set('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' })
|
||||
vim.keymap.set('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' })
|
||||
vim.keymap.set('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' })
|
||||
vim.keymap.set('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' })
|
||||
vim.keymap.set('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
|
||||
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
|
||||
vim.keymap.set('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
|
||||
vim.keymap.set('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
|
||||
vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
|
||||
keymap('n', '<leader>sh', builtin.help_tags, { desc = '[S]earch [H]elp' })
|
||||
keymap('n', '<leader>sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' })
|
||||
keymap('n', '<leader>sf', builtin.find_files, { desc = '[S]earch [F]iles' })
|
||||
keymap('n', '<leader>ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' })
|
||||
keymap('n', '<leader>sw', builtin.grep_string, { desc = '[S]earch current [W]ord' })
|
||||
keymap('n', '<leader>sg', builtin.live_grep, { desc = '[S]earch by [G]rep' })
|
||||
keymap('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' })
|
||||
keymap('n', '<leader>sr', builtin.resume, { desc = '[S]earch [R]esume' })
|
||||
keymap('n', '<leader>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
|
||||
keymap('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
|
||||
|
||||
vim.keymap.set('n', '<leader>/', function()
|
||||
keymap('n', '<leader>/', function()
|
||||
-- You can pass additional configuration to Telescope to change the theme, layout, etc.
|
||||
builtin.current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
|
||||
winblend = 10,
|
||||
winblend = 14,
|
||||
previewer = false,
|
||||
})
|
||||
end, { desc = '[/] Fuzzily search in current buffer' })
|
||||
|
|
@ -112,24 +105,27 @@ vim.keymap.set('n', '<leader>sn', function()
|
|||
end, { desc = '[S]earch [N]eovim files' })
|
||||
|
||||
-- Nvimtree
|
||||
keymap("n", "<leader>e", ":NvimTreeToggle<cr>", opts)
|
||||
keymap('n', '<leader>e', ':NvimTreeToggle<cr>', opts)
|
||||
-- keymap("n", "<leader>f", ":Format<cr>", opts)
|
||||
keymap("n", "<leader>w", ":w<cr>", opts)
|
||||
keymap("n", "<leader>q", ":q<cr>", opts)
|
||||
keymap("n", "<leader>d", ":bdelete<cr>", opts)
|
||||
keymap('n', '<leader>w', ':w<cr>', opts)
|
||||
keymap('n', '<leader>q', ':q<cr>', opts)
|
||||
keymap('n', '<leader>d', ':bdelete<cr>', opts)
|
||||
|
||||
keymap("n", "<C-d>", "<C-d>zz", opts)
|
||||
keymap("n", "<C-u>", "<C-u>zz", opts)
|
||||
keymap('n', '<C-d>', '<C-d>zz', opts)
|
||||
keymap('n', '<C-u>', '<C-u>zz', opts)
|
||||
|
||||
-- Move line on the screen rather than by line in the file
|
||||
vim.keymap.set("n", "j", "gj", opts)
|
||||
vim.keymap.set("n", "k", "gk", opts)
|
||||
keymap('n', 'j', 'gj', opts)
|
||||
keymap('n', 'k', 'gk', opts)
|
||||
|
||||
-- Select all
|
||||
vim.keymap.set("n", "<C-a>", "ggVG", opts)
|
||||
vim.keymap.set('n', '<c-a>', 'ggvg', opts)
|
||||
|
||||
vim.keymap.set("n", "YY", "va{Vy", opts)
|
||||
vim.keymap.set("n", "<leader>r", ":w<CR>:!python3 %<CR>", { noremap = true, silent = true })
|
||||
vim.keymap.set("n", "<leader><leader>x", ":source %<CR>", opts)
|
||||
vim.keymap.set("n", "<leader>x", ":.lua<CR>", opts)
|
||||
vim.keymap.set("v", "<leader>x", ":lua<CR>", opts)
|
||||
-- vim.keymap.set('n', 'YY', 'va{Vy', opts)
|
||||
keymap('n', '<leader>r', ':w<CR>:!python3 %<CR>', { noremap = true, silent = true })
|
||||
-- vim.keymap.set('n', '<leader><leader>x', ':source %<CR>', opts)
|
||||
keymap('n', '<leader>x', ':.lua<CR>', opts)
|
||||
keymap('v', '<leader>x', ':lua<CR>', opts)
|
||||
|
||||
-- undo word by word
|
||||
vim.keymap.set('i', '<space>', '<C-G>u<space>', opts)
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue