mirror of
https://github.com/LunarVim/LunarVim.git
synced 2025-08-05 10:35:03 +02:00
Merge branch 'rolling' of github.com:ChristianChiarulli/LunarVim into rolling
This commit is contained in:
christianchiarulli
commit
7252ba7a31
16 changed files with 360 additions and 357 deletions
44
.github/workflows/install.yaml
vendored
44
.github/workflows/install.yaml
vendored
|
|
@ -14,8 +14,8 @@ jobs:
|
|||
fail-fast: false
|
||||
matrix:
|
||||
include:
|
||||
- runner: ubuntu-20.04
|
||||
os: linux
|
||||
# - runner: ubuntu-20.04
|
||||
# os: linux
|
||||
- runner: macos-10.15
|
||||
os: osx
|
||||
runs-on: ${{ matrix.runner }}
|
||||
|
|
@ -46,27 +46,27 @@ jobs:
|
|||
- name: Test LunarVim Health
|
||||
run: if nvim --headless +checkhealth -c ':qall' 2>&1|grep -q 'Error'; then false; fi
|
||||
|
||||
freebsd:
|
||||
runs-on: macos-latest
|
||||
if: github.event.pull_request.draft == false
|
||||
continue-on-error: true # we don't support freebsd yet
|
||||
name: "FreeBSD macos-latest"
|
||||
steps:
|
||||
- uses: actions/checkout@v2
|
||||
# freebsd:
|
||||
# runs-on: macos-latest
|
||||
# if: github.event.pull_request.draft == false
|
||||
# continue-on-error: true # we don't support freebsd yet
|
||||
# name: "FreeBSD macos-latest"
|
||||
# steps:
|
||||
# - uses: actions/checkout@v2
|
||||
|
||||
- name: Install dependencies for FreeBSD
|
||||
uses: vmactions/freebsd-vm@v0.1.5
|
||||
with:
|
||||
prepare: pkg install -y curl neovim
|
||||
run: bash ./utils/installer/install.sh
|
||||
# - name: Install dependencies for FreeBSD
|
||||
# uses: vmactions/freebsd-vm@v0.1.5
|
||||
# with:
|
||||
# prepare: pkg install -y curl neovim
|
||||
# run: bash ./utils/installer/install.sh
|
||||
|
||||
- name: Test LunarVim PackerCompile
|
||||
uses: vmactions/freebsd-vm@v0.1.5
|
||||
with:
|
||||
run: if nvim --headless +PackerCompile -c ':qall' 2>&1|grep -q 'Error'; then false; fi
|
||||
# - name: Test LunarVim PackerCompile
|
||||
# uses: vmactions/freebsd-vm@v0.1.5
|
||||
# with:
|
||||
# run: if nvim --headless +PackerCompile -c ':qall' 2>&1|grep -q 'Error'; then false; fi
|
||||
|
||||
- name: Test LunarVim Health
|
||||
uses: vmactions/freebsd-vm@v0.1.5
|
||||
with:
|
||||
run: if nvim --headless +checkhealth -c ':qall' 2>&1|grep -q 'Error'; then false; fi
|
||||
# - name: Test LunarVim Health
|
||||
# uses: vmactions/freebsd-vm@v0.1.5
|
||||
# with:
|
||||
# run: if nvim --headless +checkhealth -c ':qall' 2>&1|grep -q 'Error'; then false; fi
|
||||
|
||||
|
|
|
|||
|
|
@ -2,4 +2,3 @@ require("lang.vue").format()
|
|||
require("lang.vue").lint()
|
||||
require("lang.vue").lsp()
|
||||
require("lang.vue").dap()
|
||||
|
||||
|
|
|
|||
|
|
@ -2,4 +2,3 @@ require("lang.yaml").format()
|
|||
require("lang.yaml").lint()
|
||||
require("lang.yaml").lsp()
|
||||
require("lang.yaml").dap()
|
||||
|
||||
|
|
|
|||
|
|
@ -2,4 +2,3 @@ require("lang.zig").format()
|
|||
require("lang.zig").lint()
|
||||
require("lang.zig").lsp()
|
||||
require("lang.zig").dap()
|
||||
|
||||
|
|
|
|||
|
|
@ -1,18 +1,18 @@
|
|||
local M = {}
|
||||
|
||||
M.config = function()
|
||||
O.lang.lua = {
|
||||
diagnostics = {
|
||||
virtual_text = { spacing = 0, prefix = "" },
|
||||
signs = true,
|
||||
underline = true,
|
||||
},
|
||||
formatter = {
|
||||
exe = "stylua",
|
||||
args = {},
|
||||
stdin = false,
|
||||
},
|
||||
}
|
||||
O.lang.lua = {
|
||||
diagnostics = {
|
||||
virtual_text = { spacing = 0, prefix = "" },
|
||||
signs = true,
|
||||
underline = true,
|
||||
},
|
||||
formatter = {
|
||||
exe = "stylua",
|
||||
args = {},
|
||||
stdin = false,
|
||||
},
|
||||
}
|
||||
end
|
||||
|
||||
M.format = function()
|
||||
|
|
|
|||
|
|
@ -16,10 +16,9 @@ M.lint = function()
|
|||
end
|
||||
|
||||
M.lsp = function()
|
||||
|
||||
if require("lv-utils").check_lsp_client_active "zls" then
|
||||
if require("lv-utils").check_lsp_client_active "zls" then
|
||||
return
|
||||
end
|
||||
end
|
||||
-- Because lspinstall don't support zig yet,
|
||||
-- So we need zls preset in global lib
|
||||
-- Further custom install zls in
|
||||
|
|
|
|||
|
|
@ -46,7 +46,7 @@ local disabled_built_ins = {
|
|||
}
|
||||
|
||||
if O.leader_key == " " or O.leader_key == "space" then
|
||||
vim.g.mapleader = ' '
|
||||
vim.g.mapleader = " "
|
||||
else
|
||||
vim.g.mapleader = O.leader_key
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,10 +1,10 @@
|
|||
local Git = {
|
||||
SignAdd = {fg = C.sign_add, },
|
||||
SignChange = {fg = C.sign_change, },
|
||||
SignDelete = {fg = C.sign_delete, },
|
||||
GitSignsAdd = {fg = C.sign_add, },
|
||||
GitSignsChange = {fg = C.sign_change, },
|
||||
GitSignsDelete = {fg = C.sign_delete, },
|
||||
SignAdd = { fg = C.sign_add },
|
||||
SignChange = { fg = C.sign_change },
|
||||
SignDelete = { fg = C.sign_delete },
|
||||
GitSignsAdd = { fg = C.sign_add },
|
||||
GitSignsChange = { fg = C.sign_change },
|
||||
GitSignsDelete = { fg = C.sign_delete },
|
||||
}
|
||||
|
||||
return Git
|
||||
return Git
|
||||
|
|
|
|||
|
|
@ -1,92 +1,92 @@
|
|||
local LSP = {
|
||||
LspDiagnosticsDefaultError = {fg = C.error_red, },
|
||||
LspDiagnosticsDefaultWarning = {fg = C.warning_orange, },
|
||||
LspDiagnosticsDefaultInformation = {fg = C.info_yellow, },
|
||||
LspDiagnosticsDefaultHint = {fg = C.hint_blue, },
|
||||
LspDiagnosticsVirtualTextError = {fg = C.error_red, },
|
||||
LspDiagnosticsVirtualTextWarning = {fg = C.warning_orange, },
|
||||
LspDiagnosticsVirtualTextInformation = {fg = C.info_yellow, },
|
||||
LspDiagnosticsVirtualTextHint = {fg = C.hint_blue, },
|
||||
LspDiagnosticsFloatingError = {fg = C.error_red, },
|
||||
LspDiagnosticsFloatingWarning = {fg = C.warning_orange, },
|
||||
LspDiagnosticsFloatingInformation = {fg = C.info_yellow, },
|
||||
LspDiagnosticsFloatingHint = {fg = C.hint_blue, },
|
||||
LspDiagnosticsSignError = {fg = C.error_red, },
|
||||
LspDiagnosticsSignWarning = {fg = C.warning_orange, },
|
||||
LspDiagnosticsSignInformation = {fg = C.info_yellow, },
|
||||
LspDiagnosticsSignHint = {fg = C.hint_blue, },
|
||||
LspDiagnosticsError = {fg = C.error_red, },
|
||||
LspDiagnosticsWarning = {fg = C.warning_orange, },
|
||||
LspDiagnosticsInformation = {fg = C.info_yellow, },
|
||||
LspDiagnosticsHint = {fg = C.hint_blue, },
|
||||
LspDiagnosticsUnderlineError = {fg = C.error_red, },
|
||||
LspDiagnosticsUnderlineWarning = {fg = C.warning_orange, },
|
||||
LspDiagnosticsUnderlineInformation = {fg = C.info_yellow, },
|
||||
LspDiagnosticsUnderlineHint = {fg = C.hint_blue, },
|
||||
QuickScopePrimary = {fg = C.cyan_test, style = "underline", },
|
||||
QuickScopeSecondary = {fg = C.purple_test, style = "underline", },
|
||||
TelescopeSelection = {fg = C.hint_blue, },
|
||||
TelescopeMatching = {fg = C.info_yellow, style = "bold", },
|
||||
TelescopeBorder = {fg = C.cyan, bg = C.bg, },
|
||||
NvimTreeFolderIcon = {fg = C.blue, },
|
||||
NvimTreeIndentMarker = {fg = C.gray, },
|
||||
NvimTreeNormal = {fg = C.light_gray, bg = C.alt_bg, },
|
||||
NvimTreeVertSplit = {fg = C.alt_bg, bg = C.alt_bg, },
|
||||
NvimTreeFolderName = {fg = C.blue, },
|
||||
NvimTreeOpenedFolderName = {fg = C.cyan, style = "italic", },
|
||||
NvimTreeImageFile = {fg = C.purple, },
|
||||
NvimTreeSpecialFile = {fg = C.orange, },
|
||||
NvimTreeGitStaged = {fg = C.sign_add, },
|
||||
NvimTreeGitNew = {fg = C.sign_add, },
|
||||
NvimTreeGitDirty = {fg = C.sign_add, },
|
||||
NvimTreeGitDeleted = {fg = C.sign_delete, },
|
||||
NvimTreeGitMerge = {fg = C.sign_change, },
|
||||
NvimTreeGitRenamed = {fg = C.sign_change, },
|
||||
NvimTreeSymlink = {fg = C.cyan, },
|
||||
NvimTreeRootFolder = {fg = C.fg, style = "bold", },
|
||||
NvimTreeExecFile = {fg = C.green, },
|
||||
BufferCurrent = {fg = C.fg, bg = C.bg, },
|
||||
BufferCurrentIndex = {fg = C.fg, bg = C.bg, },
|
||||
BufferCurrentMod = {fg = C.info_yellow, bg = C.bg, },
|
||||
BufferCurrentSign = {fg = C.hint_blue, bg = C.bg, },
|
||||
BufferCurrentTarget = {fg = C.red, bg = C.bg, style = "bold", },
|
||||
BufferVisible = {fg = C.fg, bg = C.bg, },
|
||||
BufferVisibleIndex = {fg = C.fg, bg = C.bg, },
|
||||
BufferVisibleMod = {fg = C.info_yellow, bg = C.bg, },
|
||||
BufferVisibleSign = {fg = C.hint_blue, bg = C.bg, },
|
||||
BufferVisibleTarget = {fg = C.red, bg = C.bg, style = "bold", },
|
||||
BufferInactive = {fg = C.gray, bg = C.alt_bg, },
|
||||
BufferInactiveIndex = {fg = C.gray, bg = C.alt_bg, },
|
||||
BufferInactiveMod = {fg = C.info_yellow, bg = C.alt_bg, },
|
||||
BufferInactiveSign = {fg = C.gray, bg = C.alt_bg, },
|
||||
BufferInactiveTarget = {fg = C.red, bg = C.alt_bg, style = "bold", },
|
||||
StatusLine = {fg = C.alt_bg, },
|
||||
StatusLineNC = {fg = C.alt_bg, },
|
||||
StatusLineSeparator = {fg = C.alt_bg, },
|
||||
StatusLineTerm = {fg = C.alt_bg, },
|
||||
StatusLineTermNC = {fg = C.alt_bg, },
|
||||
CodiVirtualText = {fg = C.pale_purple, },
|
||||
IndentBlanklineContextChar = {fg = C.accent, },
|
||||
DashboardHeader = {fg = C.blue, },
|
||||
DashboardCenter = {fg = C.purple, },
|
||||
DashboardFooter = {fg = C.cyan, },
|
||||
CompeDocumentation = {bg = C.alt_bg, },
|
||||
DiffViewNormal = {fg = C.gray, bg = C.alt_bg, },
|
||||
DiffviewStatusAdded = {fg = C.sign_add, },
|
||||
DiffviewStatusModified = {fg = C.sign_change, },
|
||||
DiffviewStatusRenamed = {fg = C.sign_change, },
|
||||
DiffviewStatusDeleted = {fg = C.sign_delete, },
|
||||
DiffviewFilePanelInsertion = {fg = C.sign_add, },
|
||||
DiffviewFilePanelDeletion = {fg = C.sign_delete, },
|
||||
DiffviewVertSplit = {bg = C.bg, },
|
||||
diffAdded = {fg = C.sign_add, },
|
||||
diffRemoved = {fg = C.sign_delete, },
|
||||
diffFileId = {fg = C.blue, style = "bold,reverse", },
|
||||
diffFile = {fg = C.alt_bg, },
|
||||
diffNewFile = {fg = C.green, },
|
||||
diffOldFile = {fg = C.red, },
|
||||
debugPc = {bg = C.cyan, },
|
||||
debugBreakpoint = {fg = C.red, style = "reverse", },
|
||||
LspDiagnosticsDefaultError = { fg = C.error_red },
|
||||
LspDiagnosticsDefaultWarning = { fg = C.warning_orange },
|
||||
LspDiagnosticsDefaultInformation = { fg = C.info_yellow },
|
||||
LspDiagnosticsDefaultHint = { fg = C.hint_blue },
|
||||
LspDiagnosticsVirtualTextError = { fg = C.error_red },
|
||||
LspDiagnosticsVirtualTextWarning = { fg = C.warning_orange },
|
||||
LspDiagnosticsVirtualTextInformation = { fg = C.info_yellow },
|
||||
LspDiagnosticsVirtualTextHint = { fg = C.hint_blue },
|
||||
LspDiagnosticsFloatingError = { fg = C.error_red },
|
||||
LspDiagnosticsFloatingWarning = { fg = C.warning_orange },
|
||||
LspDiagnosticsFloatingInformation = { fg = C.info_yellow },
|
||||
LspDiagnosticsFloatingHint = { fg = C.hint_blue },
|
||||
LspDiagnosticsSignError = { fg = C.error_red },
|
||||
LspDiagnosticsSignWarning = { fg = C.warning_orange },
|
||||
LspDiagnosticsSignInformation = { fg = C.info_yellow },
|
||||
LspDiagnosticsSignHint = { fg = C.hint_blue },
|
||||
LspDiagnosticsError = { fg = C.error_red },
|
||||
LspDiagnosticsWarning = { fg = C.warning_orange },
|
||||
LspDiagnosticsInformation = { fg = C.info_yellow },
|
||||
LspDiagnosticsHint = { fg = C.hint_blue },
|
||||
LspDiagnosticsUnderlineError = { fg = C.error_red },
|
||||
LspDiagnosticsUnderlineWarning = { fg = C.warning_orange },
|
||||
LspDiagnosticsUnderlineInformation = { fg = C.info_yellow },
|
||||
LspDiagnosticsUnderlineHint = { fg = C.hint_blue },
|
||||
QuickScopePrimary = { fg = C.cyan_test, style = "underline" },
|
||||
QuickScopeSecondary = { fg = C.purple_test, style = "underline" },
|
||||
TelescopeSelection = { fg = C.hint_blue },
|
||||
TelescopeMatching = { fg = C.info_yellow, style = "bold" },
|
||||
TelescopeBorder = { fg = C.cyan, bg = C.bg },
|
||||
NvimTreeFolderIcon = { fg = C.blue },
|
||||
NvimTreeIndentMarker = { fg = C.gray },
|
||||
NvimTreeNormal = { fg = C.light_gray, bg = C.alt_bg },
|
||||
NvimTreeVertSplit = { fg = C.alt_bg, bg = C.alt_bg },
|
||||
NvimTreeFolderName = { fg = C.blue },
|
||||
NvimTreeOpenedFolderName = { fg = C.cyan, style = "italic" },
|
||||
NvimTreeImageFile = { fg = C.purple },
|
||||
NvimTreeSpecialFile = { fg = C.orange },
|
||||
NvimTreeGitStaged = { fg = C.sign_add },
|
||||
NvimTreeGitNew = { fg = C.sign_add },
|
||||
NvimTreeGitDirty = { fg = C.sign_add },
|
||||
NvimTreeGitDeleted = { fg = C.sign_delete },
|
||||
NvimTreeGitMerge = { fg = C.sign_change },
|
||||
NvimTreeGitRenamed = { fg = C.sign_change },
|
||||
NvimTreeSymlink = { fg = C.cyan },
|
||||
NvimTreeRootFolder = { fg = C.fg, style = "bold" },
|
||||
NvimTreeExecFile = { fg = C.green },
|
||||
BufferCurrent = { fg = C.fg, bg = C.bg },
|
||||
BufferCurrentIndex = { fg = C.fg, bg = C.bg },
|
||||
BufferCurrentMod = { fg = C.info_yellow, bg = C.bg },
|
||||
BufferCurrentSign = { fg = C.hint_blue, bg = C.bg },
|
||||
BufferCurrentTarget = { fg = C.red, bg = C.bg, style = "bold" },
|
||||
BufferVisible = { fg = C.fg, bg = C.bg },
|
||||
BufferVisibleIndex = { fg = C.fg, bg = C.bg },
|
||||
BufferVisibleMod = { fg = C.info_yellow, bg = C.bg },
|
||||
BufferVisibleSign = { fg = C.hint_blue, bg = C.bg },
|
||||
BufferVisibleTarget = { fg = C.red, bg = C.bg, style = "bold" },
|
||||
BufferInactive = { fg = C.gray, bg = C.alt_bg },
|
||||
BufferInactiveIndex = { fg = C.gray, bg = C.alt_bg },
|
||||
BufferInactiveMod = { fg = C.info_yellow, bg = C.alt_bg },
|
||||
BufferInactiveSign = { fg = C.gray, bg = C.alt_bg },
|
||||
BufferInactiveTarget = { fg = C.red, bg = C.alt_bg, style = "bold" },
|
||||
StatusLine = { fg = C.alt_bg },
|
||||
StatusLineNC = { fg = C.alt_bg },
|
||||
StatusLineSeparator = { fg = C.alt_bg },
|
||||
StatusLineTerm = { fg = C.alt_bg },
|
||||
StatusLineTermNC = { fg = C.alt_bg },
|
||||
CodiVirtualText = { fg = C.pale_purple },
|
||||
IndentBlanklineContextChar = { fg = C.accent },
|
||||
DashboardHeader = { fg = C.blue },
|
||||
DashboardCenter = { fg = C.purple },
|
||||
DashboardFooter = { fg = C.cyan },
|
||||
CompeDocumentation = { bg = C.alt_bg },
|
||||
DiffViewNormal = { fg = C.gray, bg = C.alt_bg },
|
||||
DiffviewStatusAdded = { fg = C.sign_add },
|
||||
DiffviewStatusModified = { fg = C.sign_change },
|
||||
DiffviewStatusRenamed = { fg = C.sign_change },
|
||||
DiffviewStatusDeleted = { fg = C.sign_delete },
|
||||
DiffviewFilePanelInsertion = { fg = C.sign_add },
|
||||
DiffviewFilePanelDeletion = { fg = C.sign_delete },
|
||||
DiffviewVertSplit = { bg = C.bg },
|
||||
diffAdded = { fg = C.sign_add },
|
||||
diffRemoved = { fg = C.sign_delete },
|
||||
diffFileId = { fg = C.blue, style = "bold,reverse" },
|
||||
diffFile = { fg = C.alt_bg },
|
||||
diffNewFile = { fg = C.green },
|
||||
diffOldFile = { fg = C.red },
|
||||
debugPc = { bg = C.cyan },
|
||||
debugBreakpoint = { fg = C.red, style = "reverse" },
|
||||
}
|
||||
|
||||
return LSP
|
||||
return LSP
|
||||
|
|
|
|||
|
|
@ -1,56 +1,56 @@
|
|||
local Treesitter = {
|
||||
TSComment = {fg = C.gray, },
|
||||
TSAnnotation = {fg = C.purple, },
|
||||
TSAttribute = {fg = C.cyan, },
|
||||
TSConstructor = {fg = C.purple, },
|
||||
TSType = {fg = C.purple, },
|
||||
TSTypeBuiltin = {fg = C.purple, },
|
||||
TSConditional = {fg = C.blue, },
|
||||
TSException = {fg = C.blue, },
|
||||
TSInclude = {fg = C.blue, },
|
||||
TSKeyword = {fg = C.blue, },
|
||||
TSKeywordFunction = {fg = C.blue, },
|
||||
TSLabel = {fg = C.blue, },
|
||||
TSNamespace = {fg = C.blue, },
|
||||
TSRepeat = {fg = C.blue, },
|
||||
TSConstant = {fg = C.orange, },
|
||||
TSConstBuiltin = {fg = C.orange, },
|
||||
TSFloat = {fg = C.red, },
|
||||
TSNumber = {fg = C.red, },
|
||||
TSBoolean = {fg = C.red, },
|
||||
TSCharacter = {fg = C.light_green, },
|
||||
TSError = {fg = C.error_red, },
|
||||
TSFunction = {fg = C.yellow, },
|
||||
TSFuncBuiltin = {fg = C.yellow, },
|
||||
TSMethod = {fg = C.yellow, },
|
||||
TSConstMacro = {fg = C.cyan, },
|
||||
TSFuncMacro = {fg = C.cyan, },
|
||||
TSVariable = {fg = C.white, },
|
||||
TSVariableBuiltin = {fg = C.cyan, },
|
||||
TSProperty = {fg = C.cyan, },
|
||||
TSOperator = {fg = C.gray_blue, },
|
||||
TSField = {fg = C.white, },
|
||||
TSParameter = {fg = C.white, },
|
||||
TSParameterReference = {fg = C.white, },
|
||||
TSSymbol = {fg = C.white, },
|
||||
TSText = {fg = C.fg, },
|
||||
TSPunctDelimiter = {fg = C.gray, },
|
||||
TSTagDelimiter = {fg = C.gray, },
|
||||
TSPunctBracket = {fg = C.gray, },
|
||||
TSPunctSpecial = {fg = C.gray, },
|
||||
TSString = {fg = C.green, },
|
||||
TSStringRegex = {fg = C.light_green, },
|
||||
TSStringEscape = {fg = C.light_green, },
|
||||
TSTag = {fg = C.blue, },
|
||||
TSEmphasis = {style = "italic", },
|
||||
TSUnderline = {style = "underline", },
|
||||
TSTitle = {fg = C.blue, style = "bold", },
|
||||
TSLiteral = {fg = C.green, },
|
||||
TSURI = {fg = C.cyan, style = "underline", },
|
||||
TSKeywordOperator = {fg = C.blue, },
|
||||
TSStructure = {fg = C.purple_test, },
|
||||
TSStrong = {fg = C.yellow, },
|
||||
TSQueryLinterError = {fg = C.warning_orange, },
|
||||
TSComment = { fg = C.gray },
|
||||
TSAnnotation = { fg = C.purple },
|
||||
TSAttribute = { fg = C.cyan },
|
||||
TSConstructor = { fg = C.purple },
|
||||
TSType = { fg = C.purple },
|
||||
TSTypeBuiltin = { fg = C.purple },
|
||||
TSConditional = { fg = C.blue },
|
||||
TSException = { fg = C.blue },
|
||||
TSInclude = { fg = C.blue },
|
||||
TSKeyword = { fg = C.blue },
|
||||
TSKeywordFunction = { fg = C.blue },
|
||||
TSLabel = { fg = C.blue },
|
||||
TSNamespace = { fg = C.blue },
|
||||
TSRepeat = { fg = C.blue },
|
||||
TSConstant = { fg = C.orange },
|
||||
TSConstBuiltin = { fg = C.orange },
|
||||
TSFloat = { fg = C.red },
|
||||
TSNumber = { fg = C.red },
|
||||
TSBoolean = { fg = C.red },
|
||||
TSCharacter = { fg = C.light_green },
|
||||
TSError = { fg = C.error_red },
|
||||
TSFunction = { fg = C.yellow },
|
||||
TSFuncBuiltin = { fg = C.yellow },
|
||||
TSMethod = { fg = C.yellow },
|
||||
TSConstMacro = { fg = C.cyan },
|
||||
TSFuncMacro = { fg = C.cyan },
|
||||
TSVariable = { fg = C.white },
|
||||
TSVariableBuiltin = { fg = C.cyan },
|
||||
TSProperty = { fg = C.cyan },
|
||||
TSOperator = { fg = C.gray_blue },
|
||||
TSField = { fg = C.white },
|
||||
TSParameter = { fg = C.white },
|
||||
TSParameterReference = { fg = C.white },
|
||||
TSSymbol = { fg = C.white },
|
||||
TSText = { fg = C.fg },
|
||||
TSPunctDelimiter = { fg = C.gray },
|
||||
TSTagDelimiter = { fg = C.gray },
|
||||
TSPunctBracket = { fg = C.gray },
|
||||
TSPunctSpecial = { fg = C.gray },
|
||||
TSString = { fg = C.green },
|
||||
TSStringRegex = { fg = C.light_green },
|
||||
TSStringEscape = { fg = C.light_green },
|
||||
TSTag = { fg = C.blue },
|
||||
TSEmphasis = { style = "italic" },
|
||||
TSUnderline = { style = "underline" },
|
||||
TSTitle = { fg = C.blue, style = "bold" },
|
||||
TSLiteral = { fg = C.green },
|
||||
TSURI = { fg = C.cyan, style = "underline" },
|
||||
TSKeywordOperator = { fg = C.blue },
|
||||
TSStructure = { fg = C.purple_test },
|
||||
TSStrong = { fg = C.yellow },
|
||||
TSQueryLinterError = { fg = C.warning_orange },
|
||||
}
|
||||
|
||||
return Treesitter
|
||||
return Treesitter
|
||||
|
|
|
|||
|
|
@ -1,9 +1,9 @@
|
|||
local Whichkey = {
|
||||
WhichKey = {fg = C.purple, },
|
||||
WhichKeySeperator = {fg = C.green, },
|
||||
WhichKeyGroup = {fg = C.blue, },
|
||||
WhichKeyDesc = {fg = C.cyan, },
|
||||
WhichKeyFloat = {bg = C.alt_bg, },
|
||||
WhichKey = { fg = C.purple },
|
||||
WhichKeySeperator = { fg = C.green },
|
||||
WhichKeyGroup = { fg = C.blue },
|
||||
WhichKeyDesc = { fg = C.cyan },
|
||||
WhichKeyFloat = { bg = C.alt_bg },
|
||||
}
|
||||
|
||||
return Whichkey
|
||||
return Whichkey
|
||||
|
|
|
|||
|
|
@ -3,21 +3,21 @@ local config
|
|||
vim = vim or { g = {}, o = {} }
|
||||
|
||||
local function opt(key, default)
|
||||
if vim.g[key] == nil then
|
||||
return default
|
||||
end
|
||||
if vim.g[key] == 0 then
|
||||
return false
|
||||
end
|
||||
return vim.g[key]
|
||||
if vim.g[key] == nil then
|
||||
return default
|
||||
end
|
||||
if vim.g[key] == 0 then
|
||||
return false
|
||||
end
|
||||
return vim.g[key]
|
||||
end
|
||||
|
||||
config = {
|
||||
transparent_background = opt("transparent_background", false),
|
||||
italic_comments = opt("italic_keywords", true) and "italic" or "NONE",
|
||||
italic_keywords = opt("italic_keywords", true) and "italic" or "NONE",
|
||||
italic_functions = opt("italic_function", false) and "italic" or "NONE",
|
||||
italic_variables = opt("italic_variables", true) and "italic" or "NONE",
|
||||
transparent_background = opt("transparent_background", false),
|
||||
italic_comments = opt("italic_keywords", true) and "italic" or "NONE",
|
||||
italic_keywords = opt("italic_keywords", true) and "italic" or "NONE",
|
||||
italic_functions = opt("italic_function", false) and "italic" or "NONE",
|
||||
italic_variables = opt("italic_variables", true) and "italic" or "NONE",
|
||||
}
|
||||
|
||||
return config
|
||||
return config
|
||||
|
|
|
|||
|
|
@ -1,99 +1,99 @@
|
|||
local highlights = {
|
||||
Normal = {fg = C.fg, bg = Config.transparent_background and "NONE" or C.bg, },
|
||||
SignColumn = {bg = C.bg, },
|
||||
MsgArea = {fg = C.fg, bg = C.bg, },
|
||||
ModeMsg = {fg = C.fg, bg = C.bg, },
|
||||
MsgSeparator = {fg = C.fg, bg = C.bg, },
|
||||
SpellBad = {fg = C.error_red, style = "underline", },
|
||||
SpellCap = {fg = C.yellow, style = "underline", },
|
||||
SpellLocal = {fg = C.green, style = "underline", },
|
||||
SpellRare = {fg = C.purple, style = "underline", },
|
||||
NormalNC = {fg = C.fg, bg = C.bg, },
|
||||
Pmenu = {fg = C.white, bg = C.accent, },
|
||||
PmenuSel = {fg = C.alt_bg, bg = C.blue, },
|
||||
WildMenu = {fg = C.alt_bg, bg = C.blue, },
|
||||
CursorLineNr = {fg = C.light_gray, style = "bold", },
|
||||
Comment = {fg = C.gray, style = "italic", },
|
||||
Folded = {fg = C.accent, bg = C.alt_bg, },
|
||||
FoldColumn = {fg = C.accent, bg = C.alt_bg, },
|
||||
LineNr = {fg = C.gray, },
|
||||
FloatBoder = {fg = C.gray, bg = C.alt_bg, },
|
||||
Whitespace = {fg = C.gray, },
|
||||
VertSplit = {fg = C.bg, bg = C.accent, },
|
||||
CursorLine = {bg = C.alt_bg, },
|
||||
CursorColumn = {bg = C.alt_bg, },
|
||||
ColorColumn = {bg = C.alt_bg, },
|
||||
NormalFloat = {bg = C.alt_bg, },
|
||||
Visual = {bg = C.alt_bg, },
|
||||
VisualNOS = {bg = C.alt_bg, },
|
||||
WarningMsg = {fg = C.error_red, bg = C.bg, },
|
||||
DiffAdd = {fg = C.alt_bg, bg = C.sign_add, },
|
||||
DiffChange = {fg = C.alt_bg, bg = C.sign_change, style = "underline", },
|
||||
DiffDelete = {fg = C.alt_bg, bg = C.sign_delete, },
|
||||
QuickFixLine = {bg = C.accent, },
|
||||
PmenuSbar = {bg = C.alt_bg, },
|
||||
PmenuThumb = {bg = C.white, },
|
||||
MatchWord = {style = "underline", },
|
||||
MatchParen = {fg = C.pale_purple, bg = C.bg, style = "underline", },
|
||||
MatchWordCur = {style = "underline", },
|
||||
MatchParenCur = {style = "underline", },
|
||||
Cursor = {fg = C.cursor_fg, bg = C.cursor_bg, },
|
||||
lCursor = {fg = C.cursor_fg, bg = C.cursor_bg, },
|
||||
CursorIM = {fg = C.cursor_fg, bg = C.cursor_bg, },
|
||||
TermCursor = {fg = C.cursor_fg, bg = C.cursor_bg, },
|
||||
TermCursorNC = {fg = C.cursor_fg, bg = C.cursor_bg, },
|
||||
Conceal = {fg = C.accent, },
|
||||
Directory = {fg = C.blue, },
|
||||
SpecialKey = {fg = C.blue, style = "bold", },
|
||||
Title = {fg = C.blue, style = "bold", },
|
||||
ErrorMsg = {fg = C.error_red, bg = C.bg, style = "bold", },
|
||||
Search = {fg = C.hint_blue, bg = C.alt_bg, },
|
||||
IncSearch = {fg = C.hint_blue, bg = C.alt_bg, },
|
||||
Substitute = {fg = C.alt_bg, bg = C.gray_blue, },
|
||||
MoreMsg = {fg = C.cyan, },
|
||||
Question = {fg = C.cyan, },
|
||||
EndOfBuffer = {fg = C.bg, },
|
||||
NonText = {fg = C.bg, },
|
||||
Variable = {fg = C.white, },
|
||||
String = {fg = C.green, },
|
||||
Character = {fg = C.light_green, },
|
||||
Constant = {fg = C.orange, },
|
||||
Number = {fg = C.red, },
|
||||
Boolean = {fg = C.red, },
|
||||
Float = {fg = C.red, },
|
||||
Identifier = {fg = C.white, },
|
||||
Function = {fg = C.yellow, },
|
||||
Operator = {fg = C.gray_blue, },
|
||||
Type = {fg = C.purple, },
|
||||
StorageClass = {fg = C.purple, },
|
||||
Structure = {fg = C.purple, },
|
||||
Typedef = {fg = C.purple, },
|
||||
Keyword = {fg = C.blue, },
|
||||
Statement = {fg = C.blue, },
|
||||
Conditional = {fg = C.blue, },
|
||||
Repeat = {fg = C.blue, },
|
||||
Label = {fg = C.blue, },
|
||||
Exception = {fg = C.blue, },
|
||||
Include = {fg = C.blue, },
|
||||
PreProc = {fg = C.cyan, },
|
||||
Define = {fg = C.cyan, },
|
||||
Macro = {fg = C.cyan, },
|
||||
PreCondit = {fg = C.cyan, },
|
||||
Special = {fg = C.orange, },
|
||||
SpecialChar = {fg = C.orange, },
|
||||
Tag = {fg = C.blue, },
|
||||
Debug = {fg = C.red, },
|
||||
Delimiter = {fg = C.gray, },
|
||||
SpecialComment = {fg = C.gray, },
|
||||
Underlined = {style = "underline", },
|
||||
Bold = {style = "bold", },
|
||||
Italic = {style = "italic", },
|
||||
Ignore = {fg = C.cyan, bg = C.bg, style = "bold", },
|
||||
Todo = {fg = C.red, bg = C.bg, style = "bold", },
|
||||
Error = {fg = C.error_red, bg = C.bg, style = "bold", },
|
||||
TabLine = {fg = C.white, bg = C.alt_bg, },
|
||||
TabLineSel = {fg = C.white, bg = C.alt_bg, },
|
||||
TabLineFill = {fg = C.white, bg = C.alt_bg, },
|
||||
Normal = { fg = C.fg, bg = Config.transparent_background and "NONE" or C.bg },
|
||||
SignColumn = { bg = C.bg },
|
||||
MsgArea = { fg = C.fg, bg = C.bg },
|
||||
ModeMsg = { fg = C.fg, bg = C.bg },
|
||||
MsgSeparator = { fg = C.fg, bg = C.bg },
|
||||
SpellBad = { fg = C.error_red, style = "underline" },
|
||||
SpellCap = { fg = C.yellow, style = "underline" },
|
||||
SpellLocal = { fg = C.green, style = "underline" },
|
||||
SpellRare = { fg = C.purple, style = "underline" },
|
||||
NormalNC = { fg = C.fg, bg = C.bg },
|
||||
Pmenu = { fg = C.white, bg = C.accent },
|
||||
PmenuSel = { fg = C.alt_bg, bg = C.blue },
|
||||
WildMenu = { fg = C.alt_bg, bg = C.blue },
|
||||
CursorLineNr = { fg = C.light_gray, style = "bold" },
|
||||
Comment = { fg = C.gray, style = "italic" },
|
||||
Folded = { fg = C.accent, bg = C.alt_bg },
|
||||
FoldColumn = { fg = C.accent, bg = C.alt_bg },
|
||||
LineNr = { fg = C.gray },
|
||||
FloatBoder = { fg = C.gray, bg = C.alt_bg },
|
||||
Whitespace = { fg = C.gray },
|
||||
VertSplit = { fg = C.bg, bg = C.accent },
|
||||
CursorLine = { bg = C.alt_bg },
|
||||
CursorColumn = { bg = C.alt_bg },
|
||||
ColorColumn = { bg = C.alt_bg },
|
||||
NormalFloat = { bg = C.alt_bg },
|
||||
Visual = { bg = C.alt_bg },
|
||||
VisualNOS = { bg = C.alt_bg },
|
||||
WarningMsg = { fg = C.error_red, bg = C.bg },
|
||||
DiffAdd = { fg = C.alt_bg, bg = C.sign_add },
|
||||
DiffChange = { fg = C.alt_bg, bg = C.sign_change, style = "underline" },
|
||||
DiffDelete = { fg = C.alt_bg, bg = C.sign_delete },
|
||||
QuickFixLine = { bg = C.accent },
|
||||
PmenuSbar = { bg = C.alt_bg },
|
||||
PmenuThumb = { bg = C.white },
|
||||
MatchWord = { style = "underline" },
|
||||
MatchParen = { fg = C.pale_purple, bg = C.bg, style = "underline" },
|
||||
MatchWordCur = { style = "underline" },
|
||||
MatchParenCur = { style = "underline" },
|
||||
Cursor = { fg = C.cursor_fg, bg = C.cursor_bg },
|
||||
lCursor = { fg = C.cursor_fg, bg = C.cursor_bg },
|
||||
CursorIM = { fg = C.cursor_fg, bg = C.cursor_bg },
|
||||
TermCursor = { fg = C.cursor_fg, bg = C.cursor_bg },
|
||||
TermCursorNC = { fg = C.cursor_fg, bg = C.cursor_bg },
|
||||
Conceal = { fg = C.accent },
|
||||
Directory = { fg = C.blue },
|
||||
SpecialKey = { fg = C.blue, style = "bold" },
|
||||
Title = { fg = C.blue, style = "bold" },
|
||||
ErrorMsg = { fg = C.error_red, bg = C.bg, style = "bold" },
|
||||
Search = { fg = C.hint_blue, bg = C.alt_bg },
|
||||
IncSearch = { fg = C.hint_blue, bg = C.alt_bg },
|
||||
Substitute = { fg = C.alt_bg, bg = C.gray_blue },
|
||||
MoreMsg = { fg = C.cyan },
|
||||
Question = { fg = C.cyan },
|
||||
EndOfBuffer = { fg = C.bg },
|
||||
NonText = { fg = C.bg },
|
||||
Variable = { fg = C.white },
|
||||
String = { fg = C.green },
|
||||
Character = { fg = C.light_green },
|
||||
Constant = { fg = C.orange },
|
||||
Number = { fg = C.red },
|
||||
Boolean = { fg = C.red },
|
||||
Float = { fg = C.red },
|
||||
Identifier = { fg = C.white },
|
||||
Function = { fg = C.yellow },
|
||||
Operator = { fg = C.gray_blue },
|
||||
Type = { fg = C.purple },
|
||||
StorageClass = { fg = C.purple },
|
||||
Structure = { fg = C.purple },
|
||||
Typedef = { fg = C.purple },
|
||||
Keyword = { fg = C.blue },
|
||||
Statement = { fg = C.blue },
|
||||
Conditional = { fg = C.blue },
|
||||
Repeat = { fg = C.blue },
|
||||
Label = { fg = C.blue },
|
||||
Exception = { fg = C.blue },
|
||||
Include = { fg = C.blue },
|
||||
PreProc = { fg = C.cyan },
|
||||
Define = { fg = C.cyan },
|
||||
Macro = { fg = C.cyan },
|
||||
PreCondit = { fg = C.cyan },
|
||||
Special = { fg = C.orange },
|
||||
SpecialChar = { fg = C.orange },
|
||||
Tag = { fg = C.blue },
|
||||
Debug = { fg = C.red },
|
||||
Delimiter = { fg = C.gray },
|
||||
SpecialComment = { fg = C.gray },
|
||||
Underlined = { style = "underline" },
|
||||
Bold = { style = "bold" },
|
||||
Italic = { style = "italic" },
|
||||
Ignore = { fg = C.cyan, bg = C.bg, style = "bold" },
|
||||
Todo = { fg = C.red, bg = C.bg, style = "bold" },
|
||||
Error = { fg = C.error_red, bg = C.bg, style = "bold" },
|
||||
TabLine = { fg = C.white, bg = C.alt_bg },
|
||||
TabLineSel = { fg = C.white, bg = C.alt_bg },
|
||||
TabLineFill = { fg = C.white, bg = C.alt_bg },
|
||||
}
|
||||
|
||||
return highlights
|
||||
return highlights
|
||||
|
|
|
|||
|
|
@ -1,26 +1,30 @@
|
|||
vim.api.nvim_command("hi clear")
|
||||
if vim.fn.exists("syntax_on") then
|
||||
vim.api.nvim_command("syntax reset")
|
||||
vim.api.nvim_command "hi clear"
|
||||
if vim.fn.exists "syntax_on" then
|
||||
vim.api.nvim_command "syntax reset"
|
||||
end
|
||||
vim.o.background = "dark"
|
||||
vim.o.termguicolors = true
|
||||
vim.g.colors_name = "spacegray"
|
||||
|
||||
local util = require("spacegray.util")
|
||||
Config = require("spacegray.config")
|
||||
C = require("spacegray.palette")
|
||||
local highlights = require("spacegray.highlights")
|
||||
local Treesitter = require("spacegray.Treesitter")
|
||||
local markdown = require("spacegray.markdown")
|
||||
local Whichkey = require("spacegray.Whichkey")
|
||||
local Git = require("spacegray.Git")
|
||||
local LSP = require("spacegray.LSP")
|
||||
|
||||
local util = require "spacegray.util"
|
||||
Config = require "spacegray.config"
|
||||
C = require "spacegray.palette"
|
||||
local highlights = require "spacegray.highlights"
|
||||
local Treesitter = require "spacegray.Treesitter"
|
||||
local markdown = require "spacegray.markdown"
|
||||
local Whichkey = require "spacegray.Whichkey"
|
||||
local Git = require "spacegray.Git"
|
||||
local LSP = require "spacegray.LSP"
|
||||
|
||||
local skeletons = {
|
||||
highlights, Treesitter, markdown, Whichkey, Git, LSP
|
||||
highlights,
|
||||
Treesitter,
|
||||
markdown,
|
||||
Whichkey,
|
||||
Git,
|
||||
LSP,
|
||||
}
|
||||
|
||||
for _, skeleton in ipairs(skeletons) do
|
||||
util.initialise(skeleton)
|
||||
end
|
||||
util.initialise(skeleton)
|
||||
end
|
||||
|
|
|
|||
|
|
@ -1,27 +1,27 @@
|
|||
local markdown = {
|
||||
markdownBlockquote = {fg = C.accent, },
|
||||
markdownBold = {fg = C.yellow, style = "bold", },
|
||||
markdownCode = {fg = C.green, },
|
||||
markdownCodeBlock = {fg = C.green, },
|
||||
markdownCodeDelimiter = {fg = C.green, },
|
||||
markdownH1 = {fg = C.blue, },
|
||||
markdownH2 = {fg = C.blue, },
|
||||
markdownH3 = {fg = C.blue, },
|
||||
markdownH4 = {fg = C.blue, },
|
||||
markdownH5 = {fg = C.blue, },
|
||||
markdownH6 = {fg = C.blue, },
|
||||
markdownHeadingDelimiter = {fg = C.red, },
|
||||
markdownHeadingRule = {fg = C.accent, },
|
||||
markdownId = {fg = C.purple, },
|
||||
markdownIdDeclaration = {fg = C.blue, },
|
||||
markdownIdDelimiter = {fg = C.light_gray, },
|
||||
markdownLinkDelimiter = {fg = C.light_gray, },
|
||||
markdownItalic = {style = "italic", },
|
||||
markdownLinkText = {fg = C.blue, },
|
||||
markdownListMarker = {fg = C.red, },
|
||||
markdownOrderedListMarker = {fg = C.red, },
|
||||
markdownRule = {fg = C.accent, },
|
||||
markdownUrl = {fg = C.cyan, style = "underline", },
|
||||
markdownBlockquote = { fg = C.accent },
|
||||
markdownBold = { fg = C.yellow, style = "bold" },
|
||||
markdownCode = { fg = C.green },
|
||||
markdownCodeBlock = { fg = C.green },
|
||||
markdownCodeDelimiter = { fg = C.green },
|
||||
markdownH1 = { fg = C.blue },
|
||||
markdownH2 = { fg = C.blue },
|
||||
markdownH3 = { fg = C.blue },
|
||||
markdownH4 = { fg = C.blue },
|
||||
markdownH5 = { fg = C.blue },
|
||||
markdownH6 = { fg = C.blue },
|
||||
markdownHeadingDelimiter = { fg = C.red },
|
||||
markdownHeadingRule = { fg = C.accent },
|
||||
markdownId = { fg = C.purple },
|
||||
markdownIdDeclaration = { fg = C.blue },
|
||||
markdownIdDelimiter = { fg = C.light_gray },
|
||||
markdownLinkDelimiter = { fg = C.light_gray },
|
||||
markdownItalic = { style = "italic" },
|
||||
markdownLinkText = { fg = C.blue },
|
||||
markdownListMarker = { fg = C.red },
|
||||
markdownOrderedListMarker = { fg = C.red },
|
||||
markdownRule = { fg = C.accent },
|
||||
markdownUrl = { fg = C.cyan, style = "underline" },
|
||||
}
|
||||
|
||||
return markdown
|
||||
return markdown
|
||||
|
|
|
|||
|
|
@ -1,22 +1,25 @@
|
|||
local M = {}
|
||||
|
||||
local function highlight(group, properties)
|
||||
local bg = properties.bg == nil and "" or "guibg=" .. properties.bg
|
||||
local fg = properties.fg == nil and "" or "guifg=" .. properties.fg
|
||||
local style = properties.style == nil and "" or "gui=" .. properties.style
|
||||
local bg = properties.bg == nil and "" or "guibg=" .. properties.bg
|
||||
local fg = properties.fg == nil and "" or "guifg=" .. properties.fg
|
||||
local style = properties.style == nil and "" or "gui=" .. properties.style
|
||||
|
||||
local cmd = table.concat({
|
||||
"highlight", group, bg, fg, style
|
||||
}, " ")
|
||||
local cmd = table.concat({
|
||||
"highlight",
|
||||
group,
|
||||
bg,
|
||||
fg,
|
||||
style,
|
||||
}, " ")
|
||||
|
||||
vim.api.nvim_command(cmd)
|
||||
vim.api.nvim_command(cmd)
|
||||
end
|
||||
|
||||
|
||||
function M.initialise(skeleton)
|
||||
for group, properties in pairs(skeleton) do
|
||||
highlight(group, properties)
|
||||
end
|
||||
for group, properties in pairs(skeleton) do
|
||||
highlight(group, properties)
|
||||
end
|
||||
end
|
||||
|
||||
return M
|
||||
return M
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue