diff --git a/nvim/lazy-lock.json b/nvim/lazy-lock.json index f513a6d..affa04c 100644 --- a/nvim/lazy-lock.json +++ b/nvim/lazy-lock.json @@ -1,52 +1,66 @@ { - "LazyVim": { "branch": "main", "commit": "d0c366e4d861b848bdc710696d5311dca2c6d540" }, - "auto-save.nvim": { "branch": "main", "commit": "b58948445c43e6903987a9bb97c82e66fdcc0786" }, - "blink.cmp": { "branch": "main", "commit": "5f442681df24fe705d1ee7ce5b4d435aa4b4dee4" }, + "LazyVim": { "branch": "main", "commit": "d1529f650fdd89cb620258bdeca5ed7b558420c7" }, + "SchemaStore.nvim": { "branch": "main", "commit": "7de878c943c130ff0378bf0e9b67cee8bb53731b" }, + "auto-save.nvim": { "branch": "main", "commit": "29f793a3a7f98129387590269ffe3ad61ab5e509" }, + "blink.cmp": { "branch": "main", "commit": "1cc3b1a908fbcfd15451c4772759549724f38524" }, "bufferline.nvim": { "branch": "main", "commit": "9f0826ae6adfd836a23bf8a4910e3c07450211f4" }, "catppuccin": { "branch": "main", "commit": "f67b886d65a029f12ffa298701fb8f1efd89295d" }, - "conform.nvim": { "branch": "master", "commit": "9180320205d250429f0f80e073326c674e2a7149" }, - "ctrlsf.vim": { "branch": "master", "commit": "32236a8b376d9311dec9b5fe795ca99d32060b13" }, + "conform.nvim": { "branch": "master", "commit": "70019124aa4f2e6838be9fbd2007f6d13b27a96d" }, "flash.nvim": { "branch": "main", "commit": "34c7be146a91fec3555c33fe89c7d643f6ef5cf1" }, "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" }, - "fzf-lua": { "branch": "main", "commit": "c054a21cd22cef41c62ce96247040abccaab8dbc" }, - "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" }, - "gp.nvim": { "branch": "main", "commit": "2372d5323c6feaa2e9c19f7ccb537c615d878e18" }, - "grug-far.nvim": { "branch": "main", "commit": "c88435b825a35bfa468b47159709b3221976ecd1" }, - "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" }, + "fzf-lua": { "branch": "main", "commit": "af6ecbd7f421e7894127a9e94b40e13172fbfb13" }, + "gitsigns.nvim": { "branch": "main", "commit": "68114837e81ca16d06514c3a997c9102d1b25c15" }, + "grug-far.nvim": { "branch": "main", "commit": "08f32182335754abf461dfb77b2c4e24bfe4d614" }, + "inc-rename.nvim": { "branch": "main", "commit": "4d00cd5029e99f176128bc37ef245e2dd348191d" }, + "lazy.nvim": { "branch": "main", "commit": "d8f26efd456190241afd1b0f5235fe6fdba13d4a" }, "lazydev.nvim": { "branch": "main", "commit": "8620f82ee3f59ff2187647167b6b47387a13a018" }, "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" }, - "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" }, + "markdown-preview.nvim": { "branch": "master", "commit": "a923f5fc5ba36a3b17e289dc35dc17f66d0548ee" }, + "mason-lspconfig.nvim": { "branch": "main", "commit": "97d9f1d3ad205dece6bcafd1d71cf1507608f3c7" }, + "mason-nvim-dap.nvim": { "branch": "main", "commit": "8b9363d83b5d779813cdd2819b8308651cec2a09" }, "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" }, "mini.ai": { "branch": "main", "commit": "ebb04799794a7f94628153991e6334c3304961b8" }, "mini.hipatterns": { "branch": "main", "commit": "f34975103a38b3f608219a1324cdfc58ea660b8b" }, - "mini.icons": { "branch": "main", "commit": "6787321f70d674a481776b7cc2c781fb7002c644" }, + "mini.icons": { "branch": "main", "commit": "1c79feb7478ca773fa3dac5cadf43ced9180e861" }, "mini.pairs": { "branch": "main", "commit": "7e834c5937d95364cc1740e20d673afe2d034cdb" }, - "mini.surround": { "branch": "main", "commit": "aa5e245829dd12d8ff0c96ef11da28681d6049aa" }, - "neo-tree.nvim": { "branch": "main", "commit": "2a0b2c5d394a280cee9444c9894582ac53098604" }, + "neo-tree.nvim": { "branch": "main", "commit": "e6645ecfcba3e064446a6def1c10d788c9873f51" }, "noice.nvim": { "branch": "main", "commit": "eaed6cc9c06aa2013b5255349e4f26a6b17ab70f" }, "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" }, - "nvim-asciidoc-preview": { "branch": "main", "commit": "3ae4598a68bc966160a695cec127ee5cc06add02" }, - "nvim-lint": { "branch": "master", "commit": "1fea92f1d9908eaa5eb8bafe08b4293d7aadaa55" }, - "nvim-lspconfig": { "branch": "master", "commit": "8b15a1a597a59f4f5306fad9adfe99454feab743" }, + "nvim-ansible": { "branch": "main", "commit": "44dabdaa8a9193b7f564a8408ed6d7107705030a" }, + "nvim-asciidoc-preview": { "branch": "main", "commit": "c6a5d952b8151c49da94328e55305c30ae078acf" }, + "nvim-dap": { "branch": "master", "commit": "99807078c5089ed30e0547aa4b52c5867933f426" }, + "nvim-dap-python": { "branch": "master", "commit": "34282820bb713b9a5fdb120ae8dd85c2b3f49b51" }, + "nvim-dap-ruby": { "branch": "main", "commit": "4176405d186a93ebec38a6344df124b1689cfcfd" }, + "nvim-dap-ui": { "branch": "master", "commit": "727c032a8f63899baccb42a1c26f27687e62fc5e" }, + "nvim-dap-virtual-text": { "branch": "master", "commit": "df66808cd78b5a97576bbaeee95ed5ca385a9750" }, + "nvim-jdtls": { "branch": "master", "commit": "baae618ccc7b6045f7d9453ea0566d1333100740" }, + "nvim-lint": { "branch": "master", "commit": "dfa45de973c3ce7bd1b9a6d346f896a68ad07e44" }, + "nvim-lspconfig": { "branch": "master", "commit": "88157521e890fe7fdf18bee22438875edd6300a6" }, + "nvim-nio": { "branch": "master", "commit": "a428f309119086dc78dd4b19306d2d67be884eee" }, "nvim-surround": { "branch": "main", "commit": "9f0cb495f25bff32c936062d85046fbda0c43517" }, - "nvim-treesitter": { "branch": "master", "commit": "5f78e989243f9fb0fb55e0cf54820920d86dfd30" }, + "nvim-treesitter": { "branch": "master", "commit": "6df6e80417b58abe377c90f5e3f7fe94cf7dfc55" }, + "nvim-treesitter-context": { "branch": "master", "commit": "d0dd7ce5a9d0be1f28086e818e52fdc5c78975df" }, "nvim-treesitter-endwise": { "branch": "master", "commit": "8b34305ffc28bd75a22f5a0a9928ee726a85c9a6" }, "nvim-treesitter-textobjects": { "branch": "master", "commit": "ad8f0a472148c3e0ae9851e26a722ee4e29b1595" }, "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" }, + "other.nvim": { "branch": "main", "commit": "933aa489ad02f8f973269a565bfea16cc784cbbf" }, "persistence.nvim": { "branch": "main", "commit": "f6aad7dde7fcf54148ccfc5f622c6d5badd0cc3d" }, "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" }, "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" }, - "snacks.nvim": { "branch": "main", "commit": "d312053f78b4fb55523def179ac502438dd93193" }, + "refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" }, + "render-markdown.nvim": { "branch": "main", "commit": "cfe57468a4ab44b745eddfbe90b63b9777ba7223" }, + "snacks.nvim": { "branch": "main", "commit": "14e89401da348f5d14509fca164fb7bcec83e597" }, "todo-comments.nvim": { "branch": "main", "commit": "ae0a2afb47cf7395dc400e5dc4e05274bf4fb9e0" }, - "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" }, - "treesj": { "branch": "main", "commit": "94f6df623f2d15630b1b617abff39962024cb501" }, + "tokyonight.nvim": { "branch": "main", "commit": "7bb270adaa7692c2c33befc35f5567fc596a2504" }, + "treesj": { "branch": "main", "commit": "ec234a9a13d61a7b95900abdb02fabaea1afd9f3" }, "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" }, "ts-comments.nvim": { "branch": "main", "commit": "872dcfa0418f4a33b7437fb4d9f4e89f2f000d74" }, "vim-caddyfile": { "branch": "master", "commit": "24fe0720551883e407cb70ae1d7c03f162d1d5a0" }, "vim-dadbod": { "branch": "master", "commit": "f740950d0703099e0f172016f10e0e39f50fd0ba" }, - "vim-dadbod-completion": { "branch": "master", "commit": "71eb73d1f7399be6a56cc43b928276cd5ca27ffd" }, - "vim-dadbod-ui": { "branch": "master", "commit": "0fec59e3e1e619e302198cd491b7d27f8d398b7c" }, + "vim-dadbod-completion": { "branch": "master", "commit": "95cbcf21ea7a5c8c025f387280c2e261b8cb3a89" }, + "vim-dadbod-ui": { "branch": "master", "commit": "65454e2011c029922c2c972d63f8bf04282de033" }, "vim-table-mode": { "branch": "master", "commit": "e4365bde024f73e205eefa2fb78e3029ddb92ea9" }, - "which-key.nvim": { "branch": "main", "commit": "8ab96b38a2530eacba5be717f52e04601eb59326" }, - "window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" } + "which-key.nvim": { "branch": "main", "commit": "1f8d414f61e0b05958c342df9b6a4c89ce268766" }, + "window-picker": { "branch": "main", "commit": "c959032b63f61c1d3cf747e5f67114a05efddee2" }, + "yanky.nvim": { "branch": "main", "commit": "f9b905994cccf3c55f41af3a0a1f4c76c844e411" } } diff --git a/nvim/lazyvim.json b/nvim/lazyvim.json index 1c0a353..76ef913 100644 --- a/nvim/lazyvim.json +++ b/nvim/lazyvim.json @@ -1,11 +1,25 @@ { "extras": [ - "lazyvim.plugins.extras.coding.mini-surround", + "lazyvim.plugins.extras.coding.yanky", + "lazyvim.plugins.extras.dap.core", + "lazyvim.plugins.extras.editor.inc-rename", + "lazyvim.plugins.extras.editor.refactoring", "lazyvim.plugins.extras.formatting.biome", + "lazyvim.plugins.extras.lang.ansible", + "lazyvim.plugins.extras.lang.docker", + "lazyvim.plugins.extras.lang.git", + "lazyvim.plugins.extras.lang.java", + "lazyvim.plugins.extras.lang.json", + "lazyvim.plugins.extras.lang.markdown", + "lazyvim.plugins.extras.lang.php", + "lazyvim.plugins.extras.lang.python", "lazyvim.plugins.extras.lang.ruby", "lazyvim.plugins.extras.lang.sql", - "lazyvim.plugins.extras.lang.tailwind", + "lazyvim.plugins.extras.lang.terraform", "lazyvim.plugins.extras.lang.toml", + "lazyvim.plugins.extras.lang.typescript", + "lazyvim.plugins.extras.lang.yaml", + "lazyvim.plugins.extras.ui.treesitter-context", "lazyvim.plugins.extras.util.dot", "lazyvim.plugins.extras.util.mini-hipatterns", "lazyvim.plugins.extras.util.project" diff --git a/nvim/lua/config/autocmds.lua b/nvim/lua/config/autocmds.lua index 6310b4a..1b8730e 100644 --- a/nvim/lua/config/autocmds.lua +++ b/nvim/lua/config/autocmds.lua @@ -4,11 +4,11 @@ -- https://www.reddit.com/r/neovim/comments/13zd9sc/is_there_a_way_to_configure_indentation_per/ -- https://www.reddit.com/r/neovim/comments/vu1y6e/correct_way_to_set_language_specific_settings_in/ -vim.cmd([[ - augroup myfiletypes - autocmd! - " autocmd FileType ruby,lua,eruby,yaml,javascript,typescript,html,css set ai sw=2 sts=2 et - " autocmd FileType java,kotlin,xml,php set ai sw=4 sts=4 et - " autocmd FileType asciidoc setlocal wrap - augroup END -]]) +-- vim.cmd([[ +-- augroup myfiletypes +-- autocmd! +-- " autocmd FileType ruby,lua,eruby,yaml,javascript,typescript,html,css set ai sw=2 sts=2 et +-- " autocmd FileType java,kotlin,xml,php set ai sw=4 sts=4 et +-- " autocmd FileType asciidoc setlocal wrap +-- augroup END +-- ]]) diff --git a/nvim/lua/config/keymaps.lua b/nvim/lua/config/keymaps.lua index 63ce4b1..ed53bec 100644 --- a/nvim/lua/config/keymaps.lua +++ b/nvim/lua/config/keymaps.lua @@ -2,22 +2,22 @@ -- Default keymaps that are always set: https://github.com/LazyVim/LazyVim/blob/main/lua/lazyvim/config/keymaps.lua -- Add any additional keymaps here -local bind = vim.keymap.set -local opts = { silent = true, noremap = true } - --- for russian layout -bind("i", "", "", opts) -bind("n", "л", "gk", opts) -bind("n", "о", "gj", opts) -bind("i", "", "u", opts) -bind("i", "", "u", opts) - -bind("n", "[c", function() - require("treesitter-context").go_to_context() -end) - +-- local bind = vim.keymap.set +-- local opts = { silent = true, noremap = true } +-- +-- -- for russian layout +-- bind("i", "", "", opts) +-- bind("n", "л", "gk", opts) +-- bind("n", "о", "gj", opts) +-- bind("i", "", "u", opts) +-- bind("i", "", "u", opts) +-- +-- bind("n", "[c", function() +-- require("treesitter-context").go_to_context() +-- end) +-- vim.keymap.set("n", "[", "call append(line('.') - 1, repeat([''], v:count1))") vim.keymap.set("n", "]", "call append(line('.'), repeat([''], v:count1))") - -vim.keymap.set('n', 'fj', ':Neotree reveal', {}) -vim.keymap.set('n', 'fa', ':Telescope telescope-alternate alternate_file', {}) +-- +vim.keymap.set("n", "fj", ":Neotree reveal", {}) +-- vim.keymap.set('n', 'fa', ':Telescope telescope-alternate alternate_file', {}) diff --git a/nvim/lua/config/options.lua b/nvim/lua/config/options.lua index 6321feb..0275c98 100644 --- a/nvim/lua/config/options.lua +++ b/nvim/lua/config/options.lua @@ -6,13 +6,13 @@ vim.o.langmap = "ФИСВУАПРШОЛДЬТЩЗЙКЫЕГМЦЧНЯ;ABCDEFGHIJKLMNOPQRSTUVWXYZ,фисвуапршолдьтщзйкыегмцчня;abcdefghijklmnopqrstuvwxyz" vim.o.relativenumber = false -vim.o.spell = false -vim.o.spelllang = "ru_ru,en_us" -vim.o.linebreak = true vim.g.autoformat = false +-- vim.o.spell = false +-- vim.o.spelllang = "ru_ru,en_us" +-- vim.o.linebreak = true -vim.g.root_spec = { "cwd" } +-- vim.g.root_spec = { "cwd" } -vim.o.smartindent = false +-- vim.o.smartindent = false vim.g.snacks_animate = false diff --git a/nvim/lua/plugins/other.lua b/nvim/lua/plugins/other.lua new file mode 100644 index 0000000..a660b0e --- /dev/null +++ b/nvim/lua/plugins/other.lua @@ -0,0 +1,21 @@ +return { + { + "rgroli/other.nvim", + event = "VeryLazy", + config = function() + require("other-nvim").setup({ + showMissingFiles = true, + mappings = { + "react", + "rails", + { + pattern = "/app/controllers/(.*)_controller.rb", + target = { + { context = "react", target = "/app/javascript/pages/%1/*.tsx" }, + }, + }, + }, + }) + end, + }, +} diff --git a/nvim/lua/plugins/others.lua b/nvim/lua/plugins/others.lua index 52aa127..5f42755 100644 --- a/nvim/lua/plugins/others.lua +++ b/nvim/lua/plugins/others.lua @@ -1,4 +1,11 @@ return { + { + "echasnovski/mini.pairs", + event = "VeryLazy", + opts = { + modes = { command = false }, + }, + }, -- { -- "adalessa/laravel.nvim", -- ft = { "php" }, @@ -12,12 +19,6 @@ return { ft = { "asciidoc" }, opts = {}, }, - { - "echasnovski/mini.pairs", - opts = { - modes = { command = false } - } - }, -- { -- "windwp/nvim-autopairs", -- event = "InsertEnter", @@ -54,29 +55,17 @@ return { { "dhruvasagar/vim-table-mode" }, -- { "tree-sitter/tree-sitter-embedded-template" }, { "RRethy/nvim-treesitter-endwise" }, - { "dyng/ctrlsf.vim" }, + -- { "dyng/ctrlsf.vim" }, -- { "digitaltoad/vim-pug" }, -- { - -- { - -- "kylechui/nvim-surround", - -- version = "*", -- Use for stability; omit to use `main` branch for the latest features - -- event = "VeryLazy", - -- config = function() - -- require("nvim-surround").setup({ - -- -- Configuration here, or leave empty to use defaults - -- }) - -- end, - -- }, - -- lazy.nvim { - "robitx/gp.nvim", + "kylechui/nvim-surround", + version = "*", -- Use for stability; omit to use `main` branch for the latest features + event = "VeryLazy", config = function() - local conf = { - -- For customization, refer to Install > Configuration in the Documentation/Readme - } - require("gp").setup(conf) - - -- Setup shortcuts here (see Usage > Shortcuts in the Documentation/Readme) + require("nvim-surround").setup({ + -- Configuration here, or leave empty to use defaults + }) end, }, } diff --git a/nvim/lua/plugins/snacks.lua b/nvim/lua/plugins/snacks.lua deleted file mode 100644 index 68e7151..0000000 --- a/nvim/lua/plugins/snacks.lua +++ /dev/null @@ -1,8 +0,0 @@ -return { - { - "snacks.nvim", - opts = { - -- scroll = { enabled = false }, - }, - }, -}