add all highlights in one file

This commit is contained in:
siduck76 2021-05-11 08:02:03 +05:30
parent 339b31d87c
commit 7bd57b7e93
7 changed files with 64 additions and 68 deletions

View File

@ -9,7 +9,7 @@ require "statusline"
require("colorizer").setup() require("colorizer").setup()
require("neoscroll").setup() -- smooth scroll require("neoscroll").setup() -- smooth scroll
-- lsp -- lsp stuff
require "nvim-lspconfig" require "nvim-lspconfig"
require "compe-completion" require "compe-completion"
@ -20,12 +20,13 @@ g.mapleader = " "
g.auto_save = 0 g.auto_save = 0
-- colorscheme related stuff -- colorscheme related stuff
cmd "syntax on" cmd "syntax on"
local base16 = require "base16" local base16 = require "base16"
base16(base16.themes["onedark"], true) base16(base16.themes["onedark"], true)
require "custom_highlights"
-- blankline -- blankline
local indent = 2 local indent = 2
@ -33,8 +34,6 @@ local indent = 2
g.indentLine_enabled = 1 g.indentLine_enabled = 1
g.indent_blankline_char = "" g.indent_blankline_char = ""
cmd "hi IndentBlanklineChar guifg=#2a2e36"
g.indent_blankline_filetype_exclude = {"help", "terminal"} g.indent_blankline_filetype_exclude = {"help", "terminal"}
g.indent_blankline_buftype_exclude = {"terminal"} g.indent_blankline_buftype_exclude = {"terminal"}
@ -44,15 +43,6 @@ g.indent_blankline_show_first_indent_level = false
require "treesitter-nvim" require "treesitter-nvim"
require "mappings" require "mappings"
-- highlights --
cmd "hi LineNr guifg=#42464e"
cmd "hi Comment guifg=#42464e"
cmd "hi VertSplit guifg=#2a2e36"
cmd "hi EndOfBuffer guifg=#1e222a"
cmd "hi PmenuSel guibg=#98c379"
cmd "hi Pmenu guibg=#282c34"
require "telescope-nvim" require "telescope-nvim"
require "nvimTree" require "nvimTree"
@ -66,11 +56,5 @@ vim.api.nvim_exec([[
au BufEnter term://* setlocal nonumber au BufEnter term://* setlocal nonumber
]], false) ]], false)
-- inactive statuslines as thin splitlines
cmd("highlight! StatusLineNC gui=underline guifg=#383c44")
cmd "hi clear CursorLine"
cmd "hi cursorlinenr guifg=#abb2bf"
-- setup for TrueZen.nvim -- setup for TrueZen.nvim
require "zenmode" require "zenmode"

59
lua/custom_highlights.lua Normal file
View File

@ -0,0 +1,59 @@
local cmd = vim.cmd
-- blankline
cmd "hi IndentBlanklineChar guifg=#383c44"
-- misc --
cmd "hi LineNr guifg=#42464e"
cmd "hi Comment guifg=#42464e"
cmd "hi NvimInternalError guifg=#f9929b"
cmd "hi VertSplit guifg=#2a2e36"
cmd "hi EndOfBuffer guifg=#1e222a"
-- Pmenu
cmd "hi PmenuSel guibg=#98c379"
cmd "hi Pmenu guibg=#282c34"
cmd "hi PmenuSbar guibg =#353b45"
cmd "hi PmenuThumb guibg =#81A1C1"
-- inactive statuslines as thin splitlines
cmd("highlight! StatusLineNC gui=underline guifg=#383c44")
-- line n.o
cmd "hi clear CursorLine"
cmd "hi cursorlinenr guifg=#abb2bf"
-- git signs ---
cmd "hi DiffAdd guifg=#81A1C1 guibg = none"
cmd "hi DiffChange guifg =#3A3E44 guibg = none"
cmd "hi DiffModified guifg = #81A1C1 guibg = none"
-- NvimTree
cmd "hi NvimTreeFolderIcon guifg = #61afef"
cmd "hi NvimTreeFolderName guifg = #61afef"
cmd "hi NvimTreeIndentMarker guifg=#383c44"
cmd "hi NvimTreeNormal guibg=#1b1f27"
cmd "hi NvimTreeVertSplit guifg=#1e222a"
cmd "hi NvimTreeRootFolder guifg=#f9929b"
-- telescope
cmd "hi TelescopeBorder guifg=#2a2e36"
cmd "hi TelescopePromptBorder guifg=#2a2e36"
cmd "hi TelescopeResultsBorder guifg=#2a2e36"
cmd "hi TelescopePreviewBorder guifg=#525865"
-- LspDiagnostics ---
-- error / warnings
cmd "hi LspDiagnosticsSignError guifg=#f9929b"
cmd "hi LspDiagnosticsVirtualTextError guifg=#BF616A"
cmd "hi LspDiagnosticsSignWarning guifg=#EBCB8B"
cmd "hi LspDiagnosticsVirtualTextWarning guifg=#EBCB8B"
-- info
cmd "hi LspDiagnosticsSignInformation guifg=#A3BE8C"
cmd "hi LspDiagnosticsVirtualTextInformation guifg=#A3BE8C"
-- hint
cmd "hi LspDiagnosticsSignHint guifg=#b6bdca"
cmd "hi LspDiagnosticsVirtualTextHint guifg=#b6bdca"

View File

