initial customization and plugins

This commit is contained in:
Dmitry O 2024-03-27 10:27:50 +01:00
parent ea4335f5af
commit 4250de0b77
No known key found for this signature in database
GPG Key ID: F3F70C3C74A4BDA6
2 changed files with 237 additions and 8 deletions

View File

@ -91,7 +91,7 @@ vim.g.mapleader = ' '
vim.g.maplocalleader = ' ' vim.g.maplocalleader = ' '
-- Set to true if you have a Nerd Font installed -- Set to true if you have a Nerd Font installed
vim.g.have_nerd_font = false vim.g.have_nerd_font = true
-- [[ Setting options ]] -- [[ Setting options ]]
-- See `:help vim.opt` -- See `:help vim.opt`
@ -102,7 +102,7 @@ vim.g.have_nerd_font = false
vim.opt.number = true vim.opt.number = true
-- You can also add relative line numbers, for help with jumping. -- You can also add relative line numbers, for help with jumping.
-- Experiment for yourself to see if you like it! -- Experiment for yourself to see if you like it!
-- vim.opt.relativenumber = true vim.opt.relativenumber = true
-- Enable mouse mode, can be useful for resizing splits for example! -- Enable mouse mode, can be useful for resizing splits for example!
vim.opt.mouse = 'a' vim.opt.mouse = 'a'
@ -162,8 +162,12 @@ vim.opt.hlsearch = true
vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>') vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
-- Diagnostic keymaps -- Diagnostic keymaps
vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous [D]iagnostic message' }) vim.keymap.set('n', '[d', function()
vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next [D]iagnostic message' }) vim.diagnostic.goto_prev { float = { source = true } }
end, { desc = 'Go to previous [D]iagnostic message' })
vim.keymap.set('n', ']d', function()
vim.diagnostic.goto_next { float = { source = true } }
end, { desc = 'Go to next [D]iagnostic message' })
vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' }) vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Show diagnostic [E]rror messages' })
vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' }) vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostic [Q]uickfix list' })
@ -320,6 +324,7 @@ require('lazy').setup({
-- Useful for getting pretty icons, but requires a Nerd Font. -- Useful for getting pretty icons, but requires a Nerd Font.
{ 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font }, { 'nvim-tree/nvim-web-devicons', enabled = vim.g.have_nerd_font },
{ 'smartpde/telescope-recent-files' },
}, },
config = function() config = function()
-- Telescope is a fuzzy finder that comes with a lot of different things that -- Telescope is a fuzzy finder that comes with a lot of different things that
@ -375,7 +380,8 @@ require('lazy').setup({
vim.keymap.set('n', '<leader>sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) 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>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>s.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' })
vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' }) -- vim.keymap.set('n', '<leader><leader>', builtin.buffers, { desc = '[ ] Find existing buffers' })
vim.keymap.set('n', '<leader><leader>', "<cmd>lua require('telescope').extensions.recent_files.pick()<CR>", { desc = '[ ] Recent files' })
-- Slightly advanced example of overriding default behavior and theme -- Slightly advanced example of overriding default behavior and theme
vim.keymap.set('n', '<leader>/', function() vim.keymap.set('n', '<leader>/', function()
@ -542,6 +548,21 @@ require('lazy').setup({
-- clangd = {}, -- clangd = {},
-- gopls = {}, -- gopls = {},
-- pyright = {}, -- pyright = {},
pylsp = {
settings = {
pylsp = {
configurationSources = { 'flake8' },
plugins = {
mypy = { enabled = true },
black = { enabled = true },
flake8 = { enabled = true },
pycodestyle = { enabled = false },
rope_autoimport = { enabled = true },
rope_completion = { enabled = true },
},
},
},
},
-- rust_analyzer = {}, -- rust_analyzer = {},
-- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
-- --
@ -576,6 +597,34 @@ require('lazy').setup({
-- You can press `g?` for help in this menu -- You can press `g?` for help in this menu
require('mason').setup() require('mason').setup()
-- PyLSP config: install additional plugins
local pylsp = require('mason-registry').get_package 'python-lsp-server'
pylsp:on('install:success', function()
local function mason_package_path(package)
local path = vim.fn.resolve(vim.fn.stdpath 'data' .. '/mason/packages/' .. package)
return path
end
local path = mason_package_path 'python-lsp-server'
local command = path .. '/venv/bin/pip'
local args = {
'install',
'pylsp-rope',
'python-lsp-black',
'pyflakes',
'python-lsp-ruff',
'sqlalchemy-stubs',
}
require('plenary.job')
:new({
command = command,
args = args,
cwd = path,
})
:start()
end)
-- You can add other tools here that you want Mason to install -- You can add other tools here that you want Mason to install
-- for you, so that they are available from within Neovim. -- for you, so that they are available from within Neovim.
local ensure_installed = vim.tbl_keys(servers or {}) local ensure_installed = vim.tbl_keys(servers or {})
@ -616,7 +665,7 @@ require('lazy').setup({
formatters_by_ft = { formatters_by_ft = {
lua = { 'stylua' }, lua = { 'stylua' },
-- Conform can also run multiple formatters sequentially -- Conform can also run multiple formatters sequentially
-- python = { "isort", "black" }, python = { 'isort', 'black' },
-- --
-- You can use a sub-list to tell conform to run *until* a formatter -- You can use a sub-list to tell conform to run *until* a formatter
-- is found. -- is found.
@ -837,7 +886,7 @@ require('lazy').setup({
-- --
-- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
-- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins`
-- { import = 'custom.plugins' }, { import = 'custom.plugins' },
}, { }, {
ui = { ui = {
-- If you have a Nerd Font, set icons to an empty table which will use the -- If you have a Nerd Font, set icons to an empty table which will use the

View File

@ -2,4 +2,184 @@
-- I promise not to create any merge conflicts in this directory :) -- I promise not to create any merge conflicts in this directory :)
-- --
-- See the kickstart.nvim README for more information -- See the kickstart.nvim README for more information
return {} return {
{
'christoomey/vim-tmux-navigator',
cmd = {
'TmuxNavigateLeft',
'TmuxNavigateDown',
'TmuxNavigateUp',
'TmuxNavigateRight',
'TmuxNavigatePrevious',
},
keys = {
-- there were come ctrl+hjkl stuff here but i don't think i need it, use alt+arrows
},
},
{
'nvim-tree/nvim-tree.lua',
version = '*',
lazy = false,
dependencies = {
'nvim-tree/nvim-web-devicons',
},
config = function()
require('nvim-tree').setup {
vim.keymap.set('n', '<leader>tt', ':NvimTreeToggle\n', { desc = '[T]oggle NVim[T]ree' }),
}
end,
},
{
'nvimtools/none-ls.nvim',
ft = { 'python' },
opts = function()
local null_ls = require 'null-ls'
return {
sources = {
null_ls.builtins.diagnostics.mypy.with {
extra_args = function()
local virtual = os.getenv 'VIRTUAL_ENV' or os.getenv 'CONDA_PREFIX' or '/usr'
return { '--python-executable', virtual .. '/bin/python3' }
end,
},
null_ls.builtins.formatting.isort.with { prefer_local = true },
},
}
end,
},
{
'mfussenegger/nvim-dap',
config = function()
vim.keymap.set('n', '<leader>db', '<cmd> DapToggleBreakpoint <CR>', { desc = '[D]ebug [B]reakpoint' })
vim.keymap.set('n', '<F5>', function()
require('dap').continue()
end, { desc = 'Step Over' })
vim.keymap.set('n', '<F6>', function()
require('dap').step_over()
end, { desc = 'Step Over' })
vim.keymap.set('n', '<F7>', function()
require('dap').step_into()
end, { desc = 'Step Into' })
end,
},
{
'mfussenegger/nvim-dap-python',
ft = 'python',
dependencies = {
'mfussenegger/nvim-dap',
},
config = function()
local path = '~/.local/share/nvim/mason/packages/debugpy/venv/bin/python'
require('dap-python').setup(path)
end,
},
{
'nvim-neotest/neotest',
dependencies = {
'nvim-neotest/nvim-nio',
'nvim-lua/plenary.nvim',
'antoinemadec/FixCursorHold.nvim',
'nvim-treesitter/nvim-treesitter',
'nvim-neotest/neotest-python',
},
config = function()
require('neotest').setup {
adapters = {
require 'neotest-python' {
dap = { justMyCode = false },
pytest_discover_instances = true,
},
},
}
vim.keymap.set('n', '<leader>tn', function()
require('neotest').run.run()
end, { desc = '[T]ests: Run [N]earest' })
vim.keymap.set('n', '<leader>tdn', function()
require('neotest').run.run { strategy = 'dap' }
end, { desc = '[T]ests: [D]ebug [N]earest' })
vim.keymap.set('n', '<leader>tf', function()
require('neotest').run.run(vim.fn.expand '%')
end, { desc = '[T]ests: Run all tests in [F]ile' })
vim.keymap.set('n', '<leader>to', function()
require('neotest').output.open { enter = true }
end, { desc = '[T]ests: Open [O]utput Window' })
end,
},
{
'rcarriga/nvim-dap-ui',
dependencies = { 'mfussenegger/nvim-dap', 'nvim-neotest/nvim-nio' },
config = function()
local dap, dapui = require 'dap', require 'dapui'
dap.listeners.before.attach.dapui_config = function()
dapui.setup()
dapui.open()
end
dap.listeners.before.launch.dapui_config = function()
dapui.setup()
dapui.open()
end
dap.listeners.before.event_terminated.dapui_config = function()
dapui.close()
end
dap.listeners.before.event_exited.dapui_config = function()
dapui.close()
end
end,
},
{
'folke/neodev.nvim',
opts = {},
config = function()
require('neodev').setup {
library = { plugins = { 'nvim-dap-ui' }, types = true },
}
end,
},
{
'tpope/vim-fugitive',
config = function()
vim.keymap.set('n', '<leader>gb', '<Cmd>Telescope git_branches<CR>', { desc = '[G]it [B]ranches' })
vim.keymap.set('n', '<leader>gs', '<Cmd>Git<CR>', { desc = '[G]it [S]tatus' })
vim.keymap.set('n', '<leader>gc', function()
local ok, _ = pcall(vim.cmd, 'G commit -a')
if ok then
local branch = vim.fn.system "git branch --show-current | tr -d '\n'"
local ticket = branch:match '([A-Z]+%-%d+)'
vim.cmd 'startinsert'
vim.api.nvim_put({ string.format('feat(%s): ', ticket) }, 'c', true, true)
end
end, { desc = '[G]it [C]ommit' })
vim.keymap.set('n', '<leader>gp', '<Cmd>Git push<CR>', { desc = '[G]it [P]ush' })
vim.keymap.set('n', '<leader>gf', '<Cmd>Git pull<CR>', { desc = '[G]it [F]pull' })
end,
},
{
'github/copilot.vim',
},
{
'nvimdev/dashboard-nvim',
event = 'VimEnter',
config = function()
require('dashboard').setup {
config = {
header = {
'⠀⢀⣴⣦⠀⠀⠀⠀⢰⣄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀',
'⣰⣿⣿⣿⣷⡀⠀⠀⢸⣿⣷⡄⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀',
'⣿⣿⣿⣿⣿⣿⣄⠀⢸⣿⣿⡇⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠸⠿⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀⠀',
'⣿⣿⣿⠈⢿⣿⣿⣦⢸⣿⣿⡇⠀⣠⠴⠒⠢⣄⠀⠀⣠⠴⠲⠦⣄⠐⣶⣆⠀⠀⢀⣶⡖⢰⣶⠀⢰⣶⣴⡶⣶⣆⣴⡶⣶⣶⡄',
'⣿⣿⣿⠀⠀⠻⣿⣿⣿⣿⣿⡇⢸⣁⣀⣀⣀⣘⡆⣼⠁⠀⠀⠀⠘⡇⠹⣿⡄⠀⣼⡿⠀⢸⣿⠀⢸⣿⠁⠀⢸⣿⡏⠀⠀⣿⣿',
'⠹⣿⣿⠀⠀⠀⠙⣿⣿⣿⡿⠃⢸⡀⠀⠀⠀⠀⠀⣿⠀⠀⠀⠀⢀⡏⠀⢻⣿⣸⣿⠁⠀⢸⣿⠀⢸⣿⠀⠀⢸⣿⡇⠀⠀⣿⣿',
'⠀⠈⠻⠀⠀⠀⠀⠈⠿⠋⠀⠀⠈⠳⢤⣀⣠⠴⠀⠈⠧⣄⣀⡠⠞⠁⠀⠀⠿⠿⠃⠀⠀⢸⣿⠀⢸⣿⠀⠀⠸⣿⡇⠀⠀⣿⡿',
},
shortcut = {},
footer = {
' ',
' 👾 github.com/feakuru 👾 ',
},
},
hide = { statusline = false, tabline = false, winbar = false },
}
end,
dependencies = { { 'nvim-tree/nvim-web-devicons' } },
},
}