diff options
Diffstat (limited to 'nix/programs/neovim')
| -rw-r--r-- | nix/programs/neovim/default.nix | 68 |
1 files changed, 39 insertions, 29 deletions
diff --git a/nix/programs/neovim/default.nix b/nix/programs/neovim/default.nix index 0eaccd3..a88b9d7 100644 --- a/nix/programs/neovim/default.nix +++ b/nix/programs/neovim/default.nix @@ -203,7 +203,7 @@ with lib; ''; plugins = with pkgs.vimPlugins; [ - # Deoendencies + # Dependencies vim-devicons nvim-web-devicons plenary-nvim @@ -217,36 +217,43 @@ with lib; local colorscheme = require('base16-colorscheme') colorscheme.setup({ - base00 = '#${config.theme.colors.base00}', - base01 = '#${config.theme.colors.base01}', - base02 = '#${config.theme.colors.base02}', - base03 = '#${config.theme.colors.base03}', - base04 = '#${config.theme.colors.base04}', - base05 = '#${config.theme.colors.base05}', - base06 = '#${config.theme.colors.base06}', - base07 = '#${config.theme.colors.base07}', - base08 = '#${config.theme.colors.base08}', - base09 = '#${config.theme.colors.base09}', - base0A = '#${config.theme.colors.base0A}', - base0B = '#${config.theme.colors.base0B}', - base0C = '#${config.theme.colors.base0C}', - base0D = '#${config.theme.colors.base0D}', - base0E = '#${config.theme.colors.base0E}', - base0F = '#${config.theme.colors.base0F}', + base00 = '#${config.theme.colors.bg}', + base01 = '#${config.theme.colors.surface.bg}', + base02 = '#${config.theme.colors.surface.bg}', + base03 = '#${config.theme.colors.bright.white}', + base04 = '#${config.theme.colors.bright.black}', + base05 = '#${config.theme.colors.fg}', + base06 = '#${config.theme.colors.bright.white}', + base07 = '#${config.theme.colors.hover.bg}', + base08 = '#${config.theme.colors.bright.red}', + base09 = '#${config.theme.colors.bright.yellow}', + base0A = '#${config.theme.colors.bright.yellow}', + base0B = '#${config.theme.colors.bright.green}', + base0C = '#${config.theme.colors.bright.cyan}', + base0D = '#${config.theme.colors.bright.blue}', + base0E = '#${config.theme.colors.bright.magenta}', + base0F = '#${config.theme.colors.normal.yellow}', }) -- make transparent background - vim.api.nvim_set_hl(0, "Normal", { bg = "none" }) - vim.api.nvim_set_hl(0, "NormalFloat", { bg = "none" }) - vim.api.nvim_set_hl(0, 'EndOfBuffer', { bg = "none" }) + local colors = { + -- Text + "Normal", "NormalNC", "NormalFloat", + -- Line Numbers + "LineNr", "EndOfBuffer", "SignColumn", + -- Floating + "FloatBorder", + -- Mode/Buffer Lines + "TabLine", "TabLineFill", "StatusLine", + }; + for _,color in pairs(colors) do + vim.api.nvim_set_hl(0, color, { bg = "none" }); + end -- identifiers should not be colored - vim.api.nvim_set_hl(0, "Identifier", { fg = "#${config.theme.colors.base05}" }) - vim.api.nvim_set_hl(0, "TSVariable", { fg = "#${config.theme.colors.base05}" }) + vim.api.nvim_set_hl(0, "Identifier", { fg = "#${config.theme.colors.fg}" }) + vim.api.nvim_set_hl(0, "TSVariable", { fg = "#${config.theme.colors.fg}" }) -- macro should be colored as a keyword - vim.api.nvim_set_hl(0, "TSFuncMacro", { fg = "#${config.theme.colors.base0E}" }) - -- comments are too dark - vim.api.nvim_set_hl(0, "Comment", { fg = "#${config.theme.colors.base07}" }) - vim.api.nvim_set_hl(0, "@comment", { link = "Comment" }) + vim.api.nvim_set_hl(0, "TSFuncMacro", { fg = "#${config.theme.colors.bright.magenta}" }) ''; } # Mode line @@ -254,9 +261,12 @@ with lib; plugin = lualine-nvim; type = "lua"; config = '' + local lualine_theme = require('lualine.themes.base16') + lualine_theme.normal.c = { fg = "#${config.theme.colors.fg}" } + require('lualine').setup { options = { - theme = 'base16', + theme = lualine_theme, icons_enabled = true, globalstatus = true, }, @@ -292,8 +302,8 @@ with lib; open_win_config = { relative = "editor", border = "rounded", - width = 60, - height = 20, + width = 80, + height = 30, row = 1, col = 1, }, |