diff --git a/init.lua b/init.lua index 68e7808..5d4ab76 100644 --- a/init.lua +++ b/init.lua @@ -1,118 +1,118 @@ -- bootstrap lazy.nvim, LazyVim and your plugins -require("config.lazy") - --- init.lua -local lspconfig = require("lspconfig") - -if lspconfig and lspconfig.ruby_lsp and lspconfig.ruby_lsp.setup then - -- Setup Ruby Language Server - lspconfig.ruby_lsp.setup({ - cmd = { "ruby-lsp" }, - filetypes = { "ruby" }, - settings = { - ruby = { - diagnostics = true, - completion = true, - }, - }, - }) -end - -if lspconfig and lspconfig.solargraph and lspconfig.solargraph.setup then - -- Setup Solargraph - lspconfig.solargraph.setup({ - cmd = { "solargraph", "stdio" }, - filetypes = { "ruby" }, - settings = { - solargraph = { - diagnostics = true, - }, - }, - }) -end - -vim.api.nvim_create_autocmd("BufWritePre", { - pattern = "*", - callback = function() - vim.cmd("%s/\\s\\+$//e") - end, -}) - -vim.defer_fn(function() - local light_bg = "#394264" - local slightly_darker_bg = "#384160" - local dark_bg = "#222437" - - -- vim.api.nvim_set_hl(0, "Normal", { bg = light_bg }) - -- vim.api.nvim_set_hl(0, "NormalFloat", { bg = light_bg }) - -- vim.api.nvim_set_hl(0, "NormalNC", { bg = light_bg }) - -- -- vim.cmd([[highlight Comment guifg=#222436 guibg=#5c5e77 gui=italic]]) - -- - -- -- Set a vertical line at column 100 - -- vim.opt.colorcolumn = "100" - -- vim.api.nvim_set_hl(0, "ColorColumn", { bg = slightly_darker_bg }) -- Use the desired color - -- - -- vim.api.nvim_set_hl(0, "LineNr", { fg = dark_bg }) - -- - -- vim.opt.cursorline = true - -- vim.api.nvim_set_hl(0, "CursorLine", { bg = slightly_darker_bg }) - -- - -- -- Set the background color for DiagnosticSignError - -- vim.api.nvim_set_hl(0, "DiagnosticSignError", { bg = light_bg, fg = "#ff0000" }) -- Set your desired colors - -- - -- -- Set the background color for DiagnosticSignWarn - -- vim.api.nvim_set_hl(0, "DiagnosticSignWarn", { bg = light_bg, fg = "#ffaa00" }) -- Set your desired colors - -- - -- -- Set the background color for DiagnosticSignInfo - -- vim.api.nvim_set_hl(0, "DiagnosticSignInfo", { bg = light_bg, fg = "#00aaff" }) -- Set your desired colors - -- - -- -- Set the background color for DiagnosticSignHint - -- vim.api.nvim_set_hl(0, "DiagnosticSignHint", { bg = light_bg, fg = "#00ff00" }) -- Set your desired colors - - -- Define the new background color - -- local new_bg = light_bg - - -- Update the highlight groups that match the original background - -- local highlights = { - -- -- General UI elements - -- "Normal", - -- "NormalNC", - -- "CursorLine", - -- "CursorLineNr", - -- "ColorColumn", - -- "SignColumn", - -- "StatusLine", - -- "StatusLineNC", - -- "TabLine", - -- "TabLineFill", - -- "TabLineSel", - -- "VertSplit", - -- "WinSeparator", - -- - -- -- Editor elements - -- "LineNr", - -- "Folded", - -- "NonText", - -- "SpecialKey", - -- "EndOfBuffer", - -- "IncSearch", - -- "Search", - -- "Visual", - -- "VisualNOS", - -- - -- -- Diagnostics - -- "DiagnosticSignError", - -- "DiagnosticSignWarn", - -- "DiagnosticSignInfo", - -- "DiagnosticSignHint", - -- - -- -- Gutter elements (like Git signs) - -- "GitSignsAdd", - -- "GitSignsChange", - -- "GitSignsDelete", - -- } - -- - -- for _, group in ipairs(highlights) do - -- vim.api.nvim_set_hl(0, group, { bg = new_bg }) - -- end -end, 100) +-- require("config.lazy") +-- +-- -- init.lua +-- local lspconfig = require("lspconfig") +-- +-- if lspconfig and lspconfig.ruby_lsp and lspconfig.ruby_lsp.setup then +-- -- Setup Ruby Language Server +-- lspconfig.ruby_lsp.setup({ +-- cmd = { "ruby-lsp" }, +-- filetypes = { "ruby" }, +-- settings = { +-- ruby = { +-- diagnostics = true, +-- completion = true, +-- }, +-- }, +-- }) +-- end +-- +-- if lspconfig and lspconfig.solargraph and lspconfig.solargraph.setup then +-- -- Setup Solargraph +-- lspconfig.solargraph.setup({ +-- cmd = { "solargraph", "stdio" }, +-- filetypes = { "ruby" }, +-- settings = { +-- solargraph = { +-- diagnostics = true, +-- }, +-- }, +-- }) +-- end +-- +-- vim.api.nvim_create_autocmd("BufWritePre", { +-- pattern = "*", +-- callback = function() +-- vim.cmd("%s/\\s\\+$//e") +-- end, +-- }) +-- +-- vim.defer_fn(function() +-- local light_bg = "#394264" +-- local slightly_darker_bg = "#384160" +-- local dark_bg = "#222437" +-- +-- -- vim.api.nvim_set_hl(0, "Normal", { bg = light_bg }) +-- -- vim.api.nvim_set_hl(0, "NormalFloat", { bg = light_bg }) +-- -- vim.api.nvim_set_hl(0, "NormalNC", { bg = light_bg }) +-- -- -- vim.cmd([[highlight Comment guifg=#222436 guibg=#5c5e77 gui=italic]]) +-- -- +-- -- -- Set a vertical line at column 100 +-- -- vim.opt.colorcolumn = "100" +-- -- vim.api.nvim_set_hl(0, "ColorColumn", { bg = slightly_darker_bg }) -- Use the desired color +-- -- +-- -- vim.api.nvim_set_hl(0, "LineNr", { fg = dark_bg }) +-- -- +-- -- vim.opt.cursorline = true +-- -- vim.api.nvim_set_hl(0, "CursorLine", { bg = slightly_darker_bg }) +-- -- +-- -- -- Set the background color for DiagnosticSignError +-- -- vim.api.nvim_set_hl(0, "DiagnosticSignError", { bg = light_bg, fg = "#ff0000" }) -- Set your desired colors +-- -- +-- -- -- Set the background color for DiagnosticSignWarn +-- -- vim.api.nvim_set_hl(0, "DiagnosticSignWarn", { bg = light_bg, fg = "#ffaa00" }) -- Set your desired colors +-- -- +-- -- -- Set the background color for DiagnosticSignInfo +-- -- vim.api.nvim_set_hl(0, "DiagnosticSignInfo", { bg = light_bg, fg = "#00aaff" }) -- Set your desired colors +-- -- +-- -- -- Set the background color for DiagnosticSignHint +-- -- vim.api.nvim_set_hl(0, "DiagnosticSignHint", { bg = light_bg, fg = "#00ff00" }) -- Set your desired colors +-- +-- -- Define the new background color +-- -- local new_bg = light_bg +-- +-- -- Update the highlight groups that match the original background +-- -- local highlights = { +-- -- -- General UI elements +-- -- "Normal", +-- -- "NormalNC", +-- -- "CursorLine", +-- -- "CursorLineNr", +-- -- "ColorColumn", +-- -- "SignColumn", +-- -- "StatusLine", +-- -- "StatusLineNC", +-- -- "TabLine", +-- -- "TabLineFill", +-- -- "TabLineSel", +-- -- "VertSplit", +-- -- "WinSeparator", +-- -- +-- -- -- Editor elements +-- -- "LineNr", +-- -- "Folded", +-- -- "NonText", +-- -- "SpecialKey", +-- -- "EndOfBuffer", +-- -- "IncSearch", +-- -- "Search", +-- -- "Visual", +-- -- "VisualNOS", +-- -- +-- -- -- Diagnostics +-- -- "DiagnosticSignError", +-- -- "DiagnosticSignWarn", +-- -- "DiagnosticSignInfo", +-- -- "DiagnosticSignHint", +-- -- +-- -- -- Gutter elements (like Git signs) +-- -- "GitSignsAdd", +-- -- "GitSignsChange", +-- -- "GitSignsDelete", +-- -- } +-- -- +-- -- for _, group in ipairs(highlights) do +-- -- vim.api.nvim_set_hl(0, group, { bg = new_bg }) +-- -- end +-- end, 100) diff --git a/LICENSE b/old/LICENSE similarity index 100% rename from LICENSE rename to old/LICENSE diff --git a/README.md b/old/README.md similarity index 100% rename from README.md rename to old/README.md diff --git a/after/ftplugin/ruby.lua b/old/after/ftplugin/ruby.lua similarity index 100% rename from after/ftplugin/ruby.lua rename to old/after/ftplugin/ruby.lua diff --git a/ftplugin/eruby.lua b/old/ftplugin/eruby.lua similarity index 100% rename from ftplugin/eruby.lua rename to old/ftplugin/eruby.lua diff --git a/lazy-lock.json b/old/lazy-lock.json similarity index 100% rename from lazy-lock.json rename to old/lazy-lock.json diff --git a/lua/config/autocmds.lua b/old/lua/config/autocmds.lua similarity index 100% rename from lua/config/autocmds.lua rename to old/lua/config/autocmds.lua diff --git a/lua/config/keymaps.lua b/old/lua/config/keymaps.lua similarity index 100% rename from lua/config/keymaps.lua rename to old/lua/config/keymaps.lua diff --git a/lua/config/lazy.lua b/old/lua/config/lazy.lua similarity index 100% rename from lua/config/lazy.lua rename to old/lua/config/lazy.lua diff --git a/lua/config/options.lua b/old/lua/config/options.lua similarity index 100% rename from lua/config/options.lua rename to old/lua/config/options.lua diff --git a/lua/mj/alternate_file.lua b/old/lua/mj/alternate_file.lua similarity index 100% rename from lua/mj/alternate_file.lua rename to old/lua/mj/alternate_file.lua diff --git a/lua/mj/command_runner.lua b/old/lua/mj/command_runner.lua similarity index 100% rename from lua/mj/command_runner.lua rename to old/lua/mj/command_runner.lua diff --git a/lua/mj/globals.lua b/old/lua/mj/globals.lua similarity index 100% rename from lua/mj/globals.lua rename to old/lua/mj/globals.lua diff --git a/lua/mj/ruby_utils.lua b/old/lua/mj/ruby_utils.lua similarity index 100% rename from lua/mj/ruby_utils.lua rename to old/lua/mj/ruby_utils.lua diff --git a/lua/mj/telescope/grep_with_args.lua b/old/lua/mj/telescope/grep_with_args.lua similarity index 100% rename from lua/mj/telescope/grep_with_args.lua rename to old/lua/mj/telescope/grep_with_args.lua diff --git a/lua/mj/test_runner.lua b/old/lua/mj/test_runner.lua similarity index 100% rename from lua/mj/test_runner.lua rename to old/lua/mj/test_runner.lua diff --git a/lua/mj/utils.lua b/old/lua/mj/utils.lua similarity index 100% rename from lua/mj/utils.lua rename to old/lua/mj/utils.lua diff --git a/lua/plugins/ag.lua b/old/lua/plugins/ag.lua similarity index 100% rename from lua/plugins/ag.lua rename to old/lua/plugins/ag.lua diff --git a/lua/plugins/avante.lua b/old/lua/plugins/avante.lua similarity index 100% rename from lua/plugins/avante.lua rename to old/lua/plugins/avante.lua diff --git a/lua/plugins/dashboard.lua b/old/lua/plugins/dashboard.lua similarity index 100% rename from lua/plugins/dashboard.lua rename to old/lua/plugins/dashboard.lua diff --git a/lua/plugins/disabled-plugins.lua b/old/lua/plugins/disabled-plugins.lua similarity index 100% rename from lua/plugins/disabled-plugins.lua rename to old/lua/plugins/disabled-plugins.lua diff --git a/lua/plugins/disabled.lua b/old/lua/plugins/disabled.lua similarity index 100% rename from lua/plugins/disabled.lua rename to old/lua/plugins/disabled.lua diff --git a/lua/plugins/easy-motion.lua b/old/lua/plugins/easy-motion.lua similarity index 100% rename from lua/plugins/easy-motion.lua rename to old/lua/plugins/easy-motion.lua diff --git a/lua/plugins/emmet.lua b/old/lua/plugins/emmet.lua similarity index 100% rename from lua/plugins/emmet.lua rename to old/lua/plugins/emmet.lua diff --git a/lua/plugins/eunuch.lua b/old/lua/plugins/eunuch.lua similarity index 100% rename from lua/plugins/eunuch.lua rename to old/lua/plugins/eunuch.lua diff --git a/lua/plugins/example.lua b/old/lua/plugins/example.lua similarity index 100% rename from lua/plugins/example.lua rename to old/lua/plugins/example.lua diff --git a/lua/plugins/fugitive.lua b/old/lua/plugins/fugitive.lua similarity index 100% rename from lua/plugins/fugitive.lua rename to old/lua/plugins/fugitive.lua diff --git a/lua/plugins/fzf-lua.lua b/old/lua/plugins/fzf-lua.lua similarity index 100% rename from lua/plugins/fzf-lua.lua rename to old/lua/plugins/fzf-lua.lua diff --git a/lua/plugins/gist.lua b/old/lua/plugins/gist.lua similarity index 100% rename from lua/plugins/gist.lua rename to old/lua/plugins/gist.lua diff --git a/lua/plugins/gitsigns.lua b/old/lua/plugins/gitsigns.lua similarity index 100% rename from lua/plugins/gitsigns.lua rename to old/lua/plugins/gitsigns.lua diff --git a/lua/plugins/harpoon.lua b/old/lua/plugins/harpoon.lua similarity index 100% rename from lua/plugins/harpoon.lua rename to old/lua/plugins/harpoon.lua diff --git a/lua/plugins/lazyvim.lua b/old/lua/plugins/lazyvim.lua similarity index 100% rename from lua/plugins/lazyvim.lua rename to old/lua/plugins/lazyvim.lua diff --git a/lua/plugins/lsp.lua b/old/lua/plugins/lsp.lua similarity index 100% rename from lua/plugins/lsp.lua rename to old/lua/plugins/lsp.lua diff --git a/lua/plugins/lualine.lua b/old/lua/plugins/lualine.lua similarity index 100% rename from lua/plugins/lualine.lua rename to old/lua/plugins/lualine.lua diff --git a/lua/plugins/luasnip.lua b/old/lua/plugins/luasnip.lua similarity index 100% rename from lua/plugins/luasnip.lua rename to old/lua/plugins/luasnip.lua diff --git a/lua/plugins/noice.lua b/old/lua/plugins/noice.lua similarity index 100% rename from lua/plugins/noice.lua rename to old/lua/plugins/noice.lua diff --git a/lua/plugins/notify.lua b/old/lua/plugins/notify.lua similarity index 100% rename from lua/plugins/notify.lua rename to old/lua/plugins/notify.lua diff --git a/lua/plugins/null-ls.lua b/old/lua/plugins/null-ls.lua similarity index 100% rename from lua/plugins/null-ls.lua rename to old/lua/plugins/null-ls.lua diff --git a/lua/plugins/open-browser-github.lua b/old/lua/plugins/open-browser-github.lua similarity index 100% rename from lua/plugins/open-browser-github.lua rename to old/lua/plugins/open-browser-github.lua diff --git a/lua/plugins/project.lua b/old/lua/plugins/project.lua similarity index 100% rename from lua/plugins/project.lua rename to old/lua/plugins/project.lua diff --git a/lua/plugins/repeat.lua b/old/lua/plugins/repeat.lua similarity index 100% rename from lua/plugins/repeat.lua rename to old/lua/plugins/repeat.lua diff --git a/lua/plugins/slacks.lua b/old/lua/plugins/slacks.lua similarity index 100% rename from lua/plugins/slacks.lua rename to old/lua/plugins/slacks.lua diff --git a/lua/plugins/snacks.lua b/old/lua/plugins/snacks.lua similarity index 100% rename from lua/plugins/snacks.lua rename to old/lua/plugins/snacks.lua diff --git a/lua/plugins/surround.lua b/old/lua/plugins/surround.lua similarity index 100% rename from lua/plugins/surround.lua rename to old/lua/plugins/surround.lua diff --git a/lua/plugins/tabularize.lua b/old/lua/plugins/tabularize.lua similarity index 100% rename from lua/plugins/tabularize.lua rename to old/lua/plugins/tabularize.lua diff --git a/lua/plugins/telescope.lua b/old/lua/plugins/telescope.lua similarity index 100% rename from lua/plugins/telescope.lua rename to old/lua/plugins/telescope.lua diff --git a/lua/plugins/textobj-rubyblock.lua b/old/lua/plugins/textobj-rubyblock.lua similarity index 100% rename from lua/plugins/textobj-rubyblock.lua rename to old/lua/plugins/textobj-rubyblock.lua diff --git a/lua/plugins/treesitter-context.lua b/old/lua/plugins/treesitter-context.lua similarity index 100% rename from lua/plugins/treesitter-context.lua rename to old/lua/plugins/treesitter-context.lua diff --git a/lua/plugins/trevj.lua b/old/lua/plugins/trevj.lua similarity index 100% rename from lua/plugins/trevj.lua rename to old/lua/plugins/trevj.lua diff --git a/lua/plugins/zen_mode.lua b/old/lua/plugins/zen_mode.lua similarity index 100% rename from lua/plugins/zen_mode.lua rename to old/lua/plugins/zen_mode.lua diff --git a/lua/snippets/eruby.lua b/old/lua/snippets/eruby.lua similarity index 100% rename from lua/snippets/eruby.lua rename to old/lua/snippets/eruby.lua diff --git a/lua/snippets/ruby.lua b/old/lua/snippets/ruby.lua similarity index 100% rename from lua/snippets/ruby.lua rename to old/lua/snippets/ruby.lua diff --git a/stylua.toml b/old/stylua.toml similarity index 100% rename from stylua.toml rename to old/stylua.toml