From 0ab4d2653dddebb375b7229d89b00fb97ec8965b Mon Sep 17 00:00:00 2001 From: RiverMatsumoto Date: Thu, 7 Mar 2024 00:33:59 -1000 Subject: [PATCH] custom plugin fixes --- init.lua | 7 +- lua/custom/plugins/gruvbox-material.lua | 134 ------------------------ 2 files changed, 4 insertions(+), 137 deletions(-) delete mode 100644 lua/custom/plugins/gruvbox-material.lua diff --git a/init.lua b/init.lua index c69576b0..1dbcd001 100644 --- a/init.lua +++ b/init.lua @@ -532,9 +532,9 @@ require('lazy').setup { -- - settings (table): Override the default settings passed when initializing the server. -- For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/ local servers = { - -- clangd = {}, + clangd = {}, -- gopls = {}, - -- pyright = {}, + pyright = {}, -- rust_analyzer = {}, -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs -- @@ -815,10 +815,11 @@ require('lazy').setup { -- -- Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going. -- For additional information, see `:help lazy.nvim-lazy.nvim-structuring-your-plugins` - -- { import = 'custom.plugins' }, + { import = 'custom.plugins' }, } -- The line beneath this is called `modeline`. See `:help modeline` -- vim: ts=2 sts=2 sw=2 et vim.api.nvim_set_keymap('n', '', 'lua require("Comment.api").toggle.linewise.current()', { noremap = true, silent = true }) vim.api.nvim_set_keymap('x', '', 'lua require("Comment.api").toggle.linewise(vim.fn.visualmode())', { noremap = true, silent = true }) +vim.api.nvim_set_keymap('i', '', '', { noremap = true }) diff --git a/lua/custom/plugins/gruvbox-material.lua b/lua/custom/plugins/gruvbox-material.lua deleted file mode 100644 index 9ba37afb..00000000 --- a/lua/custom/plugins/gruvbox-material.lua +++ /dev/null @@ -1,134 +0,0 @@ --- ============================================================================= --- URL: https://github.com/sainnhe/gruvbox-material --- Filename: lua/lualine/themes/gruvbox-material.lua --- Author: sainnhe --- Email: i@sainnhe.dev --- License: MIT License --- ============================================================================= - -local configuration = vim.fn['gruvbox_material#get_configuration']() -local palette = vim.fn['gruvbox_material#get_palette'](configuration.background, configuration.foreground, configuration.colors_override) - -if configuration.transparent_background == 2 then - palette.bg_statusline1 = palette.none - palette.bg_statusline2 = palette.none -end - -local theme -if configuration.statusline_style == 'default' then - theme = { - normal = { - a = {bg = palette.grey2[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline1[1], fg = palette.fg1[1]} - }, - insert = { - a = {bg = palette.bg_green[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline1[1], fg = palette.fg1[1]} - }, - visual = { - a = {bg = palette.bg_red[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline1[1], fg = palette.fg1[1]} - }, - replace = { - a = {bg = palette.bg_yellow[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline1[1], fg = palette.fg1[1]} - }, - command = { - a = {bg = palette.blue[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline1[1], fg = palette.fg1[1]} - }, - terminal = { - a = {bg = palette.purple[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline1[1], fg = palette.fg1[1]} - }, - inactive = { - a = {bg = palette.bg_statusline1[1], fg = palette.grey2[1]}, - b = {bg = palette.bg_statusline1[1], fg = palette.grey2[1]}, - c = {bg = palette.bg_statusline1[1], fg = palette.grey2[1]} - } - } -elseif configuration.statusline_style == 'mix' then - theme = { - normal = { - a = {bg = palette.grey2[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.grey2[1]}, - c = {bg = palette.bg_statusline2[1], fg = palette.grey2[1]} - }, - insert = { - a = {bg = palette.bg_green[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline2[1], fg = palette.fg1[1]} - }, - visual = { - a = {bg = palette.bg_red[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline2[1], fg = palette.fg1[1]} - }, - replace = { - a = {bg = palette.bg_yellow[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline2[1], fg = palette.fg1[1]} - }, - command = { - a = {bg = palette.blue[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline2[1], fg = palette.fg1[1]} - }, - terminal = { - a = {bg = palette.purple[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline2[1], fg = palette.fg1[1]} - }, - inactive = { - a = {bg = palette.bg_statusline2[1], fg = palette.grey2[1]}, - b = {bg = palette.bg_statusline2[1], fg = palette.grey2[1]}, - c = {bg = palette.bg_statusline2[1], fg = palette.grey2[1]} - } - } -else - theme = { - normal = { - a = {bg = palette.grey2[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.grey2[1]}, - c = {bg = palette.bg_statusline2[1], fg = palette.grey2[1]} - }, - insert = { - a = {bg = palette.blue[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]} - }, - visual = { - a = {bg = palette.orange[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.grey0[1], fg = palette.bg0[1]} - }, - replace = { - a = {bg = palette.aqua[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]} - }, - command = { - a = {bg = palette.green[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]} - }, - terminal = { - a = {bg = palette.purple[1], fg = palette.bg0[1], gui = 'bold'}, - b = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]}, - c = {bg = palette.bg_statusline3[1], fg = palette.fg1[1]} - }, - inactive = { - a = {bg = palette.bg_statusline2[1], fg = palette.grey2[1]}, - b = {bg = palette.bg_statusline2[1], fg = palette.grey2[1]}, - c = {bg = palette.bg_statusline2[1], fg = palette.grey2[1]} - } - } -end - -return theme