@ -25,9 +25,3 @@ require("gitsigns").setup {
sign_priority = 5, sign_priority = 5,
status_formatter = nil -- Use default status_formatter = nil -- Use default
} }
local cmd = vim.cmd
cmd "hi DiffAdd guifg=#81A1C1 guibg = none"
cmd "hi DiffChange guifg =#3A3E44 guibg = none"
cmd "hi DiffModified guifg = #81A1C1 guibg = none"

View File

@ -44,7 +44,7 @@ for k, lang in pairs(servers) do
} }
end end
-- remove the lsp servers with their configs you don want -- vls example
local vls_binary = '/usr/local/bin/vls' local vls_binary = '/usr/local/bin/vls'
require'lspconfig'.vls.setup { require'lspconfig'.vls.setup {
cmd = {vls_binary}, cmd = {vls_binary},
@ -88,19 +88,3 @@ vim.fn.sign_define("LspDiagnosticsSignError", {text = "", numhl = "LspDiagnos
vim.fn.sign_define("LspDiagnosticsSignWarning", {text = "", numhl = "LspDiagnosticsDefaultWarning"}) vim.fn.sign_define("LspDiagnosticsSignWarning", {text = "", numhl = "LspDiagnosticsDefaultWarning"})
vim.fn.sign_define("LspDiagnosticsSignInformation", {text = "", numhl = "LspDiagnosticsDefaultInformation"}) vim.fn.sign_define("LspDiagnosticsSignInformation", {text = "", numhl = "LspDiagnosticsDefaultInformation"})
vim.fn.sign_define("LspDiagnosticsSignHint", {text = "", numhl = "LspDiagnosticsDefaultHint"}) vim.fn.sign_define("LspDiagnosticsSignHint", {text = "", numhl = "LspDiagnosticsDefaultHint"})
-- diagnostics highlights
local cmd = vim.cmd
cmd "hi LspDiagnosticsSignError guifg=#f9929b"
cmd "hi LspDiagnosticsVirtualTextError guifg=#BF616A"
cmd "hi LspDiagnosticsSignWarning guifg=#EBCB8B"
cmd "hi LspDiagnosticsVirtualTextWarning guifg=#EBCB8B"
cmd "hi LspDiagnosticsSignInformation guifg=#A3BE8C"
cmd "hi LspDiagnosticsVirtualTextInformation guifg=#A3BE8C"
cmd "hi LspDiagnosticsSignHint guifg=#b6bdca"
cmd "hi LspDiagnosticsVirtualTextHint guifg=#b6bdca"

View File

@ -1,5 +1,3 @@
local cmd = vim.cmd
local g = vim.g local g = vim.g
vim.o.termguicolors = true vim.o.termguicolors = true
@ -84,10 +82,3 @@ g.nvim_tree_bindings = {
["-"] = get_lua_cb("dir_up"), ["-"] = get_lua_cb("dir_up"),
["q"] = get_lua_cb("close") ["q"] = get_lua_cb("close")
} }
cmd "hi NvimTreeFolderIcon guifg = #61afef"
cmd "hi NvimTreeFolderName guifg = #61afef"
cmd "hi NvimTreeIndentMarker guifg=#383c44"
cmd "hi NvimTreeNormal guibg=#1b1f27"
cmd "hi NvimTreeVertSplit guifg=#1e222a"
cmd "hi NvimTreeRootFolder guifg=#f9929b"

View File

@ -7,15 +7,8 @@ local colors = {
bg = "#1e222a", bg = "#1e222a",
line_bg = "#1e222a", line_bg = "#1e222a",
fg = "#D8DEE9", fg = "#D8DEE9",
fg_green = "#65a380",
yellow = "#A3BE8C",
cyan = "#22262C",
darkblue = "#61afef",
green = "#BBE67E", green = "#BBE67E",
orange = "#FF8800", orange = "#FF8800",
purple = "#252930",
magenta = "#c678dd",
blue = "#22262C",
red = "#DF8890", red = "#DF8890",
lightbg = "#282c34", lightbg = "#282c34",
nord = "#81A1C1", nord = "#81A1C1",
@ -135,7 +128,7 @@ gls.left[12] = {
DiagnosticWarn = { DiagnosticWarn = {
provider = "DiagnosticWarn", provider = "DiagnosticWarn",
icon = "", icon = "",
highlight = {colors.blue, colors.bg} highlight = {colors.red, colors.bg}
} }
} }

View File

@ -73,12 +73,3 @@ vim.api.nvim_set_keymap("n", "<Leader>fb", [[<Cmd>lua require('telescope.builtin
vim.api.nvim_set_keymap("n", "<Leader>fh", [[<Cmd>lua require('telescope.builtin').help_tags()<CR>]], opt) vim.api.nvim_set_keymap("n", "<Leader>fh", [[<Cmd>lua require('telescope.builtin').help_tags()<CR>]], opt)
vim.api.nvim_set_keymap("n", "<Leader>fo", [[<Cmd>lua require('telescope.builtin').oldfiles()<CR>]], opt) vim.api.nvim_set_keymap("n", "<Leader>fo", [[<Cmd>lua require('telescope.builtin').oldfiles()<CR>]], opt)
vim.api.nvim_set_keymap("n", "<Leader>fm", [[<Cmd> Neoformat<CR>]], opt) vim.api.nvim_set_keymap("n", "<Leader>fm", [[<Cmd> Neoformat<CR>]], opt)
-- highlights
local cmd = vim.cmd
cmd "hi TelescopeBorder guifg=#2a2e36"
cmd "hi TelescopePromptBorder guifg=#2a2e36"
cmd "hi TelescopeResultsBorder guifg=#2a2e36"
cmd "hi TelescopePreviewBorder guifg=#525865"