From 750b4fe8a023ebaad230d2a167bc8ab35db95083 Mon Sep 17 00:00:00 2001 From: shaunsingh Date: Sat, 10 Jul 2021 16:05:25 -0400 Subject: [PATCH] Add support for Dap and Illuminate, add Treesitter to main loop, fix non-treesitter colors --- .idea/workspace.xml | 86 +++++++++++++++++++++++++++++++++++++++++++++ lua/nord/theme.lua | 7 ++++ lua/nord/util.lua | 16 ++++----- 3 files changed, 101 insertions(+), 8 deletions(-) create mode 100644 .idea/workspace.xml diff --git a/.idea/workspace.xml b/.idea/workspace.xml new file mode 100644 index 0000000..8ab4968 --- /dev/null +++ b/.idea/workspace.xml @@ -0,0 +1,86 @@ + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + 1623082416545 + + + 1623082924959 + + + + + + + + + \ No newline at end of file diff --git a/lua/nord/theme.lua b/lua/nord/theme.lua index bb20277..35038ba 100644 --- a/lua/nord/theme.lua +++ b/lua/nord/theme.lua @@ -394,6 +394,13 @@ theme.loadPlugins = function() IndentBlanklineChar = { fg = nord.nord3_gui }, IndentBlanklineContextChar = { fg = nord.nord3_gui }, + -- Illuminate + illuminatedWord = { bg = nord.highight }, + illuminatedCurWord = { bg = nord.highight }, + + DapBreakpoint = { fg = nord.nord14_gui}, + DapStopped = { fg = nord.nord15_gui}, + } -- Options: diff --git a/lua/nord/util.lua b/lua/nord/util.lua index df9d74c..7a28e6f 100644 --- a/lua/nord/util.lua +++ b/lua/nord/util.lua @@ -42,14 +42,13 @@ function util.load() vim.o.termguicolors = true vim.g.colors_name = "nord" - -- Load plugins, treesitter and lsp async + -- Load plugins and lsp async local async async = vim.loop.new_async(vim.schedule_wrap(function () nord.loadTerminal() - -- imort tables for plugins, treesitter and lsp + -- imort tables for plugins and lsp local plugins = nord.loadPlugins() - local treesitter = nord.loadTreeSitter() local lsp = nord.loadLSP() -- loop trough the plugins table and highlight every member @@ -57,11 +56,6 @@ function util.load() util.highlight(group, colors) end - -- loop trough the treesitter table and highlight every member - for group, colors in pairs(treesitter) do - util.highlight(group, colors) - end - -- loop trough the lsp table and highlight every member for group, colors in pairs(lsp) do util.highlight(group, colors) @@ -78,6 +72,7 @@ function util.load() -- load the most importaint parts of the theme local editor = nord.loadEditor() local syntax = nord.loadSyntax() + local treesitter = nord.loadTreeSitter() -- load editor highlights for group, colors in pairs(editor) do @@ -89,6 +84,11 @@ function util.load() util.highlight(group, colors) end + -- loop trough the treesitter table and highlight every member + for group, colors in pairs(treesitter) do + util.highlight(group, colors) + end + -- load the rest later ( lsp, treesitter, plugins ) async:send() end -- 2.39.5