diff --git a/init.lua b/init.lua index b98ffc61..2fa855a8 100644 --- a/init.lua +++ b/init.lua @@ -91,13 +91,17 @@ vim.g.mapleader = ' ' vim.g.maplocalleader = ' ' -- Set to true if you have a Nerd Font installed and selected in the terminal -vim.g.have_nerd_font = false +vim.g.have_nerd_font = true -- [[ Setting options ]] -- See `:help vim.o` -- NOTE: You can change these options as you wish! -- For more options, you can see `:help option-list` +-- МОИ ИЗМЕНЕНИЯ В НАСТРОЙКЕ +vim.opt.clipboard = 'unnamedplus' +vim.o.clipboard = 'unnamedplus' +vim.api.nvim_set_option('clipboard', 'unnamed') -- Make line numbers default vim.o.number = true -- You can also add relative line numbers, to help with jumping. @@ -194,6 +198,7 @@ vim.keymap.set('t', '', '', { desc = 'Exit terminal mode' } -- Use CTRL+ to switch between windows -- -- See `:help wincmd` for a list of all window commands +vim.keymap.set('n', 'e', ':NvimTreeToggle', { desc = 'Toggle file tree' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the left window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the right window' }) vim.keymap.set('n', '', '', { desc = 'Move focus to the lower window' }) @@ -205,6 +210,12 @@ vim.keymap.set('n', '', '', { desc = 'Move focus to the upper win -- vim.keymap.set("n", "", "J", { desc = "Move window to the lower" }) -- vim.keymap.set("n", "", "K", { desc = "Move window to the upper" }) +-- МОИ ИЗМЕНЕНИЯ В БУФЕРЕ +-- Копирование в системный буфер при нажатии `y` в Visual mode +vim.keymap.set('v', 'y', '"+y', { desc = 'Копировать в системный буфер' }) + +-- Копирование всей строки в системный буфер +vim.keymap.set('n', 'yy', '"+yy', { desc = 'Копировать строку в буфер' }) -- [[ Basic Autocommands ]] -- See `:help lua-guide-autocommands` @@ -475,6 +486,14 @@ require('lazy').setup({ }, }, }, + { + 'nvim-tree/nvim-tree.lua', + version = '*', + dependencies = { 'nvim-tree/nvim-web-devicons' }, + config = function() + require('nvim-tree').setup {} + end, + }, { -- Main LSP Configuration 'neovim/nvim-lspconfig', @@ -973,7 +992,7 @@ require('lazy').setup({ -- Here are some example plugins that I've included in the Kickstart repository. -- Uncomment any of the lines below to enable them (you will need to restart nvim). -- - -- require 'kickstart.plugins.debug', + require 'kickstart.plugins.debug', -- require 'kickstart.plugins.indent_line', -- require 'kickstart.plugins.lint', -- require 'kickstart.plugins.autopairs', @@ -984,7 +1003,7 @@ require('lazy').setup({ -- This is the easiest way to modularize your config. -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, -- -- For additional information with loading, sourcing and examples see `:help lazy.nvim-🔌-plugin-spec` -- Or use telescope! diff --git a/kickstart.nvim b/kickstart.nvim new file mode 160000 index 00000000..3338d392 --- /dev/null +++ b/kickstart.nvim @@ -0,0 +1 @@ +Subproject commit 3338d3920620861f8313a2745fd5d2be39f39534 diff --git a/lua/kickstart/plugins/debug.lua b/lua/kickstart/plugins/debug.lua index 8e332bf2..753cb0ce 100644 --- a/lua/kickstart/plugins/debug.lua +++ b/lua/kickstart/plugins/debug.lua @@ -18,7 +18,7 @@ return { 'nvim-neotest/nvim-nio', -- Installs the debug adapters for you - 'mason-org/mason.nvim', + 'williamboman/mason.nvim', 'jay-babu/mason-nvim-dap.nvim', -- Add your own debuggers here