Merge commit '095d5fb56ff62c5e6527d7a3d87bc144856c746f'

3 files changed, 14 insertions, 3 deletions

diff --git a/.config/nvim/lua/plugins/colorscheme.lua b/.config/nvim/lua/plugins/colorscheme.lua
index 6ea5cdb..346bc4a 100644
--- a/.config/nvim/lua/plugins/colorscheme.lua
+++ b/.config/nvim/lua/plugins/colorscheme.lua
@@ -1,7 +1,7 @@
 -- Colorscheme
 -- Available colorschemes:
 -- [[ nightfly ayu onedark doom-one ]]
-local colorscheme = "doom-one"
+local colorscheme = "nightfly"
 local status_ok, _ = pcall(vim.cmd, "colorscheme " .. colorscheme)
 if not status_ok then
 	vim.notify("colorscheme " .. colorscheme .. " not found!")
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index f00897f..7962308 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -310,7 +310,7 @@ vim.diagnostic.config({
 vim.lsp.handlers["textDocument/publishDiagnostics"] = vim.lsp.with(vim.lsp.diagnostic.on_publish_diagnostics, {
 	underline = false,
 	virtual_text = false,
-	signs = false,
+	signs = true,
 	update_in_insert = false,
 })
 vim.lsp.handlers["textDocument/hover"] = vim.lsp.with(vim.lsp.handlers.hover, { border = "rounded" })
diff --git a/.config/nvim/lua/plugins/null-ls.lua b/.config/nvim/lua/plugins/null-ls.lua
index f50827a..b96d883 100644
--- a/.config/nvim/lua/plugins/null-ls.lua
+++ b/.config/nvim/lua/plugins/null-ls.lua
@@ -6,8 +6,19 @@ require("null-ls").setup({
 	--debug = true,
   disabled_filetypes = { "PKGBUILD" },
   timeout_ms = 5000,
-  async = true,
+  --async = true,
   debounce = 150,
+  log = {
+    enable = true,
+    level = 'warn',
+    use_console = 'async',
+  },
+  update_in_insert = false,
+  --fallback_severity = vim.diagnostic.severity.ERROR,
+  --log_level = "warn",
+  --on_attach = nil,
+  --on_init = nil,
+  --on_exit = nil,
   sources = {
     --require("null-ls").builtins.formatting.shfmt, -- shell script formatting
     require("null-ls").builtins.diagnostics.dotenv_linter,