From 2004599c899b1b2bda0541c743ab7cb22aa58e65 Mon Sep 17 00:00:00 2001 From: Pgolik Date: Mon, 12 May 2025 07:49:12 +0200 Subject: [PATCH] Add files via upload --- init.lua | 126 ++++++++++++++++++++++--------------------------------- 1 file changed, 51 insertions(+), 75 deletions(-) diff --git a/init.lua b/init.lua index 28670d69..89cdb36c 100644 --- a/init.lua +++ b/init.lua @@ -32,7 +32,7 @@ require('lazy').setup({ lazy = false, opts = { bigfile = { enabled = true }, - dashboard = { enabled = true }, + -- dashboard = { enabled = true }, explorer = { enabled = true }, indent = { enabled = true }, input = { enabled = true }, @@ -520,6 +520,14 @@ require('lazy').setup({ desc = 'Prev Reference', mode = { 'n', 't' }, }, + { + '', + function() + Snacks.picker.zoxide() + end, + desc = 'Open Zoxide', + mode = { 'n', 't' }, + }, { 'N', desc = 'Neovim News', @@ -773,41 +781,6 @@ require('lazy').setup({ ['ui-select'] = { require('telescope.themes').get_dropdown(), }, - ['live_grep_args'] = { - auto_quoting = true, - }, - ['zoxide'] = { - prompt_title = '[ Zoxide List ]', - - -- Zoxide list command with score - list_command = 'zoxide query -ls', - mappings = { - default = { - action = function(selection) - vim.cmd.cd(selection.path) - local split = z_utils.create_basic_command 'split' - split(selection) - end, - after_action = function(selection) - vim.notify('Directory changed to ' .. selection.path) - end, - }, - [''] = { action = z_utils.create_basic_command 'split' }, - [''] = { action = z_utils.create_basic_command 'vsplit' }, - [''] = { action = z_utils.create_basic_command 'edit' }, - [''] = { - keepinsert = true, - action = function(selection) - builtin.find_files { cwd = selection.path } - end, - }, - [''] = { - action = function(selection) - vim.cmd.tcd(selection.path) - end, - }, - }, - }, }, } @@ -818,41 +791,41 @@ require('lazy').setup({ -- See `:help telescope.builtin` local builtin = require 'telescope.builtin' local extensions = require 'telescope._extensions' - vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) - vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) - vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) - vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) - vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) - vim.keymap.set('n', 'sg', ":lua require('telescope').extensions.live_grep_args.live_grep_args()", { desc = '[S]earch by [G]rep' }) - vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) - vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) - vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) - vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) + -- vim.keymap.set('n', 'sh', builtin.help_tags, { desc = '[S]earch [H]elp' }) + -- vim.keymap.set('n', 'sk', builtin.keymaps, { desc = '[S]earch [K]eymaps' }) + --vim.keymap.set('n', 'sf', builtin.find_files, { desc = '[S]earch [F]iles' }) + -- vim.keymap.set('n', 'ss', builtin.builtin, { desc = '[S]earch [S]elect Telescope' }) + -- vim.keymap.set('n', 'sw', builtin.grep_string, { desc = '[S]earch current [W]ord' }) + -- vim.keymap.set('n', 'sg', ":lua require('telescope').extensions.live_grep_args.live_grep_args()", { desc = '[S]earch by [G]rep' }) + -- vim.keymap.set('n', 'sd', builtin.diagnostics, { desc = '[S]earch [D]iagnostics' }) + -- vim.keymap.set('n', 'sr', builtin.resume, { desc = '[S]earch [R]esume' }) + -- vim.keymap.set('n', 's.', builtin.oldfiles, { desc = '[S]earch Recent Files ("." for repeat)' }) + -- vim.keymap.set('n', '', builtin.buffers, { desc = '[ ] Find existing buffers' }) vim.keymap.set('n', '', builtin.spell_suggest, { desc = 'Spell sugesstions' }) pcall(require('telescope').load_extension, 'live_grep_args') -- Slightly advanced example of overriding default behavior and theme - vim.keymap.set('n', '/', 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, - previewer = false, - }) - end, { desc = '[/] Fuzzily search in current buffer' }) + -- vim.keymap.set('n', '/', 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, + -- previewer = false, + -- }) + -- end, { desc = '[/] Fuzzily search in current buffer' }) -- It's also possible to pass additional configuration options. -- See `:help telescope.builtin.live_grep()` for information about particular keys - vim.keymap.set('n', 's/', function() - builtin.live_grep { - grep_open_files = true, - prompt_title = 'Live Grep in Open Files', - } - end, { desc = '[S]earch [/] in Open Files' }) + -- vim.keymap.set('n', 's/', function() + -- builtin.live_grep { + -- grep_open_files = true, + -- prompt_title = 'Live Grep in Open Files', + -- } + -- end, { desc = '[S]earch [/] in Open Files' }) -- Shortcut for searching your Neovim configuration files - vim.keymap.set('n', 'sn', function() - builtin.find_files { cwd = vim.fn.stdpath 'config' } - end, { desc = '[S]earch [N]eovim files' }) + -- vim.keymap.set('n', 'sn', function() + -- builtin.find_files { cwd = vim.fn.stdpath 'config' } + -- end, { desc = '[S]earch [N]eovim files' }) end, }, @@ -1116,7 +1089,7 @@ require('lazy').setup({ cmd = { 'ConformInfo' }, keys = { { - 'ff', + 'fF', function() require('conform').format { async = true, lsp_format = 'fallback' } end, @@ -1142,8 +1115,8 @@ require('lazy').setup({ end, formatters_by_ft = { cmake = { 'cmakelang' }, - cpp = { 'clang-format-15' }, - json = { 'clang-format-15' }, + cpp = { 'clang-format' }, + json = { 'clang-format' }, lua = { 'stylua' }, -- Conform can also run multiple formatters sequentially python = { 'ruff_format', 'ruff_fix', 'ruff_organize_imports' }, @@ -1246,16 +1219,16 @@ require('lazy').setup({ -- -- will move you to the right of each of the expansion locations. -- is similar, except moving you backwards. - [''] = cmp.mapping(function() - if luasnip.expand_or_locally_jumpable() then - luasnip.expand_or_jump() - end - end, { 'i', 's' }), - [''] = cmp.mapping(function() - if luasnip.locally_jumpable(-1) then - luasnip.jump(-1) - end - end, { 'i', 's' }), + -- [''] = cmp.mapping(function() + -- if luasnip.expand_or_locally_jumpable() then + -- luasnip.expand_or_jump() + -- end + -- end, { 'i', 's' }), + -- [''] = cmp.mapping(function() + -- if luasnip.locally_jumpable(-1) then + -- luasnip.jump(-1) + -- end + -- end, { 'i', 's' }), -- For more advanced Luasnip keymaps (e.g. selecting choice nodes, expansion) see: -- https://github.com/L3MON4D3/LuaSnip?tab=readme-ov-file#keymaps @@ -1340,6 +1313,9 @@ require('lazy').setup({ ensure_installed = { 'bash', 'c', 'diff', 'html', 'lua', 'luadoc', 'markdown', 'markdown_inline', 'query', 'vim', 'vimdoc' }, -- Autoinstall languages that are not installed auto_install = true, + spell = { + check_code = true, + }, highlight = { enable = true, -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.