From 6cd9ee30a537334c0cfa3b16009a1976bdeed8c0 Mon Sep 17 00:00:00 2001 From: Nikita Bykov Date: Fri, 23 May 2025 23:54:13 +0500 Subject: [PATCH] move neovim modules init order --- .config/nvim/init.lua | 7 +++---- .config/nvim/lua/user/dap/dap.lua | 2 -- .config/nvim/lua/user/lsp/init.lua | 2 +- .config/nvim/lua/user/{ => lsp}/none_ls.lua | 2 +- .config/nvim/lua/user/options.lua | 3 +++ 5 files changed, 8 insertions(+), 8 deletions(-) rename .config/nvim/lua/user/{ => lsp}/none_ls.lua (96%) diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua index a62e257..dbcb0df 100644 --- a/.config/nvim/init.lua +++ b/.config/nvim/init.lua @@ -3,18 +3,18 @@ require("user.plugins") require("user.themes.kanagawa") vim.cmd("colorscheme kanagawa") -require("user.bufferline") require("user.options") require("user.keymaps") require("user.cmp") -require("user.nvim_navic") require("user.lsp") +require("user.lsp_format") +require("user.nvim_navic") require("user.treesitter") +require("user.bufferline") require("user.blank_indent_highlight") require("user.autopairs") require("user.telescope") -require("user.lsp_format") -- require("user.neoscroll") require("user.dropbar") require("user.nvim_scrollbar") @@ -27,4 +27,3 @@ require("user.oil") require("user.which_key") require("user.harpoon") -vim.cmd("set cursorline") diff --git a/.config/nvim/lua/user/dap/dap.lua b/.config/nvim/lua/user/dap/dap.lua index e0e0977..ca9f1a7 100644 --- a/.config/nvim/lua/user/dap/dap.lua +++ b/.config/nvim/lua/user/dap/dap.lua @@ -1,12 +1,10 @@ local dap_status_ok, dap = pcall(require, "dap") if not dap_status_ok then - print("aaaaa") return end local dapui_status_ok, dapui = pcall(require, "dapui") if not dapui_status_ok then - print("fasdfasdfasdfasdf") return end diff --git a/.config/nvim/lua/user/lsp/init.lua b/.config/nvim/lua/user/lsp/init.lua index 8d74821..087b1b2 100644 --- a/.config/nvim/lua/user/lsp/init.lua +++ b/.config/nvim/lua/user/lsp/init.lua @@ -7,6 +7,6 @@ mason.setup() require("user.lsp.mason_lsp_config") require("user.lsp.diagnostics_config").setup() --- require("user.none_ls") -- TODO: For now only uses python isort, uncomment when new stuff will be used +-- require("user.lsp.none_ls") vim.cmd([[ command! Format execute 'lua vim.lsp.buf.format{async=true}' ]]) diff --git a/.config/nvim/lua/user/none_ls.lua b/.config/nvim/lua/user/lsp/none_ls.lua similarity index 96% rename from .config/nvim/lua/user/none_ls.lua rename to .config/nvim/lua/user/lsp/none_ls.lua index b539743..b6e4ba5 100644 --- a/.config/nvim/lua/user/none_ls.lua +++ b/.config/nvim/lua/user/lsp/none_ls.lua @@ -18,7 +18,7 @@ null_ls.setup({ sources = { -- formatting.prettier.with({ extra_args = { "--no-semi", "--single-quote", "--jsx-single-quote" } }), -- formatting.black.with({ extra_args = { "--fast" } }), - formatting.isort, + -- formatting.isort, formatting.stylua, -- diagnostics.mypy, }, diff --git a/.config/nvim/lua/user/options.lua b/.config/nvim/lua/user/options.lua index 8581392..154c531 100644 --- a/.config/nvim/lua/user/options.lua +++ b/.config/nvim/lua/user/options.lua @@ -36,3 +36,6 @@ vim.api.nvim_create_autocmd("FileType", { vim.cmd "au VimEnter * silent! !xmodmap -e 'clear Lock' -e 'keycode 0x42 = Escape'" vim.cmd "au VimLeave * silent! !xmodmap -e 'clear Lock' -e 'keycode 0x42 = Caps_Lock'" vim.cmd [[autocmd BufWritePre lua vim.lsp.buf.format()]] + + +vim.cmd "set cursorline"