From 2bc37c16b359c590add6668403bf97dbeb432575 Mon Sep 17 00:00:00 2001 From: Lexi Sother Date: Thu, 9 Sep 2021 14:30:21 +0200 Subject: [PATCH 1/3] [nvim] Small init changes --- nvim/init.lua | 3 +-- nvim/init.vim | 3 +++ 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/nvim/init.lua b/nvim/init.lua index 7e2b12b..7127e8b 100644 --- a/nvim/init.lua +++ b/nvim/init.lua @@ -8,12 +8,11 @@ vim.g.loaded_airline = 1 -- \ } -- Enable the clearly superior mode. -vim.g.vim_ide = 1 vim.g.dotfiles_build_coc_from_source = 1 -- Small plugin configs vim.g.dashboard_default_executive ='fzf' -- Styling -vim.g.termguicolors = 1 +vim.o.termguicolors = true vim.g.airline_powerline_fonts = 1 diff --git a/nvim/init.vim b/nvim/init.vim index 34f1c63..42e8f56 100644 --- a/nvim/init.vim +++ b/nvim/init.vim @@ -1,5 +1,8 @@ let g:k_nvim_dotfiles_dir = expand(':p:h') let g:k_dotfiles_dir = expand(':p:h:h') let &runtimepath = g:k_nvim_dotfiles_dir.','.&runtimepath.','.g:k_nvim_dotfiles_dir.'/after' + +let g:vim_ide = 1 + source :p:h/../dmitmel-dotfiles/nvim/init.vim luafile :p:h/init.lua From 2f7a6eaf625042bfa029e7ad6ee79007e203e852 Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Fri, 10 Sep 2021 14:45:16 +0200 Subject: [PATCH 2/3] [nvim] Added Arduino board display to lualine --- nvim/plugin/lualine.lua | 10 ++++++++++ 1 file changed, 10 insertions(+) diff --git a/nvim/plugin/lualine.lua b/nvim/plugin/lualine.lua index 15d7588..f7290ee 100644 --- a/nvim/plugin/lualine.lua +++ b/nvim/plugin/lualine.lua @@ -19,6 +19,16 @@ dotfiles_gruv.command.a.bg = colors[16].gui dotfiles_gruv.command.c.bg = colors[2].gui dotfiles_gruv.command.c.fg = colors[7].gui +dotfiles_gruv.replace.a.bg = colors[9].gui +dotfiles_gruv.replace.c.bg = colors[2].gui + +-- Displays the currently selected Arduino board +local function showBoard() + if vim.g.arduino_board then + return '[' .. vim.g.arduino_board .. ']' + end +end + require('lualine').setup{ options = { theme = dotfiles_gruv From 7fb0e122db7818a94744bd3adb285e618cc7c8ce Mon Sep 17 00:00:00 2001 From: Alyxia Sother Date: Fri, 10 Sep 2021 17:12:41 +0200 Subject: [PATCH 3/3] [nvim] Use Dima's function for the lualine config --- dmitmel-dotfiles | 2 +- nvim/plugin/lualine.lua | 32 ++++++++++++++++++++------------ 2 files changed, 21 insertions(+), 13 deletions(-) diff --git a/dmitmel-dotfiles b/dmitmel-dotfiles index fbe9dab..bf96e55 160000 --- a/dmitmel-dotfiles +++ b/dmitmel-dotfiles @@ -1 +1 @@ -Subproject commit fbe9dab3e36f272c910143dd72bf4e8ae4c627df +Subproject commit bf96e553764e3a166286f5a6a8017e01dadcf6f9 diff --git a/nvim/plugin/lualine.lua b/nvim/plugin/lualine.lua index f7290ee..d281582 100644 --- a/nvim/plugin/lualine.lua +++ b/nvim/plugin/lualine.lua @@ -1,26 +1,34 @@ local dotfiles_gruv = require'lualine.themes.gruvbox' -local colors = vim.g.dotfiles_colorscheme_base16_colors +local theme = require'dotfiles.colorscheme' + +-- https://github.com/dmitmel/dotfiles/commit/bf96e553764e3a166286f5a6a8017e01dadcf6f9 +-- https://ptb.discord.com/channels/382339402338402315/382339402338402317/885864846892077086 +function get_color(index) + local color = theme.base16_colors[index] + local r, g, b = unpack(color, 1, 3) + return string.format('#%02x%02x%02x', r, g, b) +end -- Structure of themes is as follows: -- a: Outer components, such as `NORMAL` text and line counts -- b: secondary components, such git branch info -- c: Middle components, basically everything in the middle -dotfiles_gruv.normal.a.bg = colors[12].gui +dotfiles_gruv.normal.a.bg = get_color(12) -dotfiles_gruv.insert.a.bg = colors[14].gui -dotfiles_gruv.insert.c.bg = colors[2].gui +dotfiles_gruv.insert.a.bg = get_color(14) +dotfiles_gruv.insert.c.bg = get_color(2) -dotfiles_gruv.visual.a.bg = colors[15].gui -dotfiles_gruv.visual.c.bg = colors[2].gui -dotfiles_gruv.visual.c.fg = colors[7].gui +dotfiles_gruv.visual.a.bg = get_color(15) +dotfiles_gruv.visual.c.bg = get_color(2) +dotfiles_gruv.visual.c.fg = get_color(7) -dotfiles_gruv.command.a.bg = colors[16].gui -dotfiles_gruv.command.c.bg = colors[2].gui -dotfiles_gruv.command.c.fg = colors[7].gui +dotfiles_gruv.command.a.bg = get_color(16) +dotfiles_gruv.command.c.bg = get_color(2) +dotfiles_gruv.command.c.fg = get_color(7) -dotfiles_gruv.replace.a.bg = colors[9].gui -dotfiles_gruv.replace.c.bg = colors[2].gui +dotfiles_gruv.replace.a.bg = get_color(9) +dotfiles_gruv.replace.c.bg = get_color(2) -- Displays the currently selected Arduino board local function showBoard()