From 4165338ac45920c12e25b370a0e8115b5c607a72 Mon Sep 17 00:00:00 2001 From: RiverMatsumoto Date: Sun, 3 Mar 2024 23:35:06 -1000 Subject: [PATCH 1/2] nvim config --- init.lua | 5 +- lua/custom/plugins/gruvbox-material.lua | 134 ++++++++++++++++++++++++ 2 files changed, 138 insertions(+), 1 deletion(-) create mode 100644 lua/custom/plugins/gruvbox-material.lua diff --git a/init.lua b/init.lua index 292ec077..c69576b0 100644 --- a/init.lua +++ b/init.lua @@ -233,6 +233,7 @@ require('lazy').setup { -- "gc" to comment visual regions/lines { 'numToStr/Comment.nvim', opts = {} }, + 'sainnhe/gruvbox-material', -- Here is a more advanced example where we pass configuration -- options to `gitsigns.nvim`. This is equivalent to the following lua: @@ -726,7 +727,7 @@ require('lazy').setup { priority = 1000, -- make sure to load this before all the other start plugins config = function() -- Load the colorscheme here - vim.cmd.colorscheme 'tokyonight-night' + vim.cmd.colorscheme 'gruvbox-material' -- You can configure highlights by doing something like vim.cmd.hi 'Comment gui=none' @@ -819,3 +820,5 @@ require('lazy').setup { -- 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 }) diff --git a/lua/custom/plugins/gruvbox-material.lua b/lua/custom/plugins/gruvbox-material.lua new file mode 100644 index 00000000..9ba37afb --- /dev/null +++ b/lua/custom/plugins/gruvbox-material.lua @@ -0,0 +1,134 @@ +-- ============================================================================= +-- 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 From afed39f595301147188dac2c5453bce8515d5325 Mon Sep 17 00:00:00 2001 From: RiverMatsumoto <66350813+RiverMatsumoto@users.noreply.github.com> Date: Sun, 3 Mar 2024 23:36:26 -1000 Subject: [PATCH 2/2] Update README.md --- README.md | 3 +++ 1 file changed, 3 insertions(+) diff --git a/README.md b/README.md index b6d19f49..399f580d 100644 --- a/README.md +++ b/README.md @@ -1,5 +1,8 @@ # kickstart.nvim +# install: +`https://github.com/RiverMatsumoto/kickstart.nvim.git` + ## Introduction A starting point for Neovim that is: